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 2006/10/16 03:14:57 UTC
svn commit: r464352 - in /geronimo/gbuild/trunk:
gbuild-assemblies/gbuild-agent-assembly/src/main/config/
gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/
gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/
gbuild-assemblies/...
Author: jdillon
Date: Sun Oct 15 18:14:56 2006
New Revision: 464352
URL: http://svn.apache.org/viewvc?view=rev&rev=464352
Log:
Reorganize manager and slave configs
Added:
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/activemq.xml (with props)
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/application.xml (with props)
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/activemq.xml (with props)
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/application.xml (with props)
Removed:
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/activemq.xml
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager-application.xml
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave-application.xml
Modified:
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/scripts/manager
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/scripts/slave
geronimo/gbuild/trunk/gbuild-commands/src/main/java/org/apache/geronimo/gbuild/commands/ManagerCommand.java
geronimo/gbuild/trunk/gbuild-commands/src/main/java/org/apache/geronimo/gbuild/commands/SlaveCommand.java
Added: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/activemq.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/activemq.xml?view=auto&rev=464352
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/activemq.xml (added)
+++ geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/activemq.xml Sun Oct 15 18:14:56 2006
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<beans xmlns="http://activemq.org/config/1.0">
+
+ <!-- Allows us to use system properties as variables in this configuration file -->
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <broker useJmx="true">
+
+ <!-- Use the following to set the broker memory limit (in bytes)
+ <memoryManager>
+ <usageManager id="memory-manager" limit="1048576"/>
+ </memoryManager>
+ -->
+
+ <managementContext>
+ <managementContext connectorPort="5003" jmxDomainName="org.apache.activemq"/>
+ </managementContext>
+
+ <persistenceAdapter>
+ <journaledJDBC journalLogFiles="5" dataDirectory="${gshell.home}/activemq"/>
+ </persistenceAdapter>
+
+ <transportConnectors>
+ <transportConnector uri="vm://localhost"/>
+ <!--
+ <transportConnector uri="ssl://localhost:5002"/>
+ -->
+ <transportConnector uri="tcp://localhost:5002"/>
+ </transportConnectors>
+
+ </broker>
+
+</beans>
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/activemq.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/activemq.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/activemq.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/application.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/application.xml?view=auto&rev=464352
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/application.xml (added)
+++ geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/application.xml Sun Oct 15 18:14:56 2006
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<application>
+
+ <load-on-start>
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
+ <role-hint>build-producer</role-hint>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
+ <role-hint>build-results</role-hint>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
+ <role-hint>ping-monitor</role-hint>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
+ <role-hint>build-activity</role-hint>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.producer.BuildQueueReloader</role>
+ <role-hint>build-producer</role-hint>
+ </component>
+ </load-on-start>
+
+ <components>
+
+ <!-- ================= -->
+ <!-- Shared Components -->
+ <!-- ================= -->
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.client.ClientManager</role>
+ <implementation>org.apache.geronimo.gbuild.agent.client.ClientManager</implementation>
+ <configuration>
+ <broker-url>vm://localhost</broker-url>
+ <ping-interval>300000</ping-interval>
+ <reconnect-attempts>48</reconnect-attempts>
+ <reconnect-delay>2</reconnect-delay>
+ <reconnect-delay-unit>hours</reconnect-delay-unit>
+ </configuration>
+ </component>
+
+ <!-- ================= -->
+ <!-- Master Components -->
+ <!-- ================= -->
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
+ <role-hint>build-producer</role-hint>
+ <implementation>org.apache.geronimo.gbuild.agent.producer.PropertiesBuildTaskProducer</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.geronimo.gbuild.agent.client.ClientManager</role>
+ </requirement>
+ </requirements>
+ <configuration>
+ <build-task-queue>BUILD.TASKS</build-task-queue>
+ <include-prefix>include.</include-prefix>
+ <header-prefix>header.</header-prefix>
+ <watch-directory>${gshell.home}/tasks</watch-directory>
+ <poll-interval>10000</poll-interval>
+ </configuration>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.producer.BuildQueueReloader</role>
+ <role-hint>build-producer</role-hint>
+ <implementation>org.apache.geronimo.gbuild.agent.producer.BuildQueueReloader</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.geronimo.gbuild.agent.client.ClientManager</role>
+ </requirement>
+ </requirements>
+ <configuration>
+ <build-task-queue>BUILD.TASKS</build-task-queue>
+ <tasks-directory>${gshell.home}/tasks</tasks-directory>
+ <poll-interval>30</poll-interval>
+ </configuration>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
+ <role-hint>ping-monitor</role-hint>
+ <implementation>org.apache.geronimo.gbuild.agent.client.PingMonitorAgent</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.geronimo.gbuild.agent.client.ClientManager</role>
+ </requirement>
+ </requirements>
+ </component>
+
+ <!-- ======================== -->
+ <!-- Build Results Extensions -->
+ <!-- ======================== -->
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
+ <role-hint>build-results</role-hint>
+ <implementation>org.apache.geronimo.gbuild.agent.continuum.BuildResultsContinuumAgent</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.geronimo.gbuild.agent.client.ClientManager</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildResultsExtensionManager</role>
+ </requirement>
+ </requirements>
+ <configuration>
+ <build-results-topic>BUILD.RESULTS</build-results-topic>
+ </configuration>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildResultsExtension</role>
+ <role-hint>write-include-file</role-hint>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.WriteIncludeFileExtension</implementation>
+ <configuration>
+ <include-pattern>^include.*</include-pattern>
+ <results-directory>${gshell.home}/results</results-directory>
+ <date-format>yyyy-MM</date-format>
+ <file-name-template>{project.name}-{project.version}/{build.name}-{build.id}.properties</file-name-template>
+ </configuration>
+ </component>
+
+ </components>
+</application>
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/application.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/manager/application.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/activemq.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/activemq.xml?view=auto&rev=464352
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/activemq.xml (added)
+++ geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/activemq.xml Sun Oct 15 18:14:56 2006
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<beans xmlns="http://activemq.org/config/1.0">
+
+ <!-- Allows us to use system properties as variables in this configuration file -->
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <broker useJmx="true">
+
+ <!-- Use the following to set the broker memory limit (in bytes)
+ <memoryManager>
+ <usageManager id="memory-manager" limit="1048576"/>
+ </memoryManager>
+ -->
+
+ <managementContext>
+ <managementContext connectorPort="5004" jmxDomainName="org.apache.activemq"/>
+ </managementContext>
+
+ <persistenceAdapter>
+ <journaledJDBC journalLogFiles="5" dataDirectory="${gshell.home}/activemq"/>
+ </persistenceAdapter>
+
+ <transportConnectors>
+ <transportConnector uri="vm://localhost"/>
+ </transportConnectors>
+
+ <networkConnectors>
+ <networkConnector uri="tcp://localhost:5002" failover="true"/>
+ </networkConnectors>
+
+ </broker>
+
+</beans>
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/activemq.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/activemq.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/activemq.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/application.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/application.xml?view=auto&rev=464352
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/application.xml (added)
+++ geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/application.xml Sun Oct 15 18:14:56 2006
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<application>
+
+ <load-on-start>
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
+ <role-hint>build-executor</role-hint>
+ </component>
+ </load-on-start>
+
+ <components>
+
+ <!-- ================= -->
+ <!-- Shared Components -->
+ <!-- ================= -->
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.client.ClientManager</role>
+ <implementation>org.apache.geronimo.gbuild.agent.client.ClientManager</implementation>
+ <configuration>
+ <broker-url>vm://localhost</broker-url>
+ <ping-interval>300000</ping-interval>
+ <reconnect-attempts>48</reconnect-attempts>
+ <reconnect-delay>2</reconnect-delay>
+ <reconnect-delay-unit>hours</reconnect-delay-unit>
+ </configuration>
+ </component>
+
+ <!-- ================ -->
+ <!-- Slave Components -->
+ <!-- ================ -->
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
+ <role-hint>build-executor</role-hint>
+ <implementation>org.apache.geronimo.gbuild.agent.continuum.ContinuumBuildAgent</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.geronimo.gbuild.agent.client.ClientManager</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtentionManager</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.continuum.buildcontroller.BuildController</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
+ </requirement>
+ </requirements>
+ <configuration>
+ <contributor>Unknown</contributor>
+ <admin-address>scm@geronimo.apache.org</admin-address>
+ <build-task-queue>BUILD.TASKS</build-task-queue>
+ <build-results-topic>BUILD.RESULTS</build-results-topic>
+ <working-directory>${gshell.home}/agent/work</working-directory>
+ <build-output-directory>${gshell.home}/agent/output</build-output-directory>
+ </configuration>
+ </component>
+
+ <!--
+ NOTE: Override the default ContinuumNotificationDispatcher with a mock version for now.
+ This must be in the application configuration to override.
+ -->
+ <component>
+ <role>org.apache.maven.continuum.notification.ContinuumNotificationDispatcher</role>
+ <implementation>org.apache.geronimo.gbuild.agent.continuum.LoggingContinuumNotificationDispatcher</implementation>
+ </component>
+
+ <!-- ====================== -->
+ <!-- Build Agent Extensions -->
+ <!-- ====================== -->
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
+ <role-hint>file-include</role-hint>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.FileIncludeExtension</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
+ </requirement>
+ </requirements>
+ <configuration>
+ <pattern>^include.*</pattern>
+ </configuration>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
+ <role-hint>general-headers</role-hint>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.HeaderIncludeExtension</implementation>
+ <configuration>
+ <pattern>^(project|build|header).*</pattern>
+ </configuration>
+ </component>
+
+ </components>
+</application>
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/application.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/config/slave/application.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/scripts/manager
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/scripts/manager?view=diff&rev=464352&r1=464351&r2=464352
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/scripts/manager (original)
+++ geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/scripts/manager Sun Oct 15 18:14:56 2006
@@ -25,7 +25,7 @@
DIRNAME=`dirname $0`
exec "$DIRNAME/gsh" "$@" <<EOF
-broker
+broker xbean:manager/activemq.xml
manager
wait
EOF
Modified: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/scripts/slave
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/scripts/slave?view=diff&rev=464352&r1=464351&r2=464352
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/scripts/slave (original)
+++ geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/scripts/slave Sun Oct 15 18:14:56 2006
@@ -25,7 +25,7 @@
DIRNAME=`dirname $0`
exec "$DIRNAME/gsh" "$@" <<EOF
-broker
+broker xbean:slave/activemq.xml
slave
wait
EOF
Modified: geronimo/gbuild/trunk/gbuild-commands/src/main/java/org/apache/geronimo/gbuild/commands/ManagerCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-commands/src/main/java/org/apache/geronimo/gbuild/commands/ManagerCommand.java?view=diff&rev=464352&r1=464351&r2=464352
==============================================================================
--- geronimo/gbuild/trunk/gbuild-commands/src/main/java/org/apache/geronimo/gbuild/commands/ManagerCommand.java (original)
+++ geronimo/gbuild/trunk/gbuild-commands/src/main/java/org/apache/geronimo/gbuild/commands/ManagerCommand.java Sun Oct 15 18:14:56 2006
@@ -22,10 +22,10 @@
import org.apache.geronimo.gshell.Shell;
/**
- * Start the GBuild slave node.
+ * Start the GBuild master node.
*
* <p>
- * Alias to <tt>plexus manager-application.xml</tt>.
+ * Alias to <tt>plexus manager/application.xml</tt>.
* </p>
*
* @version $Rev$ $Date$
@@ -34,6 +34,6 @@
extends AliasCommandSupport
{
public ManagerCommand(final Shell shell) {
- super("manager", shell, "plexus", "manager-application.xml");
+ super("manager", shell, "plexus", "manager/application.xml");
}
}
Modified: geronimo/gbuild/trunk/gbuild-commands/src/main/java/org/apache/geronimo/gbuild/commands/SlaveCommand.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-commands/src/main/java/org/apache/geronimo/gbuild/commands/SlaveCommand.java?view=diff&rev=464352&r1=464351&r2=464352
==============================================================================
--- geronimo/gbuild/trunk/gbuild-commands/src/main/java/org/apache/geronimo/gbuild/commands/SlaveCommand.java (original)
+++ geronimo/gbuild/trunk/gbuild-commands/src/main/java/org/apache/geronimo/gbuild/commands/SlaveCommand.java Sun Oct 15 18:14:56 2006
@@ -22,10 +22,10 @@
import org.apache.geronimo.gshell.Shell;
/**
- * Start the GBuild slave node.
+ * Start a GBuild slave node.
*
* <p>
- * Alias to <tt>plexus slave-application.xml</tt>.
+ * Alias to <tt>plexus slave/application.xml</tt>.
* </p>
*
* @version $Rev$ $Date$
@@ -34,6 +34,6 @@
extends AliasCommandSupport
{
public SlaveCommand(final Shell shell) {
- super("slave", shell, "plexus", "slave-application.xml");
+ super("slave", shell, "plexus", "slave/application.xml");
}
}