[exo-jcr-commits] exo-jcr SVN: r4339 - in kernel/trunk: exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl and 4 other directories.

Author: nfilotto Date: 2011-04-29 15:18:13 -0400 (Fri, 29 Apr 2011) New Revision: 4339 Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/ExoLogger.java kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/Jdk14Configurator.java kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/Log4JConfigurator.java kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/SimpleCommandLineParser.java kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/Listener.java kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/ListenerService.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ConcurrentPicoContainer.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/java/org/exoplatform/kernel/demos/mc/InjectingBean.java Log: EXOJCR-1221: Fix for last existing violation in kernel Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/ExoLogger.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/ExoLogger.java 2011-04-29 18:52:14 UTC (rev 4338) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/ExoLogger.java 2011-04-29 19:18:13 UTC (rev 4339) @@ -127,8 +127,10 @@ } catch (NoClassDefFoundError e) { + // We need to use the standard out print since we are actually + // configuring the logger System.err.println("Could not load logger class factory " + e.getMessage() - + " will use fail over logger instead"); + + " will use fail over logger instead"); //NOSONAR return failOverFactory.getExoLogger(name); } } @@ -152,8 +154,10 @@ } catch (NoClassDefFoundError e) { + // We need to use the standard out print since we are actually + // configuring the logger System.err.println("Could not load logger class factory " + e.getMessage() - + " will use fail over logger instead"); + + " will use fail over logger instead"); //NOSONAR return failOverFactory.getExoLogger(name); } } Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/Jdk14Configurator.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/Jdk14Configurator.java 2011-04-29 18:52:14 UTC (rev 4338) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/Jdk14Configurator.java 2011-04-29 19:18:13 UTC (rev 4339) @@ -48,7 +48,9 @@ } catch (IOException e) { - e.printStackTrace(); + // We need to use the standard out print since we are actually + // configuring the logger + e.printStackTrace(); //NOSONAR } this.properties = properties; } Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/Log4JConfigurator.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/Log4JConfigurator.java 2011-04-29 18:52:14 UTC (rev 4338) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/Log4JConfigurator.java 2011-04-29 19:18:13 UTC (rev 4339) @@ -49,7 +49,9 @@ } catch (Exception e) { - e.printStackTrace(); + // We need to use the standard out print since we are actually + // configuring the logger + e.printStackTrace(); //NOSONAR } return null; } Modified: kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/SimpleCommandLineParser.java =================================================================== --- kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/SimpleCommandLineParser.java 2011-04-29 18:52:14 UTC (rev 4338) +++ kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/SimpleCommandLineParser.java 2011-04-29 19:18:13 UTC (rev 4339) @@ -52,7 +52,6 @@ context.remove(parametersPropertyName); - // TODO make regexp parser // the rules: // first word is command name (should be returned) // else are parameters of command (should be put into Context under name == Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/Listener.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/Listener.java 2011-04-29 18:52:14 UTC (rev 4338) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/Listener.java 2011-04-29 19:18:13 UTC (rev 4339) @@ -29,8 +29,6 @@ */ public abstract class Listener<S, D> extends BaseComponentPlugin { - // TODO: Should have the event name here to avoid the conflict with the plugin - // name /** * This method should be invoked when an event with the same name is Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/ListenerService.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/ListenerService.java 2011-04-29 18:52:14 UTC (rev 4338) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/ListenerService.java 2011-04-29 19:18:13 UTC (rev 4339) @@ -142,7 +142,7 @@ * @param name The name of the event * @param source The source object instance * @param data The data object instance - * @throws Exception TODO: Should not delegate to the method broadcast(Event) + * @throws Exception if an exception occurs */ final public <S, D> void broadcast(String name, S source, D data) throws Exception { Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ConcurrentPicoContainer.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ConcurrentPicoContainer.java 2011-04-29 18:52:14 UTC (rev 4338) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ConcurrentPicoContainer.java 2011-04-29 19:18:13 UTC (rev 4339) @@ -474,8 +474,6 @@ return parent.getComponentInstance(componentAdapter.getComponentKey()); } - // TODO: decide .. exception or null? - // exceptrion: mx: +1, joehni +1 return null; } Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2011-04-29 18:52:14 UTC (rev 4338) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2011-04-29 19:18:13 UTC (rev 4339) @@ -71,7 +71,6 @@ private static StandaloneContainer container; - // TODO use ONLY attribute from context instead private static URL configurationURL = null; private static boolean useDefault = true; @@ -420,9 +419,7 @@ } catch (Exception ex) { - // TODO https://jira.jboss.org/jira/browse/EXOJCR-198 - //System.err.println("Error of default config init: "); - //ex.printStackTrace(); + // ignore me } } Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/java/org/exoplatform/kernel/demos/mc/InjectingBean.java =================================================================== --- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/java/org/exoplatform/kernel/demos/mc/InjectingBean.java 2011-04-29 18:52:14 UTC (rev 4338) +++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/src/main/java/org/exoplatform/kernel/demos/mc/InjectingBean.java 2011-04-29 19:18:13 UTC (rev 4339) @@ -35,9 +35,10 @@ import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants; import org.jboss.kernel.spi.config.KernelConfigurator; -import javax.transaction.TransactionManager; import java.util.Map; +import javax.transaction.TransactionManager; + /** * This POJO demonstrates how to use annotations to perform injections of JBoss Microcontainer components * into a service object configured and managed through exo-kernel. @@ -169,32 +170,38 @@ * @param bindings */ @MapValue( - value = { - @EntryValue( - key = @Value(type = Class.class, string = @StringValue(value = "org.jboss.dependency.spi.Controller", type = Class.class)), - value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME)) - ), - @EntryValue( - key = @Value(type = Class.class, string = @StringValue(value = "org.jboss.kernel.Kernel", type = Class.class)), - value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_NAME)) - ), - @EntryValue( - key = @Value(type = Class.class, string = @StringValue(value = "org.jboss.kernel.spi.dependency.KernelController", type = Class.class)), - value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME)) - ), - @EntryValue( - key = @Value(type = Class.class, string = @StringValue(value = "org.jboss.kernel.spi.registry.KernelBus", type = Class.class)), - value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_BUS_NAME)) - ), - @EntryValue( - key = @Value(type = Class.class, string = @StringValue(value = "org.jboss.kernel.spi.registry.KernelRegistry", type = Class.class)), - value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_REGISTRY_NAME)) - ), - @EntryValue( - key = @Value(type = Class.class, string = @StringValue(value = "org.jboss.kernel.spi.config.KernelConfigurator", type = Class.class)), - value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_CONFIGURATOR_NAME)) - ) - } + value = { + @EntryValue( + key = @Value(type = Class.class, + string = @StringValue(value = "org.jboss.dependency.spi.Controller", type = Class.class)), + value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME)) + ), + @EntryValue( + key = @Value(type = Class.class, + string = @StringValue(value = "org.jboss.kernel.Kernel", type = Class.class)), + value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_NAME)) + ), + @EntryValue( + key = @Value(type = Class.class, + string = @StringValue(value = "org.jboss.kernel.spi.dependency.KernelController", type = Class.class)), + value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME)) + ), + @EntryValue( + key = @Value(type = Class.class, + string = @StringValue(value = "org.jboss.kernel.spi.registry.KernelBus", type = Class.class)), + value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_BUS_NAME)) + ), + @EntryValue( + key = @Value(type = Class.class, + string = @StringValue(value = "org.jboss.kernel.spi.registry.KernelRegistry", type = Class.class)), + value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_REGISTRY_NAME)) + ), + @EntryValue( + key = @Value(type = Class.class, + string = @StringValue(value = "org.jboss.kernel.spi.config.KernelConfigurator", type = Class.class)), + value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_CONFIGURATOR_NAME)) + ) + } ) public void setBindings(Map<Class<?>, Object> bindings) {