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 2007/08/21 22:31:35 UTC
svn commit: r568261 - in /geronimo/server/trunk: ./ modules/
modules/geronimo-commands/
modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/
modules/geronimo-commands/src/main/resources/org/apache/geronimo/commands/
Author: jdillon
Date: Tue Aug 21 13:31:34 2007
New Revision: 568261
URL: http://svn.apache.org/viewvc?rev=568261&view=rev
Log:
(GERONIMO-3434) Add a 'start-server' (and 'start') command to start the Geronimo Server
Added:
geronimo/server/trunk/modules/geronimo-commands/
- copied from r568243, geronimo/sandbox/server-gshell-launcher/modules/geronimo-commands/
Modified:
geronimo/server/trunk/modules/geronimo-commands/pom.xml
geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
geronimo/server/trunk/modules/geronimo-commands/src/main/resources/org/apache/geronimo/commands/StartServerCommandMessages.properties
geronimo/server/trunk/modules/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/modules/geronimo-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-commands/pom.xml?rev=568261&r1=568243&r2=568261&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-commands/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-commands/pom.xml Tue Aug 21 13:31:34 2007
@@ -34,21 +34,19 @@
<dependencies>
<dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-api</artifactId>
- <version>0.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.1-beta-2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${version}</version>
</dependency>
</dependencies>
@@ -59,7 +57,6 @@
<plugin>
<groupId>org.codehaus.mojo.groovy</groupId>
<artifactId>groovy-maven-plugin</artifactId>
- <version>1.0-beta-1</version>
<executions>
<execution>
<goals>
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=568261&r1=568243&r2=568261&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 Tue Aug 21 13:31:34 2007
@@ -397,7 +397,7 @@
def scanner = ant.fileScanner {
fileset(dir: basedir) {
- include(name: "${this.name}-*.groovy")
+ include(name: "${this.name},*.groovy")
}
}
@@ -405,7 +405,7 @@
def shell = new GroovyShell(binding)
for (file in scanner) {
- log.debug("Loading script: $file")
+ log.debug("Evaluating script: $file")
// Use InputStream method to avoid classname problems from the file's name
shell.evaluate(file.newInputStream())
Modified: geronimo/server/trunk/modules/geronimo-commands/src/main/resources/org/apache/geronimo/commands/StartServerCommandMessages.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-commands/src/main/resources/org/apache/geronimo/commands/StartServerCommandMessages.properties?rev=568261&r1=568243&r2=568261&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-commands/src/main/resources/org/apache/geronimo/commands/StartServerCommandMessages.properties (original)
+++ geronimo/server/trunk/modules/geronimo-commands/src/main/resources/org/apache/geronimo/commands/StartServerCommandMessages.properties Tue Aug 21 13:31:34 2007
@@ -43,7 +43,7 @@
cli.option.home=Use a specific Geronimo home directory
-cli.option.javaagent=Use a specific Java Agent, set to "none" to disable
+cli.option.javaagent=Use a specific Java Agent, set to 'none' to disable
cli.option.module=Start up a specific module by name.
Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?rev=568261&r1=568260&r2=568261&view=diff
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Tue Aug 21 13:31:34 2007
@@ -51,6 +51,7 @@
<module>geronimo-client-builder</module>
<module>geronimo-clustering</module>
<module>geronimo-clustering-wadi</module>
+ <module>geronimo-commands</module>
<module>geronimo-common</module>
<module>geronimo-connector</module>
<module>geronimo-connector-builder</module>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=568261&r1=568260&r2=568261&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Aug 21 13:31:34 2007
@@ -1444,6 +1444,50 @@
<version>${dojoVersion}</version>
<type>tgz</type>
</dependency>
+
+ <!-- GShell Support -->
+
+ <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-api</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-api</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-adapters</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>1.1-beta-2</version>
+ </dependency>
</dependencies>
</dependencyManagement>