geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r570731 - in /geronimo/server/trunk: ./ assemblies/geronimo-jetty6-javaee5-gshell/ assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/ modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/
Date Wed, 29 Aug 2007 10:08:51 GMT
Author: jdillon
Date: Wed Aug 29 03:08:48 2007
New Revision: 570731

URL: http://svn.apache.org/viewvc?rev=570731&view=rev
Log:
Update to use gshell 1.0-alpha-1-SNAPSHOT, pending a little more work to finish upgrading
to the level of cli support as before

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
    geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/pom.xml?rev=570731&r1=570730&r2=570731&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/pom.xml Wed Aug 29 03:08:48
2007
@@ -38,38 +38,26 @@
     </description>
     
     <dependencies>
-        
-        <!-- GShell Core bits -->
-        
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-bootstrap</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-core</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-cli</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging-adapters</artifactId>
-            <version>1.1</version>
         </dependency>
         
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
         </dependency>
-        
+            
         <!-- Command impl modules -->
         
         <dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml?rev=570731&r1=570730&r2=570731&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
Wed Aug 29 03:08:48 2007
@@ -156,16 +156,22 @@
         <dependencySet>
             <outputDirectory>lib/gshell</outputDirectory>
             <includes>
+                <include>org.slf4j:slf4j-api</include>
+                <include>org.slf4j:slf4j-log4j12</include>
                 <include>org.apache.geronimo.gshell:gshell-api</include>
                 <include>org.apache.geronimo.gshell:gshell-cli</include>
                 <include>org.apache.geronimo.gshell:gshell-core</include>
-                <include>commons-lang:commons-lang</include>
-                <include>commons-jexl:commons-jexl</include>
-                <include>commons-logging:commons-logging-api</include>
-                <include>commons-logging:commons-logging-adapters</include>
+                <include>org.apache.geronimo.gshell:gshell-clp</include>
+                <include>org.apache.geronimo.gshell:gshell-prefs</include>
+                <include>org.apache.geronimo.gshell:gshell-common</include>
+                <include>org.apache.geronimo.gshell:gshell-diet-commons-lang</include>
+                <include>org.apache.geronimo.gshell:gshell-diet-log4j</include>
+                <include>org.apache.geronimo.gshell:gshell-diet-plexus-utils</include>
+                <include>org.codehaus.plexus:plexus-component-api</include>
+                <include>org.codehaus.plexus:plexus-container-default</include>
+                <include>org.codehaus.plexus:plexus-expression-evaluator</include>
                 <include>jline:jline</include>
                 <include>org.apache.xbean:xbean-finder</include>
-                <include>picocontainer:picocontainer</include>
                 <include>org.codehaus.groovy:groovy-all</include>
                 <include>org.apache.ant:ant</include>
                 <include>org.apache.ant:ant-launcher</include>
@@ -175,7 +181,6 @@
                 
                 <include>org.apache.geronimo.modules:geronimo-kernel</include>
                 <include>log4j:log4j</include>
-                <include>commons-cli:commons-cli</include>
                 -->
             </includes>
         </dependencySet>
@@ -183,7 +188,7 @@
         <dependencySet>
             <outputDirectory>lib/boot</outputDirectory>
             <includes>
-                <include>classworlds:classworlds</include>
+                <include>org.codehaus.plexus:plexus-classworlds</include>
             </includes>
         </dependencySet>
         

Modified: geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy?rev=570731&r1=570730&r2=570731&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
(original)
+++ geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
Wed Aug 29 03:08:48 2007
@@ -23,9 +23,7 @@
 import org.apache.geronimo.gshell.command.CommandSupport
 import org.apache.geronimo.gshell.command.CommandException
 
-import org.apache.commons.cli.CommandLine
-import org.apache.commons.cli.OptionBuilder
-import org.apache.commons.cli.Options
+import org.apache.geronimo.gshell.clp.Option
 
 import org.apache.tools.ant.ExitStatusException
 
