(no commit message)

[utils] / system / general / src / main / java / org / wamblee / system / container / Container.java

diff --git a/system/general/src/main/java/org/wamblee/system/container/Container.java b/system/general/src/main/java/org/wamblee/system/container/Container.java
index ab27e7c07f896c35d9f72e4c8cdacaf06760f371..2baaa2021ab18be7c979ff5fbeee64c2c52577bc 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/container/Container.java
+++ b/system/general/src/main/java/org/wamblee/system/container/Container.java
@@ -1,12 +1,12 @@
 /*
- * Copyright 2007 the original author or authors.
- *
+ * Copyright 2005-2010 the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,11 +15,13 @@
  */
 package org.wamblee.system.container;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.wamblee.general.Pair;
-
 import org.wamblee.system.core.AbstractComponent;
 import org.wamblee.system.core.Component;
 import org.wamblee.system.core.DefaultScope;
@@ -34,17 +36,14 @@ import org.wamblee.system.graph.component.ConnectExternalProvidedProvidedFilter;
 import org.wamblee.system.graph.component.ConnectRequiredExternallyRequiredEdgeFilter;
 import org.wamblee.system.graph.component.ConnectRequiredProvidedEdgeFilter;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * Container consisting of multiple components.
  * 
  * @author Erik Brakkee
  */
 public class Container extends AbstractComponent<Scope> {
-    private static final Log LOG = LogFactory.getLog(Container.class);
+    private static final Logger LOG = Logger.getLogger(Container.class
+        .getName());
 
     private List<Component> components;
 
@@ -369,8 +368,9 @@ public class Container extends AbstractComponent<Scope> {
             } catch (SystemAssemblyException e) {
                 throw e;
             } catch (RuntimeException e) {
-                LOG.error(getQualifiedName() + ": could not start '" +
-                    component.getQualifiedName() + "'", e);
+                LOG.log(Level.WARNING, getQualifiedName() +
+                    ": could not start '" + component.getQualifiedName() + "'",
+                    e);
                 stopAlreadyStartedComponents(started, aScope);
                 throw e;
             }
@@ -408,8 +408,10 @@ public class Container extends AbstractComponent<Scope> {
                 Component component = aStarted.get(i);
                 aStarted.get(i).stop(aScope.getRuntime(component));
             } catch (Throwable t) {
-                LOG.error(getQualifiedName() + ": error stopping " +
-                    aStarted.get(i).getQualifiedName());
+                LOG
+                    .log(Level.WARNING, getQualifiedName() +
+                        ": error stopping " +
+                        aStarted.get(i).getQualifiedName(), t);
             }
         }
     }