You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2009/06/26 17:16:45 UTC
svn commit: r788733 - in /geronimo/sandbox/blueprint:
blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java
blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java
Author: gnodet
Date: Fri Jun 26 15:16:44 2009
New Revision: 788733
URL: http://svn.apache.org/viewvc?rev=788733&view=rev
Log:
Remove compliance property on the container
Modified:
geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java
Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java?rev=788733&r1=788732&r2=788733&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java Fri Jun 26 15:16:44 2009
@@ -46,16 +46,6 @@
public interface BlueprintContainer {
/**
- * The container will apply strict compliance rules
- */
- static final int COMPLIANCE_STRICT = 1;
-
- /**
- * The container will use loose compliance rules
- */
- static final int COMPLIANCE_LOOSE = 2;
-
- /**
* The set of component names recognized by the blueprint context.
*
* @return an immutable set (of Strings) containing the names of all of the
@@ -136,15 +126,4 @@
*/
BundleContext getBundleContext();
- /**
- * Returns the compliance rule in effect for the target BlueprintContainer.
- * COMPLIANCE_LOOSE is returned if any configuration file for the container
- * specifies loose compliance.
- *
- * @return The value COMPLIANCE_STRICT if strict compliance (the default) is
- * used for all configuration files, or the value COMPLIANCE_LOOSE
- * if loose complance is specified in any of the configuration
- * files.
- */
- int getCompliance();
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java?rev=788733&r1=788732&r2=788733&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java Fri Jun 26 15:16:44 2009
@@ -118,7 +118,6 @@
private long timeout = 5 * 60 * 1000;
private boolean waitForDependencies = true;
private boolean xmlValidation = true;
- private int compliance = COMPLIANCE_STRICT;
private ScheduledFuture timeoutFuture;
private final AtomicBoolean scheduled = new AtomicBoolean();
private final AtomicBoolean running = new AtomicBoolean();
@@ -136,10 +135,6 @@
this.processors = new ArrayList<Processor>();
}
- public int getCompliance() {
- return compliance;
- }
-
public Bundle getExtenderBundle() {
return extenderBundle;
}
@@ -185,8 +180,6 @@
LOGGER.debug("Xml-validation directive: " + xmlValidationDirective);
xmlValidation = Boolean.parseBoolean(xmlValidationDirective);
}
-
- // TODO: load compliant
}
public void schedule() {