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/13 10:19:52 UTC
svn commit: r463588 - in /geronimo/gbuild/trunk:
gbuild-assemblies/gbuild-agent-assembly/
gbuild-assemblies/gbuild-agent-assembly/src/assembly/
gbuild-assemblies/gbuild-agent-assembly/src/conf/
gbuild-assemblies/gbuild-agent-assembly/src/main/ gbuild-a...
Author: jdillon
Date: Fri Oct 13 01:19:51 2006
New Revision: 463588
URL: http://svn.apache.org/viewvc?view=rev&rev=463588
Log:
Use std layout for assemblies
Customize the agent and manager assemblies
Added:
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/assembly/
- copied from r463584, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/assembly/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/assembly/bin.xml
- copied, changed from r463587, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/assembly/bin.xml
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/resources/
- copied from r463584, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/conf/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/resources/application.xml
- copied, changed from r463587, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/conf/application.xml
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/test/resources/
- copied from r463584, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/test/conf/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/test/resources/test-runtime-configuration.xml
- copied unchanged from r463587, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/test/conf/test-runtime-configuration.xml
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/assembly/
- copied from r463584, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/assembly/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/assembly/bin.xml
- copied, changed from r463587, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/assembly/bin.xml
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/resources/
- copied from r463584, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/conf/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/resources/application.xml
- copied, changed from r463587, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/conf/application.xml
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/test/resources/
- copied from r463584, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/test/conf/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/test/resources/test-runtime-configuration.xml
- copied unchanged from r463587, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/test/conf/test-runtime-configuration.xml
Removed:
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/assembly/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/conf/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/test/conf/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/assembly/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/conf/
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/test/conf/
Modified:
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/pom.xml
geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/pom.xml
geronimo/gbuild/trunk/gbuild-extensions/pom.xml
Modified: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/pom.xml?view=diff&rev=463588&r1=463587&r2=463588
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/pom.xml Fri Oct 13 01:19:51 2006
@@ -103,7 +103,7 @@
</execution>
</executions>
<configuration>
- <descriptor>${pom.basedir}/src/assembly/bin.xml</descriptor>
+ <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
<finalName>gbuild-agent-${pom.version}</finalName>
</configuration>
</plugin>
@@ -121,11 +121,11 @@
</execution>
</executions>
<configuration>
- <applicationConfiguration>${pom.basedir}/src/conf/application.xml</applicationConfiguration>
- <configurationsDirectory>${pom.basedir}/src/conf</configurationsDirectory>
- <configurationProperties>${appProperties}</configurationProperties>
<applicationName>gbuild-agent</applicationName>
- <runtimeConfiguration>${pom.basedir}/src/test/conf/test-runtime-configuration.xml</runtimeConfiguration>
+ <applicationConfiguration>${pom.basedir}/src/main/resources/application.xml</applicationConfiguration>
+ <configurationsDirectory>${pom.basedir}/src/main/resources</configurationsDirectory>
+ <configurationProperties>${appProperties}</configurationProperties>
+ <runtimeConfiguration>${pom.basedir}/src/test/resources/test-runtime-configuration.xml</runtimeConfiguration>
<runtimeConfigurationProperties>${appProperties}</runtimeConfigurationProperties>
<runtimePath>${pom.basedir}/target/plexus-test-runtime</runtimePath>
</configuration>
Copied: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/assembly/bin.xml (from r463587, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/assembly/bin.xml)
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/assembly/bin.xml?view=diff&rev=463588&p1=geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/assembly/bin.xml&r1=463587&p2=geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/assembly/bin.xml&r2=463588
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/assembly/bin.xml (original)
+++ geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/assembly/bin.xml Fri Oct 13 01:19:51 2006
@@ -37,7 +37,6 @@
</includes>
</fileSet>
<fileSet>
- <!-- TODO: use expressions instead: ${project.build.directory}, ${project.build.finalName}, or have a <build /> tag to include the built artifact -->
<directory>target/plexus-test-runtime/apps</directory>
<outputDirectory>apps</outputDirectory>
</fileSet>
Copied: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/resources/application.xml (from r463587, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/conf/application.xml)
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/resources/application.xml?view=diff&rev=463588&p1=geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/conf/application.xml&r1=463587&p2=geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/resources/application.xml&r2=463588
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/conf/application.xml (original)
+++ geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/resources/application.xml Fri Oct 13 01:19:51 2006
@@ -27,28 +27,6 @@
<role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
<role-hint>build-executor</role-hint>
</component>
- <!--
- <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.BuildQueueReloader</role>
- <role-hint>build-producer</role-hint>
- </component>
- -->
</load-on-start>
<resources>
@@ -68,13 +46,14 @@
<http-listener>
<port>17171</port>
</http-listener>
- <!--
- <proxy-http-listener>
- <port>8090</port>
- <proxy-host>localhost</proxy-host>
- <proxy-port>80</proxy-port>
- </proxy-http-listener>
- -->
+
+ <!--
+ <proxy-http-listener>
+ <port>8090</port>
+ <proxy-host>localhost</proxy-host>
+ <proxy-port>80</proxy-port>
+ </proxy-http-listener>
+ -->
</listeners>
</webapp>
</webapps>
@@ -157,47 +136,6 @@
</configuration>
</component>
- <!--
- | Build Producer
- -->
- <component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
- <role-hint>build-producer</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.PropertiesBuildTaskProducer</implementation>
- <requirements>
- <requirement>
- <role>org.apache.geronimo.gbuild.agent.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>${plexus.home}/tasks</watch-directory>
- <poll-interval>10000</poll-interval>
- </configuration>
- </component>
-
- <!--
- | Build Results
- -->
- <component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
- <role-hint>build-results</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.BuildResultsContinuumAgent</implementation>
- <requirements>
- <requirement>
- <role>org.apache.geronimo.gbuild.agent.ClientManager</role>
- </requirement>
- <requirement>
- <role>org.apache.geronimo.gbuild.agent.BuildResultsExtensionManager</role>
- </requirement>
- </requirements>
- <configuration>
- <build-results-topic>BUILD.RESULTS</build-results-topic>
- </configuration>
- </component>
-
<component>
<role>org.apache.geronimo.gbuild.agent.BuildResultsExtension</role>
<role-hint>write-include-file</role-hint>
@@ -210,23 +148,6 @@
</configuration>
</component>
- <!--
- | Ping monitor
- -->
- <component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
- <role-hint>ping-monitor</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.PingMonitorAgent</implementation>
- <requirements>
- <requirement>
- <role>org.apache.geronimo.gbuild.agent.ClientManager</role>
- </requirement>
- </requirements>
- </component>
-
- <!--
- | Logger manager
- -->
<component>
<role>org.codehaus.plexus.logging.LoggerManager</role>
<implementation>org.codehaus.plexus.logging.log4j.Log4JLoggerManager</implementation>
Modified: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/pom.xml?view=diff&rev=463588&r1=463587&r2=463588
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/pom.xml Fri Oct 13 01:19:51 2006
@@ -103,8 +103,8 @@
</execution>
</executions>
<configuration>
- <descriptor>${pom.basedir}/src/assembly/bin.xml</descriptor>
- <finalName>gbuild-agent-${pom.version}</finalName>
+ <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
+ <finalName>gbuild-manager-${pom.version}</finalName>
</configuration>
</plugin>
@@ -121,11 +121,11 @@
</execution>
</executions>
<configuration>
- <applicationConfiguration>${pom.basedir}/src/conf/application.xml</applicationConfiguration>
- <configurationsDirectory>${pom.basedir}/src/conf</configurationsDirectory>
+ <applicationName>gbuild-manager</applicationName>
+ <applicationConfiguration>${pom.basedir}/src/main/resources/application.xml</applicationConfiguration>
+ <configurationsDirectory>${pom.basedir}/src/main/resources</configurationsDirectory>
<configurationProperties>${appProperties}</configurationProperties>
- <applicationName>gbuild-agent</applicationName>
- <runtimeConfiguration>${pom.basedir}/src/test/conf/test-runtime-configuration.xml</runtimeConfiguration>
+ <runtimeConfiguration>${pom.basedir}/src/test/resources/test-runtime-configuration.xml</runtimeConfiguration>
<runtimeConfigurationProperties>${appProperties}</runtimeConfigurationProperties>
<runtimePath>${pom.basedir}/target/plexus-test-runtime</runtimePath>
</configuration>
Copied: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/assembly/bin.xml (from r463587, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/assembly/bin.xml)
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/assembly/bin.xml?view=diff&rev=463588&p1=geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/assembly/bin.xml&r1=463587&p2=geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/assembly/bin.xml&r2=463588
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/assembly/bin.xml (original)
+++ geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/assembly/bin.xml Fri Oct 13 01:19:51 2006
@@ -37,7 +37,6 @@
</includes>
</fileSet>
<fileSet>
- <!-- TODO: use expressions instead: ${project.build.directory}, ${project.build.finalName}, or have a <build /> tag to include the built artifact -->
<directory>target/plexus-test-runtime/apps</directory>
<outputDirectory>apps</outputDirectory>
</fileSet>
Copied: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/resources/application.xml (from r463587, geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/conf/application.xml)
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/resources/application.xml?view=diff&rev=463588&p1=geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/conf/application.xml&r1=463587&p2=geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/resources/application.xml&r2=463588
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/conf/application.xml (original)
+++ geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/resources/application.xml Fri Oct 13 01:19:51 2006
@@ -24,11 +24,6 @@
<load-on-start>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
- <role-hint>build-executor</role-hint>
- </component>
- <!--
- <component>
<role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
<role-hint>build-producer</role-hint>
</component>
@@ -48,7 +43,6 @@
<role>org.apache.geronimo.gbuild.agent.BuildQueueReloader</role>
<role-hint>build-producer</role-hint>
</component>
- -->
</load-on-start>
<resources>
@@ -68,13 +62,14 @@
<http-listener>
<port>17171</port>
</http-listener>
- <!--
- <proxy-http-listener>
- <port>8090</port>
- <proxy-host>localhost</proxy-host>
- <proxy-port>80</proxy-port>
- </proxy-http-listener>
- -->
+
+ <!--
+ <proxy-http-listener>
+ <port>8090</port>
+ <proxy-host>localhost</proxy-host>
+ <proxy-port>80</proxy-port>
+ </proxy-http-listener>
+ -->
</listeners>
</webapp>
</webapps>
@@ -96,34 +91,6 @@
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
- <role-hint>build-executor</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.ContinuumBuildAgent</implementation>
- <requirements>
- <requirement>
- <role>org.apache.geronimo.gbuild.agent.ClientManager</role>
- </requirement>
- <requirement>
- <role>org.apache.geronimo.gbuild.agent.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>${plexus.home}/agent/work</working-directory>
- <build-output-directory>${plexus.home}/agent/output</build-output-directory>
- </configuration>
- </component>
-
- <component>
<role>org.apache.maven.continuum.store.ContinuumStore</role>
<role-hint>agent-store</role-hint>
<implementation>org.apache.geronimo.gbuild.agent.ThreadContextContinuumStore</implementation>
@@ -157,9 +124,6 @@
</configuration>
</component>
- <!--
- | Build Producer
- -->
<component>
<role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
<role-hint>build-producer</role-hint>
@@ -178,9 +142,6 @@
</configuration>
</component>
- <!--
- | Build Results
- -->
<component>
<role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
<role-hint>build-results</role-hint>
@@ -210,9 +171,6 @@
</configuration>
</component>
- <!--
- | Ping monitor
- -->
<component>
<role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
<role-hint>ping-monitor</role-hint>
@@ -224,9 +182,6 @@
</requirements>
</component>
- <!--
- | Logger manager
- -->
<component>
<role>org.codehaus.plexus.logging.LoggerManager</role>
<implementation>org.codehaus.plexus.logging.log4j.Log4JLoggerManager</implementation>
Modified: geronimo/gbuild/trunk/gbuild-extensions/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/pom.xml?view=diff&rev=463588&r1=463587&r2=463588
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/pom.xml Fri Oct 13 01:19:51 2006
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.gbuild</groupId>
- <artifactId>gbuild-core</artifactId>
+ <artifactId>gbuild-agent</artifactId>
<version>${pom.version}</version>
</dependency>
</dependencies>