The following change actually breaks the way processor works.
In karaf we do use layered property placeholders and this does not work
anymore.
For example, the following does not work anymore
<ext:property-placeholder placeholder-prefix="$("
placeholder-suffix=")"/>
<ext:property-placeholder placeholder-prefix="$["
placeholder-suffix="]" ignore-missing-locations="true">
<ext:default-properties>
<ext:property name="featuresRepositories" value=""/>
<ext:property name="featuresBoot" value=""/>
<ext:property name="resolverTimeout" value="5000"/>
</ext:default-properties>
<ext:location>file:$(karaf.base)/etc/org.apache.karaf.features.cfg</ext:location>
</ext:property-placeholder>
On Fri, Oct 26, 2012 at 8:19 PM, <[email protected]> wrote:
> Author: dkulp
> Date: Fri Oct 26 18:19:16 2012
> New Revision: 1402606
>
> URL: http://svn.apache.org/viewvc?rev=1402606&view=rev
> Log:
> Attempt to fix some hard to debug blueprint "grace period" hangs.
> If a bundle has multiple processors, only stop and restart the services
> references once.
>
> Modified:
>
> aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AbstractServiceReferenceRecipe.java
>
> aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.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=1402606&r1=1402605&r2=1402606&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
> Fri Oct 26 18:19:16 2012
> @@ -475,6 +475,7 @@ public class BlueprintContainerImpl
> }
>
> private void processProcessors() throws Exception {
> + boolean changed = false;
> // Instanciate ComponentDefinitionRegistryProcessor and
> BeanProcessor
> for (BeanMetadata bean : getMetadata(BeanMetadata.class)) {
> if (bean instanceof ExtendedBeanMetadata &&
> !((ExtendedBeanMetadata) bean).isProcessor()) {
> @@ -495,12 +496,16 @@ public class BlueprintContainerImpl
> if
> (ComponentDefinitionRegistryProcessor.class.isAssignableFrom(clazz)) {
> Object obj = repository.create(bean.getId(),
> ProxyUtils.asList(ComponentDefinitionRegistryProcessor.class));
> ((ComponentDefinitionRegistryProcessor)
> obj).process(componentDefinitionRegistry);
> + changed = true;
> } else if (Processor.class.isAssignableFrom(clazz)) {
> Object obj = repository.create(bean.getId(),
> ProxyUtils.asList(Processor.class));
> this.processors.add((Processor) obj);
> + changed = true;
> } else {
> continue;
> }
> + }
> + if (changed) {
> // Update repository with recipes processed by the processors
> untrackServiceReferences();
> Repository tmpRepo = new RecipeBuilder(this,
> tempRecipeIdSpace).createRepository();
> @@ -527,7 +532,6 @@ public class BlueprintContainerImpl
> LOGGER.debug("Recipe {} is already instantiated and
> cannot be updated", new Object[] { name });
> }
> }
> -
> getSatisfiableDependenciesMap(true);
> trackServiceReferences();
> }
>
>
>
--
------------------------
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
FuseSource, Integration everywhere
http://fusesource.com
