geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
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 GMT
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<URL> classPath);
+    BeanContainer createChild(Collection<URL> 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<URL> classPath)
{
-        assert id != null;
+    public BeanContainer createChild(final Collection<URL> 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> T getBean(final Class<T> 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[] {



Mime
View raw message