geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r367547 - in /geronimo/gbuild/trunk/gbuild-agent-web: ./ src/main/java/org/apache/geronimo/gbuild/agent/ src/main/java/org/apache/geronimo/gbuild/agent/web/ src/main/resources/META-INF/plexus/ src/main/resources/WEB-INF/ src/test/java/org/a...
Date Tue, 10 Jan 2006 10:06:24 GMT
Author: dblevins
Date: Tue Jan 10 02:06:15 2006
New Revision: 367547

URL: http://svn.apache.org/viewcvs?rev=367547&view=rev
Log:
Start of a web frontend for some of this stuff.  Has a queue browser in it now.

Added:
    geronimo/gbuild/trunk/gbuild-agent-web/
      - copied from r366421, geronimo/gbuild/trunk/gbuild-agent/
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/BuildQueueBrowser.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/WebComponent.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/WebComponentInvoker.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/resources/WEB-INF/
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/resources/WEB-INF/web.xml
Removed:
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/AbstractContinuumAgentAction.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/AbstractContinuumBuildAgent.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/BuildActivityMonitor.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/BuildActivityNotifier.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/BuildAgent.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/BuildAgentException.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/BuildAgentExtension.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/BuildAgentExtentionManager.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/BuildOutputExtension.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/BuildResultsContinuumAgent.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/BuildResultsExtension.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/BuildResultsExtensionManager.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/Client.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/ClientManager.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgent.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/DefaultBuildAgentExtensionManager.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/DefaultBuildResultsExtensionManager.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/DirectoryMonitor.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/DistrubutedBuildController.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/ExecuteDistributedBuilderContinuumAction.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/FileIncludeExtension.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/GZipUtils.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/HeaderIncludeExtension.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/KillProcessesExtension.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/LogFailedBuildsExtension.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/MapContinuumStore.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/MockContinuumNotificationDispatcher.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/MockContinuumStore.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/NoSuchExtentionException.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/PingMonitorAgent.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/PropertiesBuildTaskProducer.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/ReportActivityExtension.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/StringTemplate.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/ThreadContextContinuumStore.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/WriteIncludeFileExtension.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/test/java/org/apache/geronimo/gbuild/agent/CVS.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/test/java/org/apache/geronimo/gbuild/agent/Chmod.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/test/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgentTest.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/test/java/org/apache/geronimo/gbuild/agent/DirectoryMonitorTest.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/test/java/org/apache/geronimo/gbuild/agent/KillProcessesExtensionTest.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/test/java/org/apache/geronimo/gbuild/agent/StringTemplateTest.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/test/java/org/apache/geronimo/gbuild/agent/SystemExecutable.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/test/java/org/apache/geronimo/gbuild/agent/TestLogger.java
    geronimo/gbuild/trunk/gbuild-agent-web/src/test/java/org/apache/geronimo/gbuild/agent/WriteIncludeFileExtentionTest.java
Modified:
    geronimo/gbuild/trunk/gbuild-agent-web/pom.xml
    geronimo/gbuild/trunk/gbuild-agent-web/src/main/resources/META-INF/plexus/components.xml

Modified: geronimo/gbuild/trunk/gbuild-agent-web/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent-web/pom.xml?rev=367547&r1=366421&r2=367547&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent-web/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-agent-web/pom.xml Tue Jan 10 02:06:15 2006
@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geronimo.gbuild</groupId>
-  <artifactId>gbuild-agent</artifactId>
+  <artifactId>gbuild-agent-web</artifactId>
   <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
   <name>GBuild Agent</name>
@@ -51,15 +51,23 @@
     </pluginRepository>
   </pluginRepositories>
   <dependencies>
-
-    <!-- need this till my activemq-core-3.2.pom patch is applied -->
-    <!-- http://jira.codehaus.org/browse/MEV-193 -->
     <dependency>
-      <groupId>concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-      <version>1.3.4</version>
+      <groupId>org.apache.geronimo.gbuild</groupId>
+      <artifactId>gbuild-agent</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-service-jetty</artifactId>
+      <version>1.0-alpha-3</version>
+      <type>plexus-service</type>
+      <exclusions>
+        <exclusion>
+          <artifactId>log4j</artifactId>
+          <groupId>log4j</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
-
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-api</artifactId>
@@ -80,20 +88,19 @@
       <artifactId>plexus-command-line</artifactId>
       <version>1.0-alpha-2</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-cvs</artifactId>
-      <version>1.0-beta-1-SNAPSHOT</version>
-    </dependency>
+
     <dependency>
       <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-j2ee</artifactId>
