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:51:16 UTC
svn commit: r463596 [2/2] - in /geronimo/gbuild/trunk:
gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/
gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/extension/
gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/exten...
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=463596&r1=463595&r2=463596
==============================================================================
--- 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 Fri Oct 13 01:51:13 2006
@@ -43,7 +43,7 @@
<role>org.apache.geronimo.gbuild.agent.ClientManager</role>
</requirement>
<requirement>
- <role>org.apache.geronimo.gbuild.agent.BuildAgentExtentionManager</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtentionManager</role>
</requirement>
<requirement>
<role>org.apache.maven.continuum.buildcontroller.BuildController</role>
@@ -95,20 +95,20 @@
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgentExtentionManager</role>
- <implementation>org.apache.geronimo.gbuild.agent.DefaultBuildAgentExtensionManager</implementation>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtentionManager</role>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.DefaultBuildAgentExtensionManager</implementation>
<requirements>
<requirement>
- <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
<field-name>extentions</field-name>
</requirement>
</requirements>
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
<role-hint>file-include</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.FileIncludeExtension</implementation>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.FileIncludeExtension</implementation>
<requirements>
<requirement>
<role>org.apache.maven.continuum.configuration.ConfigurationService</role>
@@ -120,9 +120,9 @@
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
<role-hint>general-headers</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.HeaderIncludeExtension</implementation>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.HeaderIncludeExtension</implementation>
<configuration>
<pattern>^(project|build|header).*</pattern>
</configuration>
@@ -177,7 +177,7 @@
<implementation>org.apache.geronimo.gbuild.agent.BuildResultsContinuumAgent</implementation>
<requirements>
<requirement>
- <role>org.apache.geronimo.gbuild.agent.BuildResultsExtensionManager</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildResultsExtensionManager</role>
</requirement>
</requirements>
<configuration>
@@ -186,20 +186,20 @@
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildResultsExtensionManager</role>
- <implementation>org.apache.geronimo.gbuild.agent.DefaultBuildResultsExtensionManager</implementation>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildResultsExtensionManager</role>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.DefaultBuildResultsExtensionManager</implementation>
<requirements>
<requirement>
- <role>org.apache.geronimo.gbuild.agent.BuildResultsExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildResultsExtension</role>
<field-name>extentions</field-name>
</requirement>
</requirements>
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildResultsExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildResultsExtension</role>
<role-hint>write-include-file</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.WriteIncludeFileExtension</implementation>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.WriteIncludeFileExtension</implementation>
<configuration>
<include-pattern>^include.*</include-pattern>
<results-directory>results</results-directory>
@@ -255,9 +255,9 @@
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
<role-hint>report-activity</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.ReportActivityExtension</implementation>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.ReportActivityExtension</implementation>
<requirements>
<requirement>
<role>org.apache.maven.continuum.store.ContinuumStore</role>
@@ -269,9 +269,9 @@
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
<role-hint>clean-dead-processes</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.KillProcessesExtension</implementation>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.KillProcessesExtension</implementation>
<requirements>
<requirement>
<role>org.apache.geronimo.gbuild.agent.BuildActivityNotifier</role>
@@ -283,9 +283,9 @@
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
<role-hint>build-output</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.BuildOutputExtension</implementation>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.BuildOutputExtension</implementation>
<requirements>
<requirement>
<role>org.apache.maven.continuum.configuration.ConfigurationService</role>
@@ -298,9 +298,9 @@
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildResultsExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildResultsExtension</role>
<role-hint>log-failed-build-file</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.LogFailedBuildsExtension</implementation>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.LogFailedBuildsExtension</implementation>
<configuration>
<results-directory>${plexus.home}/failed</results-directory>
<date-format>yyyy-MM-dd-HHmm</date-format>
Modified: geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/KillProcessesExtensionTest.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/KillProcessesExtensionTest.java?view=diff&rev=463596&r1=463595&r2=463596
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/KillProcessesExtensionTest.java (original)
+++ geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/KillProcessesExtensionTest.java Fri Oct 13 01:51:13 2006
@@ -4,7 +4,7 @@
*/
import junit.framework.*;
-import org.apache.geronimo.gbuild.agent.KillProcessesExtension;
+import org.apache.geronimo.gbuild.agent.extension.standard.KillProcessesExtension;
import java.util.List;
Modified: geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/WriteIncludeFileExtentionTest.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/WriteIncludeFileExtentionTest.java?view=diff&rev=463596&r1=463595&r2=463596
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/WriteIncludeFileExtentionTest.java (original)
+++ geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/WriteIncludeFileExtentionTest.java Fri Oct 13 01:51:13 2006
@@ -10,6 +10,8 @@
import java.util.HashMap;
import java.util.Properties;
+import org.apache.geronimo.gbuild.agent.extension.standard.WriteIncludeFileExtension;
+
public class WriteIncludeFileExtentionTest extends TestCase {
public void testExecute() throws Exception {
Modified: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/resources/application.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/resources/application.xml?view=diff&rev=463596&r1=463595&r2=463596
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/resources/application.xml (original)
+++ geronimo/gbuild/trunk/gbuild-assemblies/gbuild-agent-assembly/src/main/resources/application.xml Fri Oct 13 01:51:13 2006
@@ -83,7 +83,7 @@
<role>org.apache.geronimo.gbuild.agent.ClientManager</role>
</requirement>
<requirement>
- <role>org.apache.geronimo.gbuild.agent.BuildAgentExtentionManager</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtentionManager</role>
</requirement>
<requirement>
<role>org.apache.maven.continuum.buildcontroller.BuildController</role>
@@ -114,9 +114,9 @@
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
<role-hint>file-include</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.FileIncludeExtension</implementation>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.FileIncludeExtension</implementation>
<requirements>
<requirement>
<role>org.apache.maven.continuum.configuration.ConfigurationService</role>
@@ -128,18 +128,18 @@
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
<role-hint>general-headers</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.HeaderIncludeExtension</implementation>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.HeaderIncludeExtension</implementation>
<configuration>
<pattern>^(project|build|header).*</pattern>
</configuration>
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildResultsExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildResultsExtension</role>
<role-hint>write-include-file</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.WriteIncludeFileExtension</implementation>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.WriteIncludeFileExtension</implementation>
<configuration>
<include-pattern>^include.*</include-pattern>
<results-directory>${plexus.home}/results</results-directory>
@@ -196,19 +196,19 @@
<level>INFO</level>
</level>
<level>
- <hierarchy>org.apache.geronimo.gbuild.agent.BuildAgentExtension:file-include</hierarchy>
+ <hierarchy>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension:file-include</hierarchy>
<level>INFO</level>
</level>
<level>
- <hierarchy>org.apache.geronimo.gbuild.agent.BuildAgentExtension:general-headers</hierarchy>
+ <hierarchy>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension:general-headers</hierarchy>
<level>INFO</level>
</level>
<level>
- <hierarchy>org.apache.geronimo.gbuild.agent.BuildResultsExtension:write-include-file</hierarchy>
+ <hierarchy>org.apache.geronimo.gbuild.agent.extension.BuildResultsExtension:write-include-file</hierarchy>
<level>INFO</level>
</level>
<level>
- <hierarchy>org.apache.geronimo.gbuild.agent.BuildAgentExtension:file-include</hierarchy>
+ <hierarchy>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension:file-include</hierarchy>
<level>INFO</level>
</level>
<level>
Modified: geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/resources/application.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/resources/application.xml?view=diff&rev=463596&r1=463595&r2=463596
==============================================================================
--- geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/resources/application.xml (original)
+++ geronimo/gbuild/trunk/gbuild-assemblies/gbuild-manager-assembly/src/main/resources/application.xml Fri Oct 13 01:51:13 2006
@@ -102,9 +102,9 @@
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
<role-hint>file-include</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.FileIncludeExtension</implementation>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.FileIncludeExtension</implementation>
<requirements>
<requirement>
<role>org.apache.maven.continuum.configuration.ConfigurationService</role>
@@ -116,9 +116,9 @@
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
<role-hint>general-headers</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.HeaderIncludeExtension</implementation>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.HeaderIncludeExtension</implementation>
<configuration>
<pattern>^(project|build|header).*</pattern>
</configuration>
@@ -151,7 +151,7 @@
<role>org.apache.geronimo.gbuild.agent.ClientManager</role>
</requirement>
<requirement>
- <role>org.apache.geronimo.gbuild.agent.BuildResultsExtensionManager</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildResultsExtensionManager</role>
</requirement>
</requirements>
<configuration>
@@ -160,9 +160,9 @@
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildResultsExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildResultsExtension</role>
<role-hint>write-include-file</role-hint>
- <implementation>org.apache.geronimo.gbuild.agent.WriteIncludeFileExtension</implementation>
+ <implementation>org.apache.geronimo.gbuild.agent.extension.standard.WriteIncludeFileExtension</implementation>
<configuration>
<include-pattern>^include.*</include-pattern>
<results-directory>${plexus.home}/results</results-directory>
@@ -230,19 +230,19 @@
<level>INFO</level>
</level>
<level>
- <hierarchy>org.apache.geronimo.gbuild.agent.BuildAgentExtension:file-include</hierarchy>
+ <hierarchy>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension:file-include</hierarchy>
<level>INFO</level>
</level>
<level>
- <hierarchy>org.apache.geronimo.gbuild.agent.BuildAgentExtension:general-headers</hierarchy>
+ <hierarchy>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension:general-headers</hierarchy>
<level>INFO</level>
</level>
<level>
- <hierarchy>org.apache.geronimo.gbuild.agent.BuildResultsExtension:write-include-file</hierarchy>
+ <hierarchy>org.apache.geronimo.gbuild.agent.extension.BuildResultsExtension:write-include-file</hierarchy>
<level>INFO</level>
</level>
<level>
- <hierarchy>org.apache.geronimo.gbuild.agent.BuildAgentExtension:file-include</hierarchy>
+ <hierarchy>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension:file-include</hierarchy>
<level>INFO</level>
</level>
<level>
Modified: geronimo/gbuild/trunk/gbuild-extensions/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/pom.xml?view=diff&rev=463596&r1=463595&r2=463596
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/pom.xml Fri Oct 13 01:51:13 2006
@@ -32,7 +32,7 @@
</parent>
<groupId>org.apache.geronimo.gbuild.extension</groupId>
- <artifactId>extensions</artifactId>
+ <artifactId>gbuild-extensions</artifactId>
<name>GBuild Extensions</name>
<packaging>pom</packaging>
Modified: geronimo/gbuild/trunk/gbuild-extensions/requeue-failed/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/requeue-failed/pom.xml?view=diff&rev=463596&r1=463595&r2=463596
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/requeue-failed/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/requeue-failed/pom.xml Fri Oct 13 01:51:13 2006
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.gbuild.extension</groupId>
- <artifactId>extensions</artifactId>
+ <artifactId>gbuild-extensions</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: geronimo/gbuild/trunk/gbuild-extensions/requeue-failed/src/main/java/org/apache/geronimo/gbuild/extension/requeue/RequeueFailedBuilds.java
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/requeue-failed/src/main/java/org/apache/geronimo/gbuild/extension/requeue/RequeueFailedBuilds.java?view=diff&rev=463596&r1=463595&r2=463596
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/requeue-failed/src/main/java/org/apache/geronimo/gbuild/extension/requeue/RequeueFailedBuilds.java (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/requeue-failed/src/main/java/org/apache/geronimo/gbuild/extension/requeue/RequeueFailedBuilds.java Fri Oct 13 01:51:13 2006
@@ -19,29 +19,31 @@
package org.apache.geronimo.gbuild.extension.requeue;
-import org.apache.geronimo.gbuild.agent.AbstractContinuumAgentAction;
-import org.apache.geronimo.gbuild.agent.BuildAgentExtension;
-import org.apache.geronimo.gbuild.agent.BuildResultsExtension;
-import org.apache.geronimo.gbuild.agent.ClientManager;
-import org.apache.geronimo.gbuild.agent.BuildActivityNotifier;
-import org.apache.geronimo.gbuild.agent.ContinuumBuildAgent;
-import org.apache.geronimo.gbuild.agent.StringTemplate;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import javax.jms.DeliveryMode;
+import javax.jms.JMSException;
+import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.Session;
+
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+
import org.apache.maven.continuum.core.action.AbstractContinuumAction;
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import javax.jms.Session;
-import javax.jms.Queue;
-import javax.jms.MessageProducer;
-import javax.jms.DeliveryMode;
-import javax.jms.ObjectMessage;
-import javax.jms.JMSException;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.ArrayList;
+import org.apache.geronimo.gbuild.agent.AbstractContinuumAgentAction;
+import org.apache.geronimo.gbuild.agent.BuildActivityNotifier;
+import org.apache.geronimo.gbuild.agent.ClientManager;
+import org.apache.geronimo.gbuild.agent.ContinuumBuildAgent;
+import org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension;
+import org.apache.geronimo.gbuild.agent.extension.BuildResultsExtension;
+import org.apache.geronimo.gbuild.agent.util.StringTemplate;
/**
* Decided to put the BuildAgentExtension and BuildResultsExtension both in this class
@@ -74,7 +76,8 @@
}
}
- public static class AgentExtension extends RequeueFailedBuilds implements BuildAgentExtension {
+ public static class AgentExtension extends RequeueFailedBuilds implements BuildAgentExtension
+ {
public static void main(String[] args) {
String name = AgentExtension.class.getName();
System.out.println("name = " + name);
Modified: geronimo/gbuild/trunk/gbuild-extensions/requeue-failed/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-extensions/requeue-failed/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=463596&r1=463595&r2=463596
==============================================================================
--- geronimo/gbuild/trunk/gbuild-extensions/requeue-failed/src/main/resources/META-INF/plexus/components.xml (original)
+++ geronimo/gbuild/trunk/gbuild-extensions/requeue-failed/src/main/resources/META-INF/plexus/components.xml Fri Oct 13 01:51:13 2006
@@ -24,13 +24,13 @@
<components>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildAgentExtension</role>
<role-hint>requeue-failed</role-hint>
<implementation>org.apache.geronimo.gbuild.extension.requeue.RequeueFailedBuilds$AgentExtension</implementation>
</component>
<component>
- <role>org.apache.geronimo.gbuild.agent.BuildResultsExtension</role>
+ <role>org.apache.geronimo.gbuild.agent.extension.BuildResultsExtension</role>
<role-hint>requeue-failed</role-hint>
<implementation>org.apache.geronimo.gbuild.extension.requeue.RequeueFailedBuilds$ResultsExtension</implementation>
<requirements>