You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2008/10/15 20:02:17 UTC
svn commit: r704974 - in /geronimo/gshell/trunk:
gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/
gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/
Author: gnodet
Date: Wed Oct 15 11:02:16 2008
New Revision: 704974
URL: http://svn.apache.org/viewvc?rev=704974&view=rev
Log:
Remove unneeded dependency on classrealms
Modified:
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-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java
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=704974&r1=704973&r2=704974&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 15 11:02:16 2008
@@ -19,8 +19,6 @@
package org.apache.geronimo.gshell.spring;
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
-
import java.net.URL;
import java.util.Collection;
import java.util.Map;
@@ -34,7 +32,7 @@
{
BeanContainer getParent();
- ClassRealm getClassRealm();
+ ClassLoader getClassLoader();
void loadBeans(String[] locations) throws Exception;
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=704974&r1=704973&r2=704974&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 15 11:02:16 2008
@@ -76,7 +76,7 @@
context.addBeanFactoryPostProcessor(new LoggingProcessor());
}
- public ClassRealm getClassRealm() {
+ public ClassLoader getClassLoader() {
return classRealm;
}
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java?rev=704974&r1=704973&r2=704974&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/command/CommandSupport.java Wed Oct 15 11:02:16 2008
@@ -187,7 +187,7 @@
// Set the TCL to the command bean containers realm
final ClassLoader prevCL = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(getContainer().getClassRealm());
+ Thread.currentThread().setContextClassLoader(getContainer().getClassLoader());
CommandResult result;