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:02 UTC
svn commit: r1822779 - in /aries/trunk/blueprint:
blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
blueprint-parser/src/main/java/org/apache/aries/blueprint/BlueprintConstants.java
Author: gnodet
Date: Wed Jan 31 09:17:02 2018
New Revision: 1822779
URL: http://svn.apache.org/viewvc?rev=1822779&view=rev
Log:
Add constants to the BlueprintConstants interface
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.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/BlueprintExtender.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java?rev=1822779&r1=1822778&r2=1822779&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java Wed Jan 31 09:17:02 2018
@@ -89,7 +89,7 @@ public class BlueprintExtender implement
LOGGER.debug("Starting blueprint extender...");
this.context = ctx;
- boolean useSystemContext = Boolean.parseBoolean(ctx.getProperty("org.apache.aries.blueprint.use.system.context"));
+ boolean useSystemContext = Boolean.parseBoolean(ctx.getProperty(BlueprintConstants.USE_SYSTEM_CONTEXT_PROPERTY));
BundleContext trackingContext = useSystemContext ? ctx.getBundle(Constants.SYSTEM_BUNDLE_LOCATION).getBundleContext() : ctx;
handlers = new NamespaceHandlerRegistryImpl(trackingContext);
@@ -137,7 +137,7 @@ public class BlueprintExtender implement
proxyManager.open();
// Determine if the ParserService should ignore unknown namespace handlers
- boolean ignoreUnknownNamespaceHandlers = Boolean.parseBoolean(ctx.getProperty("org.apache.aries.blueprint.parser.service.ignore.unknown.namespace.handlers"));
+ boolean ignoreUnknownNamespaceHandlers = Boolean.parseBoolean(ctx.getProperty(BlueprintConstants.IGNORE_UNKNOWN_NAMESPACE_HANDLERS_PROPERTY));
// Create and publish a ParserService
parserServiceReg = ctx.registerService(ParserService.class.getName(),
new ParserServiceImpl (handlers, ignoreUnknownNamespaceHandlers),
@@ -224,7 +224,7 @@ public class BlueprintExtender implement
// do an orderly shutdown of all blueprint contexts now
// so that service usage can actually be useful
if (context.getBundle(0).equals(bundle) && bundle.getState() == Bundle.STOPPING) {
- String val = context.getProperty("org.apache.aries.blueprint.preemptiveShutdown");
+ String val = context.getProperty(BlueprintConstants.PREEMPTIVE_SHUTDOWN_PROPERTY);
if (val == null || Boolean.parseBoolean(val)) {
stop(context);
return;
@@ -294,7 +294,7 @@ public class BlueprintExtender implement
return false;
}
}
- String val = context.getProperty("org.apache.aries.blueprint.synchronous");
+ String val = context.getProperty(BlueprintConstants.SYNCHRONOUS_PROPERTY);
if (Boolean.parseBoolean(val)) {
LOGGER.debug("Starting creation of blueprint bundle {}/{} synchronously", bundle.getSymbolicName(), bundle.getVersion());
blueprintContainer.run();
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=1822779&r1=1822778&r2=1822779&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:02 2018
@@ -20,21 +20,29 @@ package org.apache.aries.blueprint;
public interface BlueprintConstants {
- public static final String BUNDLE_BLUEPRINT_HEADER = "Bundle-Blueprint";
+ String BUNDLE_BLUEPRINT_HEADER = "Bundle-Blueprint";
- public static final String BUNDLE_BLUEPRINT_ANNOTATION_HEADER = "Bundle-Blueprint-Annotation";
+ String BUNDLE_BLUEPRINT_ANNOTATION_HEADER = "Bundle-Blueprint-Annotation";
- public static final String TIMEOUT_DIRECTIVE = "blueprint.timeout";
+ String TIMEOUT_DIRECTIVE = "blueprint.timeout";
- public static final String GRACE_PERIOD = "blueprint.graceperiod";
+ String GRACE_PERIOD = "blueprint.graceperiod";
- public static final String BUNDLE_VERSION = "bundle.version";
+ String BUNDLE_VERSION = "bundle.version";
- public static final String COMPONENT_NAME_PROPERTY = "osgi.service.blueprint.compname";
+ String COMPONENT_NAME_PROPERTY = "osgi.service.blueprint.compname";
- public static final String CONTAINER_SYMBOLIC_NAME_PROPERTY = "osgi.blueprint.container.symbolicname";
+ String CONTAINER_SYMBOLIC_NAME_PROPERTY = "osgi.blueprint.container.symbolicname";
- public static final String CONTAINER_VERSION_PROPERTY = "osgi.blueprint.container.version";
+ String CONTAINER_VERSION_PROPERTY = "osgi.blueprint.container.version";
- public static final String XML_VALIDATION = "blueprint.aries.xml-validation";
+ String XML_VALIDATION = "blueprint.aries.xml-validation";
+
+ String USE_SYSTEM_CONTEXT_PROPERTY = "org.apache.aries.blueprint.use.system.context";
+
+ String IGNORE_UNKNOWN_NAMESPACE_HANDLERS_PROPERTY = "org.apache.aries.blueprint.parser.service.ignore.unknown.namespace.handlers";
+
+ String PREEMPTIVE_SHUTDOWN_PROPERTY = "org.apache.aries.blueprint.preemptiveShutdown";
+
+ String SYNCHRONOUS_PROPERTY = "org.apache.aries.blueprint.synchronous";
}