@@ -42,20 +40,28 @@
 {
     private AntBuilder ant
     
+    @Option(name='-H', aliases=['--home'], description='Use a specific Geronimo home directory')
     File geronimoHome
-
+    
+    @Option(name='-j', aliases=['--jvm'], description='Use a specific Java Virtual Machine
for server process')
     File javaVirtualMachine
     
+    @Option(name='-A', aliases=['--javaagent'], description='Use a specific Java Agent, set
to \'none\' to disable')
     String javaAgent
     
+    @Option(name='-l', aliases=['--logfile'], description='Capture console output to file')
     File logFile
     
+    @Option(name='-b', aliases=['--background'], description='Run the server process in the
background')
     boolean background = false
     
+    @Option(name='-q', aliases=['--quiet'], description='Suppress informative and warning
messages')
     boolean quiet = false
-
+    
+    @Option(name='-v', aliases=['--verbose'], description='Enable verbose output; specify
multipule times to increase verbosity')
     int verbose = 0
     
+    @Option(name='-t', aliases=['--timeout'], description='Specify the timeout for the server
process in seconds')
     int timeout = -1
     
     final Map properties = [:]
@@ -76,40 +82,8 @@
         super('start-server')
     }
     
+    /*
     protected Options getOptions() {
-        //
-        // NOTE: Have to use super.getOptions() here, as it seems that super.options
-        //       will cause Groovy to spin out of control in recursion
-        //
-        def options = super.getOptions()
-        def messages = messageSource
-
-        options.addOption(OptionBuilder.withLongOpt('verbose')
-            .withDescription(messages.getMessage('cli.option.verbose'))
-            .create('v'))
-
-        options.addOption(OptionBuilder.withLongOpt('quiet')
-            .withDescription(messages.getMessage('cli.option.quiet'))
-            .create('q'))
-        
-        options.addOption(OptionBuilder.withLongOpt('logfile')
-            .withDescription(messages.getMessage('cli.option.logfile'))
-            .hasArg()
-            .withArgName('file')
-            .create('l'))
-        
-        options.addOption(OptionBuilder.withLongOpt('timeout')
-            .withDescription(messages.getMessage('cli.option.timeout'))
-            .hasArg()
-            .withArgName('seconds')
-            .create('t'))
-        
-        options.addOption(OptionBuilder.withLongOpt('jvm')
-            .withDescription(messages.getMessage('cli.option.jvm'))
-            .hasArg()
-            .withArgName('dir')
-            .create('j'))
-        
         options.addOption(OptionBuilder.withLongOpt('property')
             .withDescription(messages.getMessage('cli.option.property'))
             .hasArg()
@@ -128,47 +102,22 @@
             .withArgName('option')
             .create('J'))
         
-        options.addOption(OptionBuilder.withLongOpt('home')
-            .withDescription(messages.getMessage('cli.option.home'))
-            .hasArg()
-            .withArgName('dir')
-            .create('H'))
-        
-        options.addOption(OptionBuilder.withLongOpt('javaagent')
-            .withDescription(messages.getMessage('cli.option.javaagent'))
-            .hasArg()
-            .withArgName('jar')
-            .create('A'))
-        
         options.addOption(OptionBuilder.withLongOpt('module')
             .withDescription(messages.getMessage('cli.option.module'))
             .hasArg()
             .withArgName('name')
             .create('m'))
         
-        options.addOption(OptionBuilder.withLongOpt('background')
-            .withDescription(messages.getMessage('cli.option.background'))
-            .create('b'))
-        
         //
         // TODO: Expose URL, username/password for validation auth
         //
         
         return options
     }
+    */
     
+    /*
     protected boolean processCommandLine(final CommandLine line) throws CommandException
{
-        assert line
-        
-        def args = line.args
-        def messages = messageSource
-        def io = getIO()
-        
-        if (args.length > 0) {
-            io.err.println(messages.getMessage("info.unexpected_args", args.join(' ')))
-            return true
-        }
-        
         if (line.hasOption('v')) {
             line.options.each {
                 if (it.opt == 'v') {
@@ -177,30 +126,6 @@
             }
         }
         
-        if (line.hasOption('q')) {
-            quiet = true
-        }
-        
-        if (line.hasOption('l')) {
-            logFile = new File(line.getOptionValue('l')).canonicalFile
-        }
-        
-        if (line.hasOption('t')) {
-            timeout = Integer.parseInt(line.getOptionValue('t'))
-        }
-        
-        if (line.hasOption('j')) {
-            javaVirtualMachine = new File(line.getOptionValue('j')).canonicalFile
-        }
-        
-        if (line.hasOption('H')) {
-            geronimoHome = new File(line.getOptionValue('H')).canonicalFile
-        }
-        
-        if (line.hasOption('H')) {
-            javaAgent = line.getOptionValue('H')
-        }
-        
         def addProperty = { namevalue, prefix ->
             def name, value
             int i = namevalue.indexOf('=')
@@ -254,12 +179,9 @@
             }
         }
         
-        if (line.hasOption('b')) {
-            background = true
-        }
-        
         return false
     }
+    */
     
     private File getJavaAgentJar() {
         def file = new File(geronimoHome, 'bin/jpa.jar')
@@ -280,9 +202,7 @@
         return file
     }
     
-    protected Object doExecute(Object[] args) throws Exception {
-        assert args != null
-        
+    protected Object doExecute() throws Exception {
         def io = getIO()
         ant = new AntBuilder(log, io)
         

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=570731&r1=570730&r2=570731&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Aug 29 03:08:48 2007
@@ -452,23 +452,23 @@
                 <artifactId>log4j</artifactId>
                 <version>1.2.14</version>
             </dependency>
-
+            
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.4.0</version>
+                <version>1.4.3</version>
             </dependency>
-
+            
             <dependency>
                 <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-jcl</artifactId>
-                <version>1.4.0</version>
+                <artifactId>slf4j-simple</artifactId>
+                <version>1.4.3</version>
             </dependency>
 
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-log4j12</artifactId>
-                <version>1.4.0</version>
+                <version>1.4.3</version>
             </dependency>
 
             <dependency>
@@ -1450,37 +1450,25 @@
             <dependency>
                 <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>gshell-bootstrap</artifactId>
-                <version>0.0.2-SNAPSHOT</version>
+                <version>1.0-alpha-1-SNAPSHOT</version>
             </dependency>
             
             <dependency>
                 <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>gshell-api</artifactId>
-                <version>0.0.2-SNAPSHOT</version>
+                <version>1.0-alpha-1-SNAPSHOT</version>
             </dependency>
             
             <dependency>
                 <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>gshell-core</artifactId>
-                <version>0.0.2-SNAPSHOT</version>
+                <version>1.0-alpha-1-SNAPSHOT</version>
             </dependency>
             
             <dependency>
                 <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>gshell-cli</artifactId>
-                <version>0.0.2-SNAPSHOT</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging-api</artifactId>
-                <version>1.1</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging-adapters</artifactId>
-                <version>1.1</version>
+                <version>1.0-alpha-1-SNAPSHOT</version>
             </dependency>
             
             <dependency>



Mime
View raw message