-      <version>1.4-rc4</version>
+      <artifactId>geronimo-spec-jms</artifactId>
+      <version>1.1-rc4</version>
+      <scope>provided</scope>
     </dependency>
+
     <dependency>
-      <groupId>activemq</groupId>
-      <artifactId>activemq-core</artifactId>
-      <version>3.2</version>
+      <groupId>geronimo-spec</groupId>
+      <artifactId>geronimo-spec-servlet</artifactId>
+      <version>2.4-rc4</version>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>

Added: geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/BuildQueueBrowser.java
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/BuildQueueBrowser.java?rev=367547&view=auto
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/BuildQueueBrowser.java
(added)
+++ geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/BuildQueueBrowser.java
Tue Jan 10 02:06:15 2006
@@ -0,0 +1,112 @@
+/**
+ *
+ * Copyright 2004 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ */
+package org.apache.geronimo.gbuild.agent.web;
+
+import org.apache.geronimo.gbuild.agent.Client;
+import org.apache.geronimo.gbuild.agent.ClientManager;
+
+import javax.jms.Message;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.QueueBrowser;
+import javax.jms.Session;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+import java.util.HashMap;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class BuildQueueBrowser implements WebComponent {
+
+    /**
+     * @plexus.requirement
+     */
+    private ClientManager clientManager;
+
+    /**
+     * @plexus.configuration
+     */
+    private String buildTaskQueue;
+
+    /**
+     * @plexus.configuration
+     */
+    private String keyList;
+
+    /**
+     * @plexus.configuration
+     */
+    private int maxWidth;
+
+    public void service(HttpServletRequest request, HttpServletResponse response) throws
Exception {
+
+        Client client = clientManager.getClient();
+
+        Session session = client.getSession();
+        Queue queue = session.createQueue(buildTaskQueue);
+        QueueBrowser browser = session.createBrowser(queue);
+
+        Enumeration enumeration = browser.getEnumeration();
+
+        response.setContentType("text/html");
+        PrintWriter out = response.getWriter();
+        out.println("<html><body><h1>Browsing "+buildTaskQueue+"</h1>");
+        out.println("<table>");
+
+
+        String[] keys = keyList.split(",");
+        out.println("<tr>");
+        for (int i = 0; i < keys.length; i++) {
+            String key = keys[i];
+            out.println("<td><b>");
+            out.print(key);
+            out.println("</b></td>");
+        }
+        out.println("</tr>");
+
+        while (enumeration.hasMoreElements()) {
+            Message message = (Message) enumeration.nextElement();
+            if (message instanceof ObjectMessage) {
+                ObjectMessage objectMessage = (ObjectMessage) message;
+                Object object = objectMessage.getObject();
+                if (object instanceof HashMap) {
+                    HashMap map = (HashMap) object;
+
+                    out.println("<tr>");
+                    for (int i = 0; i < keys.length; i++) {
+                        String key = keys[i];
+                        Object obj = map.get(key);
+
+                        String data = obj.toString();
+                        data = data.substring(0, Math.min(data.length(), maxWidth));
+
+                        out.println("<td>");
+                        // If the data itself contained xml or html, that would be bad.
+                        out.print(data);
+                        out.println("</td>");
+                    }
+                    out.println("</tr>");
+                }
+            }
+        }
+        out.println("</table>");
+        out.println("</body></html>");
+    }
+}

Added: geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/WebComponent.java
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/WebComponent.java?rev=367547&view=auto
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/WebComponent.java
(added)
+++ geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/WebComponent.java
Tue Jan 10 02:06:15 2006
@@ -0,0 +1,30 @@
+/**
+ *
+ * Copyright 2004 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ */
+package org.apache.geronimo.gbuild.agent.web;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface WebComponent {
+    
+    String ROLE = WebComponent.class.getName();
+
+    void service(HttpServletRequest request, HttpServletResponse response) throws Exception;
+}

