diff options
Diffstat (limited to 'jdisc_core/src/main/java/com/yahoo/jdisc/core')
7 files changed, 29 insertions, 29 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ActiveContainer.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ActiveContainer.java index 2c8d1c80b4f..907d2a050fb 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ActiveContainer.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ActiveContainer.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen */ public class ActiveContainer extends AbstractResource implements CurrentContainer { diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java index 7556186c1a9..10b4c9f6508 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java @@ -29,7 +29,7 @@ import java.util.logging.Level; import java.util.logging.Logger; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen * @author bjorncs */ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, CurrentContainer { diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BootstrapLoader.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/BootstrapLoader.java index aa4fc4d1b18..a2e447dddf1 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BootstrapLoader.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/BootstrapLoader.java @@ -2,15 +2,15 @@ package com.yahoo.jdisc.core; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen */ public interface BootstrapLoader { - public void init(String bundleLocation, boolean privileged) throws Exception; + void init(String bundleLocation, boolean privileged) throws Exception; - public void start() throws Exception; + void start() throws Exception; - public void stop() throws Exception; + void stop() throws Exception; - public void destroy(); + void destroy(); } diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/Main.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/Main.java index c3d5460ac38..ce091fa82d0 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/Main.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/Main.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Collections; /** - * @author simon + * @author Simon Thoresen */ public class Main { diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java index 17156d5659c..e72df8fc7e1 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java @@ -6,7 +6,6 @@ import org.osgi.framework.Bundle; import org.osgi.framework.ServiceReference; import org.osgi.service.log.LogService; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.logging.Handler; @@ -14,11 +13,11 @@ import java.util.logging.Level; import java.util.logging.LogRecord; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ class OsgiLogHandler extends Handler { - private static enum LogRecordProperty { + private enum LogRecordProperty { LEVEL, LOGGER_NAME, @@ -32,6 +31,7 @@ class OsgiLogHandler extends Handler { SOURCE_METHOD_NAME, THREAD_ID, THROWN + } private final static Map<String, LogRecordProperty> PROPERTY_MAP = createDictionary(LogRecordProperty.values()); diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogManager.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogManager.java index 524863b1c91..5b0367c5a55 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogManager.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogManager.java @@ -13,7 +13,7 @@ import java.util.logging.Level; import java.util.logging.Logger; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ class OsgiLogManager implements LogService { diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogService.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogService.java index 02f8c85b940..f51891cada4 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogService.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogService.java @@ -4,7 +4,7 @@ package com.yahoo.jdisc.core; import org.osgi.framework.*; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ class OsgiLogService { @@ -38,22 +38,22 @@ class OsgiLogService { return; } switch (event.getType()) { - case ServiceEvent.REGISTERED: - try { - activator.start(ctx); - } catch (Exception e) { - throw new RuntimeException("Exception thrown while starting " + - activator.getClass().getName() + ".", e); - } - break; - case ServiceEvent.UNREGISTERING: - try { - activator.stop(ctx); - } catch (Exception e) { - throw new RuntimeException("Exception thrown while stopping " + - activator.getClass().getName() + ".", e); - } - break; + case ServiceEvent.REGISTERED: + try { + activator.start(ctx); + } catch (Exception e) { + throw new RuntimeException("Exception thrown while starting " + + activator.getClass().getName() + ".", e); + } + break; + case ServiceEvent.UNREGISTERING: + try { + activator.stop(ctx); + } catch (Exception e) { + throw new RuntimeException("Exception thrown while stopping " + + activator.getClass().getName() + ".", e); + } + break; } } } |