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/24 05:40:37 UTC
svn commit: r467226 - in /geronimo/gbuild/trunk: gbuild-agent-assembly/
gbuild-agent-assembly/src/main/config/manager/
gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/activity/
gbuild-agent/src/main/resources/META-INF/plexus/ gbuild-extensi...
Author: jdillon
Date: Mon Oct 23 20:40:35 2006
New Revision: 467226
URL: http://svn.apache.org/viewvc?view=rev&rev=467226
Log:
Clean up after move of activity bits to separate module
Added:
geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/resources/META-INF/plexus/components.xml (with props)
Removed:
geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/activity/
geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/ReportActivityExtension.java
Modified:
geronimo/gbuild/trunk/gbuild-agent-assembly/pom.xml
geronimo/gbuild/trunk/gbuild-agent-assembly/src/main/config/manager/application.xml
geronimo/gbuild/trunk/gbuild-agent/src/main/resources/META-INF/plexus/components.xml
geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/BuildActivityMonitor.java
geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/BuildActivityNotifier.java
geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/ReportActivityExtension.java
geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/pom.xml
geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/src/main/java/org/apache/geronimo/gbuild/extension/requeue/RequeueFailedBuilds.java
geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/src/main/resources/META-INF/plexus/components.xml
geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/pom.xml
geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtension.java
geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/resources/META-INF/plexus/components.xml
geronimo/gbuild/trunk/gbuild-extensions/pom.xml
Modified: geronimo/gbuild/trunk/gbuild-agent-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-agent-assembly/pom.xml?view=diff&rev=467226&r1=467225&r2=467226
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent-assembly/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-agent-assembly/pom.xml Mon Oct 23 20:40:35 2006
@@ -50,6 +50,12 @@
<dependency>
<groupId>org.apache.geronimo.gbuild.extension</groupId>
+ <artifactId>gbuild-activity-extensions</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.gbuild.extension</groupId>
<artifactId>gbuild-requeue-extensions</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: geronimo/gbuild/trunk/gbuild-agent-assembly/src/main/config/manager/application.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-agent-assembly/src/main/config/manager/application.xml?view=diff&rev=467226&r1=467225&r2=467226
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent-assembly/src/main/config/manager/application.xml (original)
+++ geronimo/gbuild/trunk/gbuild-agent-assembly/src/main/config/manager/application.xml Mon Oct 23 20:40:35 2006
@@ -40,7 +40,7 @@
<component>
<role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
- <role-hint>build-activity</role-hint>
+ <role-hint>activity-monitor</role-hint>
</component>
<component>
Modified: geronimo/gbuild/trunk/gbuild-agent/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-agent/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=467226&r1=467225&r2=467226
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/src/main/resources/META-INF/plexus/components.xml (original)
+++ geronimo/gbuild/trunk/gbuild-agent/src/main/resources/META-INF/plexus/components.xml Mon Oct 23 20:40:35 2006
@@ -176,34 +176,5 @@
</requirements>
</component>
- <component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
- <role-hint>build-activity</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.activity.BuildActivityMonitor</implementation>
- <requirements>
- <requirement>
- <role>org.apache.geronimo.gbuild.agent.client.ClientManager</role>
- </requirement>
- </requirements>
- <configuration>
- <log-format>[{host-name}:{host-address}] {project.name}-{project.version} - {build.name} {build.id} - {notification}</log-format>
- <build-activity-topic>BUILD.ACTIVITY</build-activity-topic>
- </configuration>
- </component>
-
- <component>
- <role>org.apache.geronimo.gbuild.agent.activity.BuildActivityNotifier</role>
- <role-hint>ping-monitor</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.activity.BuildActivityNotifier</implementation>
- <requirements>
- <requirement>
- <role>org.apache.geronimo.gbuild.agent.client.ClientManager</role>
- </requirement>
- </requirements>
- <configuration>
- <build-activity-topic>BUILD.ACTIVITY</build-activity-topic>
- </configuration>
- </component>
-
</components>
</component-set>
Modified: geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/BuildActivityMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/BuildActivityMonitor.java?view=diff&rev=467226&r1=467225&r2=467226
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/BuildActivityMonitor.java (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/BuildActivityMonitor.java Mon Oct 23 20:40:35 2006
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gbuild.agent.activity;
+package org.apache.geronimo.gbuild.agent.extension.activity;
import java.util.Map;
import javax.jms.Connection;
@@ -37,7 +37,7 @@
import org.apache.geronimo.gbuild.agent.util.StringTemplate;
/**
- * ???
+ * Consumes build activity events.
*
* @version $Rev$ $Date$
*/
Modified: geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/BuildActivityNotifier.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/BuildActivityNotifier.java?view=diff&rev=467226&r1=467225&r2=467226
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/BuildActivityNotifier.java (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/BuildActivityNotifier.java Mon Oct 23 20:40:35 2006
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gbuild.agent.activity;
+package org.apache.geronimo.gbuild.agent.extension.activity;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -38,7 +38,7 @@
import org.apache.geronimo.gbuild.agent.continuum.ContinuumBuildAgent;
/**
- * ???
+ * Produces build activity events.
*
* @version $Rev$ $Date$
*/
Modified: geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/ReportActivityExtension.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/ReportActivityExtension.java?view=diff&rev=467226&r1=467225&r2=467226
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/ReportActivityExtension.java (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/activity/ReportActivityExtension.java Mon Oct 23 20:40:35 2006
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gbuild.agent.extension.standard;
+package org.apache.geronimo.gbuild.agent.extension.activity;
import java.util.Map;
@@ -28,7 +28,6 @@
import org.apache.maven.continuum.store.ContinuumStoreException;
import org.apache.commons.lang.time.DurationFormatUtils;
-import org.apache.geronimo.gbuild.agent.activity.BuildActivityNotifier;
import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtentionSupport;
/**
Added: geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/resources/META-INF/plexus/components.xml?view=auto&rev=467226
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/resources/META-INF/plexus/components.xml (added)
+++ geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/resources/META-INF/plexus/components.xml Mon Oct 23 20:40:35 2006
@@ -0,0 +1,70 @@
+<?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$ -->
+
+<component-set>
+ <components>
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.extension.activity.BuildActivityNotifier</role>
+ <role-hint>activity-notifier</role-hint>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.activity.BuildActivityNotifier</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.geronimo.gbuild.agent.client.ClientManager</role>
+ </requirement>
+ </requirements>
+ <configuration>
+ <build-activity-topic>BUILD.ACTIVITY</build-activity-topic>
+ </configuration>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
+ <role-hint>activity-monitor</role-hint>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.activity.BuildActivityMonitor</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.geronimo.gbuild.agent.client.ClientManager</role>
+ </requirement>
+ </requirements>
+ <configuration>
+ <log-format>[{host-name}:{host-address}] {project.name}-{project.version} - {build.name} {build.id} - {notification}</log-format>
+ <build-activity-topic>BUILD.ACTIVITY</build-activity-topic>
+ </configuration>
+ </component>
+
+ <component>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
+ <role-hint>report-activity</role-hint>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.activity.ReportActivityExtension</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.continuum.store.ContinuumStore</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.geronimo.gbuild.agent.extension.activity.BuildActivityNotifier</role>
+ </requirement>
+ </requirements>
+ </component>
+
+ </components>
+</component-set>
Propchange: geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gbuild/trunk/gbuild-extensions/gbuild-activity-extensions/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/pom.xml?view=diff&rev=467226&r1=467225&r2=467226
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/pom.xml Mon Oct 23 20:40:35 2006
@@ -31,4 +31,12 @@
<artifactId>gbuild-requeue-extensions</artifactId>
<name>GBuild Extensions :: Requeue</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.gbuild.extension</groupId>
+ <artifactId>gbuild-activity-extensions</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+
</project>
Modified: geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/src/main/java/org/apache/geronimo/gbuild/extension/requeue/RequeueFailedBuilds.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/src/main/java/org/apache/geronimo/gbuild/extension/requeue/RequeueFailedBuilds.java?view=diff&rev=467226&r1=467225&r2=467226
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/src/main/java/org/apache/geronimo/gbuild/extension/requeue/RequeueFailedBuilds.java (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/src/main/java/org/apache/geronimo/gbuild/extension/requeue/RequeueFailedBuilds.java Mon Oct 23 20:40:35 2006
@@ -36,11 +36,11 @@
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.apache.geronimo.gbuild.agent.activity.BuildActivityNotifier;
import org.apache.geronimo.gbuild.agent.client.ClientManager;
import org.apache.geronimo.gbuild.agent.continuum.Context;
import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension;
import org.apache.geronimo.gbuild.agent.extension.BuildResultsExtension;
+import org.apache.geronimo.gbuild.agent.extension.activity.BuildActivityNotifier;
import org.apache.geronimo.gbuild.agent.util.StringTemplate;
/**
Modified: geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=467226&r1=467225&r2=467226
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/src/main/resources/META-INF/plexus/components.xml (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/gbuild-requeue-extensions/src/main/resources/META-INF/plexus/components.xml Mon Oct 23 20:40:35 2006
@@ -38,7 +38,7 @@
<role>org.apache.geronimo.gbuild.agent.client.ClientManager</role>
</requirement>
<requirement>
- <role>org.apache.geronimo.gbuild.agent.activity.BuildActivityNotifier</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.activity.BuildActivityNotifier</role>
</requirement>
</requirements>
<configuration>
Modified: geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/pom.xml?view=diff&rev=467226&r1=467225&r2=467226
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/pom.xml Mon Oct 23 20:40:35 2006
@@ -36,6 +36,12 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.gbuild.extension</groupId>
+ <artifactId>gbuild-activity-extensions</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtension.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtension.java?view=diff&rev=467226&r1=467225&r2=467226
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtension.java (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/java/org/apache/geronimo/gbuild/agent/extension/standard/KillProcessesExtension.java Mon Oct 23 20:40:35 2006
@@ -31,8 +31,8 @@
import org.apache.commons.lang.SystemUtils;
-import org.apache.geronimo.gbuild.agent.activity.BuildActivityNotifier;
import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtentionSupport;
+import org.apache.geronimo.gbuild.agent.extension.activity.BuildActivityNotifier;
/**
* ???
Modified: geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=467226&r1=467225&r2=467226
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/resources/META-INF/plexus/components.xml (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/gbuild-standard-extensions/src/main/resources/META-INF/plexus/components.xml Mon Oct 23 20:40:35 2006
@@ -60,25 +60,11 @@
<component>
<role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
- <role-hint>report-activity</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.extension.standard.ReportActivityExtension</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.continuum.store.ContinuumStore</role>
- </requirement>
- <requirement>
- <role>org.apache.geronimo.gbuild.agent.activity.BuildActivityNotifier</role>
- </requirement>
- </requirements>
- </component>
-
- <component>
- <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
<role-hint>clean-dead-processes</role-hint>
<implementation>org.apache.geronimo.gbuild.agent.extension.standard.KillProcessesExtension</implementation>
<requirements>
<requirement>
- <role>org.apache.geronimo.gbuild.agent.activity.BuildActivityNotifier</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.activity.BuildActivityNotifier</role>
</requirement>
</requirements>
<configuration>
Modified: geronimo/gbuild/trunk/gbuild-extensions/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/pom.xml?view=diff&rev=467226&r1=467225&r2=467226
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/pom.xml Mon Oct 23 20:40:35 2006
@@ -46,6 +46,7 @@
<modules>
<module>gbuild-standard-extensions</module>
+ <module>gbuild-activity-extensions</module>
<module>gbuild-requeue-extensions</module>
</modules>