Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 75810 invoked from network); 22 Oct 2008 12:59:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Oct 2008 12:59:21 -0000 Received: (qmail 15854 invoked by uid 500); 22 Oct 2008 12:59:23 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 15847 invoked by uid 500); 22 Oct 2008 12:59:23 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 15838 invoked by uid 99); 22 Oct 2008 12:59:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Oct 2008 05:59:23 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Oct 2008 12:58:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 34EDA238895F; Wed, 22 Oct 2008 05:58:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r707062 - in /geronimo/gshell/trunk: gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/ gshell-wisdom/gshell-wisdo... Date: Wed, 22 Oct 2008 12:58:59 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081022125859.34EDA238895F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdillon Date: Wed Oct 22 05:58:58 2008 New Revision: 707062 URL: http://svn.apache.org/viewvc?rev=707062&view=rev Log: Drop createChild() ids Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.java geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainer.java geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.java?rev=707062&r1=707061&r2=707062&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.java (original) +++ geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/OpenShellHandler.java Wed Oct 22 05:58:58 2008 @@ -23,14 +23,12 @@ import org.apache.geronimo.gshell.io.IO; import org.apache.geronimo.gshell.remote.message.OpenShellMessage; import org.apache.geronimo.gshell.remote.server.RemoteIO; -import org.apache.geronimo.gshell.shell.ShellContext; import org.apache.geronimo.gshell.shell.Shell; +import org.apache.geronimo.gshell.shell.ShellContext; import org.apache.geronimo.gshell.spring.BeanContainer; import org.apache.geronimo.gshell.spring.BeanContainerAware; import org.apache.geronimo.gshell.whisper.transport.Session; -import java.util.UUID; - /** * Server handler for {@link OpenShellMessage} messages. * @@ -56,8 +54,7 @@ assert message != null; // Create a new container which will be the parent for our remote shells - String id = "gshell.remote-shell[" + UUID.randomUUID() + "]"; - context.container = container.createChild(id); + context.container = container.createChild(); context.container.loadBeans(new String[] { "classpath*:META-INF/spring/components.xml" }); Modified: geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainer.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainer.java?rev=707062&r1=707061&r2=707062&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainer.java (original) +++ geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainer.java Wed Oct 22 05:58:58 2008 @@ -46,7 +46,7 @@ String[] getBeanNames(Class type); - BeanContainer createChild(String id, Collection classPath); + BeanContainer createChild(Collection classPath); - BeanContainer createChild(String id); + BeanContainer createChild(); } Modified: geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java?rev=707062&r1=707061&r2=707062&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java (original) +++ geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java Wed Oct 22 05:58:58 2008 @@ -63,10 +63,6 @@ // Add support for BeanContainerAware context.addBeanPostProcessor(new BeanContainerAwareProcessor(this)); - // Hook up annotation processing - // context.addBeanPostProcessor(new RequiredAnnotationBeanPostProcessor()); - // context.addBeanPostProcessor(new LifecycleProcessor()); - // Add automatic trace logging of loaded beans context.addBeanFactoryPostProcessor(new LoggingProcessor()); } @@ -96,12 +92,11 @@ log.debug("Loaded beans after: {}", watch); } - public BeanContainer createChild(final String id, final Collection classPath) { - assert id != null; + public BeanContainer createChild(final Collection classPath) { // classPath may be null - log.debug("Creating child container: {}", id); - + log.debug("Creating child container"); + if (log.isTraceEnabled()) { if (classPath != null) { log.trace("Classpath:"); @@ -120,17 +115,12 @@ childLoader = new URLClassLoader(new URL[0], classLoader); } - // - // FIXME: Id is not used, either use it or drop it - // return new BeanContainerImpl(childLoader, this); } - public BeanContainer createChild(final String id) { - assert id != null; - - return createChild(id, null); + public BeanContainer createChild() { + return createChild(null); } public T getBean(final Class type) { Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java?rev=707062&r1=707061&r2=707062&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java (original) +++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java Wed Oct 22 05:58:58 2008 @@ -125,7 +125,7 @@ ClassPath classPath = loadClassPath(model); app.initClassPath(classPath); - BeanContainer child = container.createChild("gshell.application(" + model.getId() + ")", classPath.getUrls()); + BeanContainer child = container.createChild(classPath.getUrls()); log.debug("Application container: {}", child); child.loadBeans(new String[] { Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java?rev=707062&r1=707061&r2=707062&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java (original) +++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java Wed Oct 22 05:58:58 2008 @@ -135,7 +135,7 @@ ClassPath classPath = loadClassPath(application, artifact); - BeanContainer pluginContainer = container.createChild("gshell.plugin(" + artifact.getId() + ")", classPath.getUrls()); + BeanContainer pluginContainer = container.createChild(classPath.getUrls()); log.debug("Created plugin container: {}", pluginContainer); pluginContainer.loadBeans(new String[] {