From 85517220fabbfb9da8bbf7e364300b705b0a92ea Mon Sep 17 00:00:00 2001 From: Hugues Malphettes Date: Sun, 24 Oct 2010 15:25:10 +0000 Subject: [PATCH] cleanup some System.err git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2396 7e9141cc-0065-0410-87d8-b60c137991c4 --- .../internal/serverfactory/DefaultJettyAtJettyHomeHelper.java | 3 ++- .../internal/webapp/JettyContextHandlerServiceTracker.java | 2 +- .../osgi/boot/internal/webapp/WebBundleDeployerHelper.java | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java index 7456cba0374..9bf3f100ca1 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java @@ -25,6 +25,7 @@ import org.eclipse.jetty.osgi.boot.JettyBootstrapActivator; import org.eclipse.jetty.osgi.boot.OSGiServerConstants; import org.eclipse.jetty.osgi.boot.utils.BundleFileLocatorHelper; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.util.log.Log; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -135,7 +136,7 @@ public class DefaultJettyAtJettyHomeHelper { String configURLs = jettyHome != null ? getJettyConfigurationURLs(jettyHome) : getJettyConfigurationURLs(jettyHomeBundle); properties.put(OSGiServerConstants.MANAGED_JETTY_XML_CONFIG_URLS, configURLs); - System.err.println("Configuring the default jetty server with " + configURLs); + Log.info("Configuring the default jetty server with " + configURLs); //these properties usually are the ones passed to this type of configuration. setProperty(properties,SYS_PROP_JETTY_HOME,System.getProperty(SYS_PROP_JETTY_HOME)); diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java index efb908239ac..dac139c4072 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java @@ -362,7 +362,7 @@ public class JettyContextHandlerServiceTracker implements ServiceListener managedServerName = OSGiServerConstants.MANAGED_JETTY_SERVER_DEFAULT_NAME; } ServerInstanceWrapper wrapper = _registry.getServerInstanceWrapper(managedServerName); - System.err.println("Returning " + managedServerName + " = " + wrapper); + //System.err.println("Returning " + managedServerName + " = " + wrapper); return wrapper; } diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java index f43dbb31df6..46f20774305 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java @@ -610,8 +610,7 @@ public class WebBundleDeployerHelper implements IWebBundleDeployerHelper } catch (Throwable t) { - System.err.println("Unable to set 'this.bundle.install' " + " for the bundle " + bundle.getSymbolicName()); - t.printStackTrace(); + __logger.error("Unable to set 'this.bundle.install' " + " for the bundle " + bundle.getSymbolicName(), t); } }