You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/10/22 15:23:08 UTC
svn commit: r707067 - in
/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src:
main/java/org/apache/geronimo/gshell/wisdom/plugin/
main/resources/META-INF/gshell/
test/resources/org/apache/geronimo/gshell/wisdom/registry/
Author: jdillon
Date: Wed Oct 22 06:23:07 2008
New Revision: 707067
URL: http://svn.apache.org/viewvc?rev=707067&view=rev
Log:
Fix up tests
Modified:
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/gshell/components.xml
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImplTest-context.xml
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=707067&r1=707066&r2=707067&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 06:23:07 2008
@@ -29,7 +29,6 @@
import org.apache.geronimo.gshell.event.Event;
import org.apache.geronimo.gshell.event.EventListener;
import org.apache.geronimo.gshell.event.EventManager;
-import org.apache.geronimo.gshell.event.EventPublisher;
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerAware;
import org.apache.geronimo.gshell.wisdom.application.ApplicationConfiguredEvent;
@@ -67,19 +66,16 @@
private final EventManager eventManager;
- private final EventPublisher eventPublisher;
-
private BeanContainer container;
private Set<Plugin> plugins = new LinkedHashSet<Plugin>();
- public PluginManagerImpl(final ApplicationManager applicationManager, final EventManager eventManager, final EventPublisher eventPublisher) {
+ public PluginManagerImpl(final ApplicationManager applicationManager, final EventManager eventManager) {
assert applicationManager != null;
this.applicationManager = applicationManager;
+
assert eventManager != null;
this.eventManager = eventManager;
- assert eventPublisher != null;
- this.eventPublisher = eventPublisher;
}
public void setBeanContainer(final BeanContainer container) {
@@ -156,7 +152,7 @@
log.debug("Loaded plugin in: {}", watch);
- eventPublisher.publish(new PluginLoadedEvent(plugin, artifact));
+ eventManager.getPublisher().publish(new PluginLoadedEvent(plugin, artifact));
}
private ClassPath loadClassPath(final Application application, final Artifact artifact) throws Exception {
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/gshell/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/gshell/components.xml?rev=707067&r1=707066&r2=707067&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/gshell/components.xml (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/gshell/components.xml Wed Oct 22 06:23:07 2008
@@ -40,7 +40,7 @@
</property>
</bean>
- <bean id="org.apache.commons.vfs.provider.FileReplicator" class="org.apache.commons.vfs.impl.DefaultFileReplicator">
+ <bean id="fileReplicator" class="org.apache.commons.vfs.impl.DefaultFileReplicator">
<constructor-arg value="${gshell.home}/var/tmp"/>
</bean>
@@ -53,11 +53,11 @@
<property name="fileReplicator">
<bean class="org.apache.commons.vfs.impl.PrivilegedFileReplicator">
- <constructor-arg ref="org.apache.commons.vfs.provider.FileReplicator"/>
+ <constructor-arg ref="fileReplicator"/>
</bean>
</property>
- <property name="temporaryFileStore" ref="org.apache.commons.vfs.provider.FileReplicator"/>
+ <property name="temporaryFileStore" ref="fileReplicator"/>
<property name="fileContentInfoFactory">
<bean class="org.apache.commons.vfs.impl.FileContentInfoFilenameFactory"/>
@@ -160,7 +160,6 @@
<bean id="pluginManager" class="org.apache.geronimo.gshell.wisdom.plugin.PluginManagerImpl">
<constructor-arg ref="applicationManager"/>
<constructor-arg ref="eventManager"/>
- <constructor-arg ref="eventManager"/>
</bean>
<bean id="pluginMetaMapper" class="org.apache.geronimo.gshell.wisdom.plugin.PluginMetaMapper">
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImplTest-context.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImplTest-context.xml?rev=707067&r1=707066&r2=707067&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImplTest-context.xml (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImplTest-context.xml Wed Oct 22 06:23:07 2008
@@ -33,7 +33,7 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <bean id="org.apache.commons.vfs.provider.FileReplicator" class="org.apache.commons.vfs.impl.DefaultFileReplicator">
+ <bean id="fileReplicator" class="org.apache.commons.vfs.impl.DefaultFileReplicator">
<constructor-arg value="${basedir}/target/tmp"/>
</bean>