Author: dkulp
Date: Mon Feb 23 17:43:57 2015
New Revision: 1661722
URL: http://svn.apache.org/r1661722
Log:
Update BlueprintContainerImpl to allow disabling the validation. Useful for
tests.
Modified:
aries/trunk/blueprint/blueprint-noosgi/pom.xml
aries/trunk/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
Modified: aries/trunk/blueprint/blueprint-noosgi/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-noosgi/pom.xml?rev=1661722&r1=1661721&r2=1661722&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-noosgi/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-noosgi/pom.xml Mon Feb 23 17:43:57 2015
@@ -31,7 +31,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.noosgi</artifactId>
<packaging>jar</packaging>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<name>Apache Aries Blueprint no-OSGI</name>
<description>
This jar contains everything needed to run Blueprint outside OSGi.
@@ -45,8 +45,8 @@
<properties>
<blueprint.api.version>1.0.0</blueprint.api.version>
- <blueprint.core.version>1.0.0</blueprint.core.version>
- <blueprint.parser.version>1.0.0</blueprint.parser.version>
+ <blueprint.core.version>1.4.3</blueprint.core.version>
+ <blueprint.parser.version>1.3.0</blueprint.parser.version>
<proxy.impl.version>1.0.3</proxy.impl.version>
</properties>
Modified:
aries/trunk/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java?rev=1661722&r1=1661721&r2=1661722&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
(original)
+++
aries/trunk/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
Mon Feb 23 17:43:57 2015
@@ -98,6 +98,9 @@ public class BlueprintContainerImpl impl
}
public void init() throws Exception {
+ init(true);
+ }
+ public void init(boolean validate) throws Exception {
// Parse xml resources
Parser parser = new Parser();
parser.parse(getResources());
@@ -107,8 +110,10 @@ public class BlueprintContainerImpl impl
NamespaceHandlerSet handlerSet = createNamespaceHandlerSet(namespaces);
// Add predefined beans
componentDefinitionRegistry.registerComponentDefinition(new
PassThroughMetadataImpl("blueprintContainer", this));
- // Validate
- parser.validate(handlerSet.getSchema());
+ if (validate) {
+ // Validate
+ parser.validate(handlerSet.getSchema());
+ }
// Populate
parser.populate(handlerSet, componentDefinitionRegistry);
// Create repository