Added: geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/WebComponentInvoker.java
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/WebComponentInvoker.java?rev=367547&view=auto
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/WebComponentInvoker.java
(added)
+++ geronimo/gbuild/trunk/gbuild-agent-web/src/main/java/org/apache/geronimo/gbuild/agent/web/WebComponentInvoker.java
Tue Jan 10 02:06:15 2006
@@ -0,0 +1,91 @@
+/**
+ *
+ * Copyright 2004 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ */
+package org.apache.geronimo.gbuild.agent.web;
+
+import org.codehaus.plexus.PlexusConstants;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Map;
+import java.util.Iterator;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class WebComponentInvoker extends HttpServlet implements javax.servlet.Servlet {
+
+
+    protected void service(HttpServletRequest request, HttpServletResponse response) throws
ServletException, IOException {
+        String contextPath = request.getContextPath() + "/";
+        String requestURI = request.getRequestURI().replaceFirst(contextPath, "");
+        System.out.println("requestURI = " + requestURI);
+        if (requestURI.length() > 0) {
+            WebComponent webComponent = null;
+            try {
+                webComponent = (WebComponent) getPlexusContainer().lookup(WebComponent.ROLE,
requestURI);
+            } catch (Exception e) {
+                response.setContentType("text/plain");
+                response.getWriter().println("No such WebComponent: " + requestURI + ". 
" + e.getMessage());
+                return;
+            }
+            try {
+                webComponent.service(request, response);
+            } catch (Exception e) {
+                response.setContentType("text/plain");
+                PrintWriter writer = response.getWriter();
+                writer.println("Error invoking WebComponent: " + requestURI + "." + e.getMessage());
+                e.printStackTrace(writer);
+                return;
+            }
+        } else {
+            try {
+                PlexusContainer plexusContainer = getPlexusContainer();
+                Map map = plexusContainer.lookupMap(WebComponent.ROLE);
+                for (Iterator iterator = map.entrySet().iterator(); iterator.hasNext();)
{
+                    Map.Entry entry = (Map.Entry) iterator.next();
+                    Object key = entry.getKey();
+                    Object value = entry.getValue();
+
+                    response.setContentType("text/plain");
+                    PrintWriter out = response.getWriter();
+                    out.println(key +" \t " + value);
+                }
+            } catch (ComponentLookupException e) {
+                e.printStackTrace();
+                response.setContentType("text/plain");
+                PrintWriter writer = response.getWriter();
+                writer.println("Error invoking WebComponent: " + requestURI + "." + e.getMessage());
+                e.printStackTrace(writer);
+            }
+        }
+    }
+
+
+    public PlexusContainer getPlexusContainer() {
+        ServletContext servletContext = getServletContext();
+        return (PlexusContainer) servletContext.getAttribute(PlexusConstants.PLEXUS_KEY);
+    }
+
+
+}

Modified: geronimo/gbuild/trunk/gbuild-agent-web/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent-web/src/main/resources/META-INF/plexus/components.xml?rev=367547&r1=366421&r2=367547&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent-web/src/main/resources/META-INF/plexus/components.xml
(original)
+++ geronimo/gbuild/trunk/gbuild-agent-web/src/main/resources/META-INF/plexus/components.xml
Tue Jan 10 02:06:15 2006
@@ -2,118 +2,9 @@
   <components>
 
     <component>
-      <role>org.apache.geronimo.gbuild.agent.ClientManager</role>
-      <implementation>org.apache.geronimo.gbuild.agent.ClientManager</implementation>
-      <configuration>
-        <broker-url>tcp://localhost:61616</broker-url>
-        <ping-interval>300000</ping-interval>
-        <reconnect-attempts>10</reconnect-attempts>
-        <reconnect-delay>600000</reconnect-delay>
-      </configuration>
-    </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>agent/work</working-directory>
-        <build-output-directory>agent/output</build-output-directory>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.codehaus.plexus.action.Action</role>
-      <role-hint>execute-builder</role-hint>
-      <implementation>org.apache.geronimo.gbuild.agent.ExecuteDistributedBuilderContinuumAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.execution.manager.BuildExecutorManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.notification.ContinuumNotificationDispatcher</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.continuum.store.ContinuumStore</role>
-      <role-hint>agent-store</role-hint>
-      <implementation>org.apache.geronimo.gbuild.agent.ThreadContextContinuumStore</implementation>
-    </component>
-
-    <component>
-      <role>org.apache.maven.continuum.notification.ContinuumNotificationDispatcher</role>
-      <!--<role-hint>agent-notifier</role-hint>-->
-      <implementation>org.apache.geronimo.gbuild.agent.MockContinuumNotificationDispatcher</implementation>
-    </component>
-
-    <component>
-      <role>org.apache.geronimo.gbuild.agent.BuildAgentExtentionManager</role>
-      <implementation>org.apache.geronimo.gbuild.agent.DefaultBuildAgentExtensionManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
-          <field-name>extentions</field-name>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
-      <role-hint>file-include</role-hint>
-      <implementation>org.apache.geronimo.gbuild.agent.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.BuildAgentExtension</role>
-      <role-hint>general-headers</role-hint>
-      <implementation>org.apache.geronimo.gbuild.agent.HeaderIncludeExtension</implementation>
-      <configuration>
-        <pattern>^(project|build|header).*</pattern>
-      </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>
+      <role>org.apache.geronimo.gbuild.agent.web.WebComponent</role>
+      <role-hint>taskqueue</role-hint>
+      <implementation>org.apache.geronimo.gbuild.agent.web.BuildQueueBrowser</implementation>
       <requirements>
         <requirement>
           <role>org.apache.geronimo.gbuild.agent.ClientManager</role>
@@ -121,152 +12,8 @@
       </requirements>
       <configuration>
         <build-task-queue>BUILD.TASKS</build-task-queue>
-        <include-prefix>include.</include-prefix>
-        <header-prefix>header.</header-prefix>
-        <watch-directory>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.BuildResultsExtensionManager</role>
-        </requirement>
-      </requirements>
-      <configuration>
-        <build-results-topic>BUILD.RESULTS</build-results-topic>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.geronimo.gbuild.agent.BuildResultsExtensionManager</role>
-      <implementation>org.apache.geronimo.gbuild.agent.DefaultBuildResultsExtensionManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.geronimo.gbuild.agent.BuildResultsExtension</role>
-          <field-name>extentions</field-name>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.geronimo.gbuild.agent.BuildResultsExtension</role>
-      <role-hint>write-include-file</role-hint>
-      <implementation>org.apache.geronimo.gbuild.agent.WriteIncludeFileExtension</implementation>
-      <configuration>
-        <include-pattern>^include.*</include-pattern>
-        <results-directory>results</results-directory>
-        <date-format>yyyy-MM</date-format>
-        <file-name-template>{date}/{project.name}/{project.version}/{build.name}-{build.id}.properties</file-name-template>
-      </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>
-
-    <!--
-    | Build Activity
-    -->
-    <component>
-      <role>org.apache.geronimo.gbuild.agent.BuildAgent</role>
-      <role-hint>build-activity</role-hint>
-      <implementation>org.apache.geronimo.gbuild.agent.BuildActivityMonitor</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.geronimo.gbuild.agent.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.BuildActivityNotifier</role>
-      <role-hint>ping-monitor</role-hint>
-      <implementation>org.apache.geronimo.gbuild.agent.BuildActivityNotifier</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.geronimo.gbuild.agent.ClientManager</role>
-        </requirement>
-      </requirements>
-      <configuration>
-        <build-activity-topic>BUILD.ACTIVITY</build-activity-topic>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
-      <role-hint>report-activity</role-hint>
-      <implementation>org.apache.geronimo.gbuild.agent.ReportActivityExtension</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.geronimo.gbuild.agent.BuildActivityNotifier</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
-      <role-hint>clean-dead-processes</role-hint>
-      <implementation>org.apache.geronimo.gbuild.agent.KillProcessesExtension</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.geronimo.gbuild.agent.BuildActivityNotifier</role>
-        </requirement>
-      </requirements>
-      <configuration>
-        <regex>.*geronimo-tck.*</regex>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.geronimo.gbuild.agent.BuildAgentExtension</role>
-      <role-hint>build-output</role-hint>
-      <implementation>org.apache.geronimo.gbuild.agent.BuildOutputExtension</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.continuum.store.ContinuumStore</role>
-        </requirement>
-      </requirements>
-      <configuration>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.geronimo.gbuild.agent.BuildResultsExtension</role>
-      <role-hint>log-failed-build-file</role-hint>
-      <implementation>org.apache.geronimo.gbuild.agent.LogFailedBuildsExtension</implementation>
-      <configuration>
-        <results-directory>${plexus.home}/failed</results-directory>
-        <date-format>yyyy-MM-dd-HHmm</date-format>
-        <file-name-template>{project.name}-{project.version}/{date}-{host-name}-{build.name}-{build.id}.txt</file-name-template>
+        <key-list>project.name,project.version,build.name</key-list>
+        <max-width>100</max-width>
       </configuration>
     </component>
 

Added: geronimo/gbuild/trunk/gbuild-agent-web/src/main/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent-web/src/main/resources/WEB-INF/web.xml?rev=367547&view=auto
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent-web/src/main/resources/WEB-INF/web.xml (added)
+++ geronimo/gbuild/trunk/gbuild-agent-web/src/main/resources/WEB-INF/web.xml Tue Jan 10 02:06:15
2006
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+
+  <servlet>
+    <servlet-name>gbuild</servlet-name>
+    <servlet-class>org.apache.geronimo.gbuild.agent.web.WebComponentInvoker</servlet-class>
+    <load-on-startup>5</load-on-startup>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>gbuild</servlet-name>
+    <url-pattern>/*</url-pattern>
+  </servlet-mapping>
+
+</web-app>
\ No newline at end of file



Mime
View raw message