geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r706158 - in /geronimo/gshell/trunk: ./ gshell-assembly/src/main/underlay/etc/ gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/ gshell-commands/gshell-log4j/ gshell-commands/gshell-vfs/ gshell-parser/src/main/resources/M...
Date Mon, 20 Oct 2008 09:09:54 GMT
Author: jdillon
Date: Mon Oct 20 02:09:52 2008
New Revision: 706158

URL: http://svn.apache.org/viewvc?rev=706158&view=rev
Log:
Roll up gshell-vfs-local into gshell-vfs
Roll up gshell-ivy, gshell-event and gshell-xstore Spring configurations

Added:
    geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/provider/
    geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/java/org/apache/geronimo/gshell/vfs/provider/local/
      - copied from r706146, geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/vfs/provider/local/
Removed:
    geronimo/gshell/trunk/gshell-parser/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-support/gshell-event/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-support/gshell-ivy/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/
    geronimo/gshell/trunk/gshell-support/gshell-xstore/src/main/resources/META-INF/spring/
Modified:
    geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
    geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java
    geronimo/gshell/trunk/gshell-commands/gshell-log4j/pom.xml
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/pom.xml
    geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerImpl.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml
    geronimo/gshell/trunk/gshell-support/pom.xml
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/components.xml
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml
    geronimo/gshell/trunk/pom.xml

Modified: geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml?rev=706158&r1=706157&r2=706158&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml Mon Oct 20
02:09:52 2008
@@ -44,13 +44,7 @@
                     <property name="artifactId" value="gshell-wisdom-core"/>
                     <property name="version" value="1.0-alpha-2-SNAPSHOT"/>
                 </bean>
-
-                <bean class="org.apache.geronimo.gshell.application.model.Artifact">
-                    <property name="groupId" value="org.apache.geronimo.gshell.support"/>
-                    <property name="artifactId" value="gshell-vfs-local"/>
-                    <property name="version" value="1.0-alpha-2-SNAPSHOT"/>
-                </bean>
-
+                
                 <!--
                 <bean class="org.apache.geronimo.gshell.application.model.Artifact">
                     <property name="groupId" value="org.apache.geronimo.gshell.support"/>

Modified: geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java?rev=706158&r1=706157&r2=706158&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java
(original)
+++ geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java
Mon Oct 20 02:09:52 2008
@@ -71,13 +71,13 @@
     private static Method getMainMethod(final Class type) throws Exception {
         assert type != null;
 
-        Method m = type.getMethod("main", String[].class);
-
-        int modifiers = m.getModifiers();
+        Method method = type.getMethod("main", String[].class);
+        int modifiers = method.getModifiers();
 
         if (Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers)) {
-            if (m.getReturnType() == Integer.TYPE || m.getReturnType() == Void.TYPE) {
-                return m;
+            Class returns = method.getReturnType();
+            if (returns == Integer.TYPE || returns == Void.TYPE) {
+                return method;
             }
         }
 

Modified: geronimo/gshell/trunk/gshell-commands/gshell-log4j/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-log4j/pom.xml?rev=706158&r1=706157&r2=706158&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-log4j/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-log4j/pom.xml Mon Oct 20 02:09:52 2008
@@ -49,11 +49,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.gshell.support</groupId>
-            <artifactId>gshell-vfs-local</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
         </dependency>

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/pom.xml?rev=706158&r1=706157&r2=706158&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/pom.xml Mon Oct 20 02:09:52 2008
@@ -42,11 +42,6 @@
             <groupId>org.apache.geronimo.gshell.support</groupId>
             <artifactId>gshell-vfs</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.support</groupId>
-            <artifactId>gshell-vfs-local</artifactId>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

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=706158&r1=706157&r2=706158&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
Mon Oct 20 02:09:52 2008
@@ -103,8 +103,6 @@
         log.debug("Creating child container: {}", id);
 
         if (log.isTraceEnabled()) {
-            log.trace("Creating child container: {}", id);
-            
             if (classPath != null) {
                 log.trace("Classpath:");
 

Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml?rev=706158&r1=706157&r2=706158&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml
Mon Oct 20 02:09:52 2008
@@ -133,4 +133,12 @@
         <constructor-arg ref="fileSystemAccess"/>
     </bean>
 
+    <bean class="org.apache.geronimo.gshell.vfs.config.FileProviderConfigurer">
+        <property name="fileSystemManager" ref="fileSystemManager"/>
+        <property name="scheme" value="file"/>
+        <property name="provider">
+            <bean class="org.apache.geronimo.gshell.vfs.provider.local.LocalFileProvider"/>
+        </property>
+    </bean>
+
 </beans>
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/pom.xml?rev=706158&r1=706157&r2=706158&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/pom.xml Mon Oct 20 02:09:52 2008
@@ -52,7 +52,6 @@
         <module>gshell-interpolation</module>
         <module>gshell-console</module>
         <module>gshell-vfs</module>
-        <module>gshell-vfs-local</module>
         <module>gshell-vfs-meta</module>
         <module>gshell-vfs-truezip</module>
         <module>gshell-security</module>

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/components.xml?rev=706158&r1=706157&r2=706158&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/components.xml
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/resources/META-INF/spring/components.xml
Mon Oct 20 02:09:52 2008
@@ -25,6 +25,14 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
        default-autowire="no">
 
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+    <bean id="ivy" class="org.apache.geronimo.gshell.ivy.IvyFactoryBean" lazy-init="true">
+        <property name="settingsUrl" value="file:${gshell.home}/etc/ivysettings.xml"/>
+    </bean>
+    
+    <bean id="eventManager" class="org.apache.geronimo.gshell.event.EventManagerImpl"/>
+
     <bean id="applicationManager" class="org.apache.geronimo.gshell.wisdom.application.ApplicationManagerImpl">
         <constructor-arg ref="eventManager"/>
         <constructor-arg ref="ivy"/>

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml?rev=706158&r1=706157&r2=706158&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/resources/META-INF/spring/components.xml
Mon Oct 20 02:09:52 2008
@@ -25,6 +25,15 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
        default-autowire="no">
 
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+    <bean id="xstore" class="org.apache.geronimo.gshell.xstore.XStoreImpl">
+        <constructor-arg ref="fileSystemAccess"/>
+        <property name="rootUri"  value="file:${gshell.home}/var/xstore"/>
+    </bean>
+
+    <bean id="commandLineParser" class="org.apache.geronimo.gshell.parser.CommandLineParser"/>
+    
     <bean id="pluginManager" class="org.apache.geronimo.gshell.wisdom.plugin.PluginManagerImpl">
         <constructor-arg ref="applicationManager"/>
         <constructor-arg ref="eventManager"/>

Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=706158&r1=706157&r2=706158&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Mon Oct 20 02:09:52 2008
@@ -192,12 +192,6 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.gshell.support</groupId>
-                <artifactId>gshell-vfs-local</artifactId>
-                <version>1.0-alpha-2-SNAPSHOT</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.gshell.support</groupId>
                 <artifactId>gshell-vfs-meta</artifactId>
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>



Mime
View raw message