Author: gnodet
Date: Fri Feb 16 08:24:37 2018
New Revision: 1824428
URL: http://svn.apache.org/viewvc?rev=1824428&view=rev
Log:
[ARIES-1009] BlueprintContainerImpl - Add INFO logging when the blueprint
container has been created
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.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=1824428&r1=1824427&r2=1824428&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 Feb 16 08:24:37 2018
@@ -298,7 +298,7 @@ public class BlueprintContainerImpl
if (bundle.getBundleContext() != bundleContext) {
return;
}
- LOGGER.debug("Running blueprint container for bundle {}/{} in
state {}", getBundle().getSymbolicName(), getBundle().getVersion(), state);
+ LOGGER.debug("Running container for blueprint bundle {}/{} in
state {}", getBundle().getSymbolicName(), getBundle().getVersion(), state);
switch (state) {
case Unknown:
readDirectives();
@@ -324,7 +324,7 @@ public class BlueprintContainerImpl
}
}
if (missing.size() > 0) {
- LOGGER.info("Bundle {}/{} is waiting for namespace
handlers {}", getBundle().getSymbolicName(), getBundle().getVersion(),
missingURIs);
+ LOGGER.info("Blueprint bundle {}/{} is waiting for
namespace handlers {}", getBundle().getSymbolicName(),
getBundle().getVersion(), missingURIs);
eventDispatcher.blueprintEvent(new
BlueprintEvent(BlueprintEvent.GRACE_PERIOD, getBundle(), getExtenderBundle(),
missing.toArray(new String[missing.size()])));
return;
}
@@ -373,7 +373,7 @@ public class BlueprintContainerImpl
Throwable t = new TimeoutException();
state = State.Failed;
tidyupComponents();
- LOGGER.error("Unable to start blueprint
container for bundle {}/{} due to unresolved dependencies {}",
getBundle().getSymbolicName(), getBundle().getVersion(),
Arrays.asList(missingDependecies), t);
+ LOGGER.error("Unable to start container
for blueprint bundle {}/{} due to unresolved dependencies {}",
getBundle().getSymbolicName(), getBundle().getVersion(),
Arrays.asList(missingDependecies), t);
eventDispatcher.blueprintEvent(new
BlueprintEvent(BlueprintEvent.FAILURE, getBundle(), getExtenderBundle(),
missingDependecies, t));
}
}
@@ -385,7 +385,7 @@ public class BlueprintContainerImpl
if (waitForDependencies) {
String[] missingDependencies =
getMissingDependencies();
if (missingDependencies.length > 0) {
- LOGGER.info("Bundle {}/{} is waiting for
dependencies {}", getBundle().getSymbolicName(), getBundle().getVersion(),
Arrays.asList(missingDependencies));
+ LOGGER.info("Blueprint bundle {}/{} is waiting
for dependencies {}", getBundle().getSymbolicName(), getBundle().getVersion(),
Arrays.asList(missingDependencies));
eventDispatcher.blueprintEvent(new
BlueprintEvent(BlueprintEvent.GRACE_PERIOD, getBundle(), getExtenderBundle(),
missingDependencies));
return;
}
@@ -401,7 +401,7 @@ public class BlueprintContainerImpl
if (waitForDependencies) {
String[] missingDependencies =
getMissingDependencies();
if (missingDependencies.length > 0) {
- LOGGER.info("Bundle {}/{} is waiting for
dependencies {}", getBundle().getSymbolicName(), getBundle().getVersion(),
Arrays.asList(missingDependencies));
+ LOGGER.info("Blueprint bundle {}/{} is waiting
for dependencies {}", getBundle().getSymbolicName(), getBundle().getVersion(),
Arrays.asList(missingDependencies));
eventDispatcher.blueprintEvent(new
BlueprintEvent(BlueprintEvent.GRACE_PERIOD, getBundle(), getExtenderBundle(),
missingDependencies));
return;
}
@@ -423,6 +423,7 @@ public class BlueprintContainerImpl
JavaUtils.getBundleVersion(bundle));
registration = registerService(new
String[]{BlueprintContainer.class.getName()}, this, props);
}
+ LOGGER.info("Blueprint bundle {}/{} has been started",
getBundle().getSymbolicName(), getBundle().getVersion());
eventDispatcher.blueprintEvent(new
BlueprintEvent(BlueprintEvent.CREATED, getBundle(), getExtenderBundle()));
state = State.Created;
break;
@@ -436,7 +437,7 @@ public class BlueprintContainerImpl
state = State.Failed;
cancelFutureIfPresent();
tidyupComponents();
- LOGGER.error("Unable to start blueprint container for bundle
{}/{}", getBundle().getSymbolicName(), getBundle().getVersion(), t);
+ LOGGER.error("Unable to start container for blueprint bundle
{}/{}", getBundle().getSymbolicName(), getBundle().getVersion(), t);
eventDispatcher.blueprintEvent(new
BlueprintEvent(BlueprintEvent.FAILURE, getBundle(), getExtenderBundle(), t));
} catch (RuntimeException re) {
LOGGER.debug("Tidying up components failed. ", re);
@@ -902,7 +903,7 @@ public class BlueprintContainerImpl
tidyupComponents();
eventDispatcher.blueprintEvent(new
BlueprintEvent(BlueprintEvent.DESTROYED, getBundle(), getExtenderBundle()));
- LOGGER.debug("Blueprint container {} destroyed",
getBundle().getSymbolicName(), getBundle().getVersion());
+ LOGGER.debug("Container destroyed for blueprint bundle {}/{}",
getBundle().getSymbolicName(), getBundle().getVersion());
}
public static void safeUnregisterService(ServiceRegistration reg) {
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=1824428&r1=1824427&r2=1824428&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
Fri Feb 16 08:24:37 2018
@@ -303,7 +303,7 @@ public class BlueprintExtender implement
}
return true;
} catch (Throwable t) {
- LOGGER.warn("Error while creating blueprint container for bundle
{}/{}", bundle.getSymbolicName(), bundle.getVersion(), t);
+ LOGGER.warn("Error while creating container for blueprint bundle
{}/{}", bundle.getSymbolicName(), bundle.getVersion(), t);
return false;
}
}
@@ -311,19 +311,19 @@ public class BlueprintExtender implement
private void destroyContainer(final Bundle bundle) {
FutureTask future;
synchronized (containers) {
- LOGGER.debug("Starting BlueprintContainer destruction process for
bundle {}/{}", bundle.getSymbolicName(), bundle.getVersion());
+ LOGGER.debug("Starting container destruction process for blueprint
bundle {}/{}", bundle.getSymbolicName(), bundle.getVersion());
future = destroying.get(bundle);
if (future == null) {
final BlueprintContainerImpl blueprintContainer =
containers.remove(bundle);
if (blueprintContainer != null) {
- LOGGER.debug("Scheduling BlueprintContainer destruction
for {}/{}.", bundle.getSymbolicName(), bundle.getVersion());
+ LOGGER.debug("Scheduling container destruction for
blueprint bundle {}/{}.", bundle.getSymbolicName(), bundle.getVersion());
future = new FutureTask<Void>(new Runnable() {
public void run() {
- LOGGER.info("Destroying BlueprintContainer for
bundle {}/{}", bundle.getSymbolicName(), bundle.getVersion());
+ LOGGER.info("Destroying container for blueprint
bundle {}/{}", bundle.getSymbolicName(), bundle.getVersion());
try {
blueprintContainer.destroy();
} finally {
- LOGGER.debug("Finished destroying
BlueprintContainer for bundle {}/{}", bundle.getSymbolicName(),
bundle.getVersion());
+ LOGGER.debug("Finished destroying container
for blueprint bundle {}/{}", bundle.getSymbolicName(), bundle.getVersion());
eventDispatcher.removeBlueprintBundle(bundle);
synchronized (containers) {
destroying.remove(bundle);
@@ -333,19 +333,19 @@ public class BlueprintExtender implement
}, null);
destroying.put(bundle, future);
} else {
- LOGGER.debug("Not a blueprint bundle or destruction of
BlueprintContainer already finished for {}/{}.", bundle.getSymbolicName(),
bundle.getVersion());
+ LOGGER.debug("Not a blueprint bundle or destruction of
container already finished for {}/{}.", bundle.getSymbolicName(),
bundle.getVersion());
}
} else {
- LOGGER.debug("Destruction already scheduled for {}/{}.",
bundle.getSymbolicName(), bundle.getVersion());
+ LOGGER.debug("Destruction already scheduled for blueprint
bundle {}/{}.", bundle.getSymbolicName(), bundle.getVersion());
}
}
if (future != null) {
try {
- LOGGER.debug("Waiting for BlueprintContainer destruction for
{}/{}.", bundle.getSymbolicName(), bundle.getVersion());
+ LOGGER.debug("Waiting for container destruction for blueprint
bundle {}/{}.", bundle.getSymbolicName(), bundle.getVersion());
future.run();
future.get();
} catch (Throwable t) {
- LOGGER.warn("Error while destroying blueprint container for
bundle {}/{}", bundle.getSymbolicName(), bundle.getVersion(), t);
+ LOGGER.warn("Error while destroying container for blueprint
bundle {}/{}", bundle.getSymbolicName(), bundle.getVersion(), t);
}
}
}
