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/31 09:17:10 UTC

svn commit: r1822780 - in /aries/trunk/blueprint: blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java blueprint-parser/src/main/java/org/apache/aries/blueprint/BlueprintConstants.java

Author: gnodet
Date: Wed Jan 31 09:17:10 2018
New Revision: 1822780

URL: http://svn.apache.org/viewvc?rev=1822780&view=rev
Log:
[ARIES-1138] Disable Blueprint Schema Validation via System Property

Modified:
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
    aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/BlueprintConstants.java

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java?rev=1822780&r1=1822779&r2=1822780&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java Wed Jan 31 09:17:10 2018
@@ -227,7 +227,10 @@ public class BlueprintContainerImpl
             waitForDependencies = Boolean.parseBoolean(graceperiod);
         }
 
-        xmlValidation = paths.get(0).getDirective(BlueprintConstants.XML_VALIDATION);
+        xmlValidation = bundleContext.getProperty(BlueprintConstants.XML_VALIDATION_PROPERTY);
+        if (xmlValidation == null) {
+            xmlValidation = paths.get(0).getDirective(BlueprintConstants.XML_VALIDATION);
+        }
         // enabled if null or "true"; structure-only if "structure"; disabled otherwise
         LOGGER.debug("Xml-validation directive: {}", xmlValidation);
     }

Modified: aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/BlueprintConstants.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/BlueprintConstants.java?rev=1822780&r1=1822779&r2=1822780&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/BlueprintConstants.java (original)
+++ aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/BlueprintConstants.java Wed Jan 31 09:17:10 2018
@@ -45,4 +45,7 @@ public interface BlueprintConstants  {
     String PREEMPTIVE_SHUTDOWN_PROPERTY = "org.apache.aries.blueprint.preemptiveShutdown";
 
     String SYNCHRONOUS_PROPERTY = "org.apache.aries.blueprint.synchronous";
+
+    String XML_VALIDATION_PROPERTY = "org.apache.aries.blueprint.xml.validation";
+
 }