geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r707066 - in /geronimo/gshell/trunk: gshell-commands/gshell-admin/src/main/resources/META-INF/gshell/ gshell-commands/gshell-admin/src/main/resources/META-INF/spring/ gshell-commands/gshell-bsf/src/main/resources/META-INF/gshell/ gshell-com...
Date Wed, 22 Oct 2008 13:11:07 GMT
Author: jdillon
Date: Wed Oct 22 06:11:05 2008
New Revision: 707066

URL: http://svn.apache.org/viewvc?rev=707066&view=rev
Log:
Change the location for gshell-sepcific spring configuration files to META-INF/gshell/components.xml

Added:
    geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/META-INF/gshell/
      - copied from r707062, geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/resources/META-INF/gshell/
      - copied from r707062, geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/gshell/
      - copied from r707062, geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/resources/META-INF/gshell/
      - copied from r707062, geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/META-INF/gshell/
      - copied from r707062, geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/gshell/
      - copied from r707062, geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/META-INF/gshell/
      - copied from r707062, geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/META-INF/gshell/
      - copied from r707062, geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/META-INF/gshell/
      - copied from r707062, geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/gshell/
      - copied from r707062, geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-support/gshell-security/src/main/resources/META-INF/gshell/
      - copied from r707062, geronimo/gshell/trunk/gshell-support/gshell-security/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-truezip/src/main/resources/META-INF/gshell/
      - copied from r707062, geronimo/gshell/trunk/gshell-support/gshell-vfs-truezip/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/gshell/
      - copied from r707062, geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/gshell/
      - copied from r707062, geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/
Removed:
    geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-commands/gshell-bsf/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-commands/gshell-log4j/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-commands/gshell-optional/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-commands/gshell-remote/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-remote/gshell-remote-client/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-remote/gshell-remote-server/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-support/gshell-security/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-truezip/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/
Modified:
    geronimo/gshell/trunk/gshell-support/gshell-spring/src/test/java/org/apache/geronimo/gshell/spring/SpringTestSupport.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-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.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-support/gshell-spring/src/test/java/org/apache/geronimo/gshell/spring/SpringTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-spring/src/test/java/org/apache/geronimo/gshell/spring/SpringTestSupport.java?rev=707066&r1=707065&r2=707066&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-spring/src/test/java/org/apache/geronimo/gshell/spring/SpringTestSupport.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-spring/src/test/java/org/apache/geronimo/gshell/spring/SpringTestSupport.java
Wed Oct 22 06:11:05 2008
@@ -47,7 +47,7 @@
     }
 
     protected String getDefaultComponentsConfigLocation() {
-        return "classpath*:META-INF/spring/components.xml";
+        return "classpath*:META-INF/gshell/components.xml";
     }
     
     protected String[] getConfigLocations() {

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=707066&r1=707065&r2=707066&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 06:11:05 2008
@@ -129,7 +129,7 @@
         log.debug("Application container: {}", child);
 
         child.loadBeans(new String[] {
-            "classpath*:META-INF/spring/components.xml"
+            "classpath*:META-INF/gshell/components.xml"
         });
         
         applicationContainer = child;

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java?rev=707066&r1=707065&r2=707066&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java
Wed Oct 22 06:11:05 2008
@@ -53,7 +53,7 @@
     private BeanContainer createContainer() throws Exception {
         BeanContainerImpl container = new BeanContainerImpl(getClassLoader());
         container.loadBeans(new String[] {
-            "classpath*:META-INF/spring/components.xml",
+            "classpath*:META-INF/gshell/components.xml",
             "classpath:application.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=707066&r1=707065&r2=707066&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:11:05 2008
@@ -139,7 +139,7 @@
         log.debug("Created plugin container: {}", pluginContainer);
 
         pluginContainer.loadBeans(new String[] {
-            "classpath*:META-INF/spring/components.xml"
+            "classpath*:META-INF/gshell/components.xml"
         });
     
         PluginImpl plugin = pluginContainer.getBean(PluginImpl.class);



Mime
View raw message