geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r344336 - in /geronimo/gbuild/trunk: ./ gbuild-agent-application/ gbuild-agent-application/src/assembly/ gbuild-agent-application/src/conf/ gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/ gbuild-agent/src/main/resources/META-IN...
Date Tue, 15 Nov 2005 09:21:13 GMT
Author: dblevins
Date: Tue Nov 15 01:21:06 2005
New Revision: 344336

URL: http://svn.apache.org/viewcvs?rev=344336&view=rev
Log:
A standalone agent application that boots

Added:
    geronimo/gbuild/trunk/gbuild-agent-application/assemble.sh
Modified:
    geronimo/gbuild/trunk/gbuild-agent-application/pom.xml
    geronimo/gbuild/trunk/gbuild-agent-application/src/assembly/bin.xml
    geronimo/gbuild/trunk/gbuild-agent-application/src/conf/application.xml
    geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgent.java
    geronimo/gbuild/trunk/gbuild-agent/src/main/resources/META-INF/plexus/components.xml
    geronimo/gbuild/trunk/pom.xml

Added: geronimo/gbuild/trunk/gbuild-agent-application/assemble.sh
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent-application/assemble.sh?rev=344336&view=auto
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent-application/assemble.sh (added)
+++ geronimo/gbuild/trunk/gbuild-agent-application/assemble.sh Tue Nov 15 01:21:06 2005
@@ -0,0 +1,2 @@
+#!/bin/bash
+mvn clean:clean plexus:app plexus:bundle-application assembly:assembly "$@"
\ No newline at end of file

Modified: geronimo/gbuild/trunk/gbuild-agent-application/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent-application/pom.xml?rev=344336&r1=344335&r2=344336&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent-application/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-agent-application/pom.xml Tue Nov 15 01:21:06 2005
@@ -1,12 +1,14 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project>
+  <parent>
+    <artifactId>gbuild-parent</artifactId>
+    <groupId>org.apache.geronimo.gbuild</groupId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.geronimo.gbuild</groupId>
   <artifactId>gbuild-agent-application</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
+  <packaging>plexus-application</packaging>
   <name>GBuild Agent Application</name>
-  <url>http://maven.apache.org</url>
+  <version>1.0-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -20,7 +22,7 @@
         </executions>
         <configuration>
           <descriptor>src/assembly/bin.xml</descriptor>
-          <finalName>gbuild-agent-1.1-SNAPSHOT</finalName>
+          <finalName>gbuild-agent-1.0-SNAPSHOT</finalName>
         </configuration>
       </plugin>
       <plugin>
@@ -79,82 +81,47 @@
       <url>http://cvs.apache.org/repository</url>
       <layout>legacy</layout>
     </repository>
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <id>snapshots</id>
-      <name>Maven Snapshot Development Repository</name>
-      <url>http://snapshots.maven.codehaus.org/maven2</url>
-    </repository>
   </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <id>snapshots</id>
-      <name>Maven Central Plugins Development Repository</name>
-      <url>http://snapshots.maven.codehaus.org/maven2</url>
-    </pluginRepository>
-  </pluginRepositories>
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-8</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.geronimo.gbuild</groupId>
       <artifactId>gbuild-agent</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-      <version>1.3.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.continuum</groupId>
-      <artifactId>continuum-api</artifactId>
-      <version>1.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.continuum</groupId>
-      <artifactId>continuum-core</artifactId>
-      <version>1.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.continuum</groupId>
-      <artifactId>continuum-model</artifactId>
-      <version>1.1-SNAPSHOT</version>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.8</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-command-line</artifactId>
-      <version>1.0-alpha-2</version>
+      <artifactId>plexus-log4j-logging</artifactId>
+      <version>1.1-alpha-1</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-cvs</artifactId>
-      <version>1.0-beta-1-SNAPSHOT</version>
-    </dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-container-artifact</artifactId>
+      <version>1.0-alpha-3</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>plexus-container-default</artifactId>
+          <groupId>plexus</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <!--<dependency>-->
+      <!--<groupId>org.apache.maven</groupId>-->
+      <!--<artifactId>maven-artifact</artifactId>-->
+      <!--<scope>runtime</scope>-->
+    <!--</dependency>-->
     <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-j2ee</artifactId>
-      <version>1.4-rc4</version>
-    </dependency>
-    <dependency>
-      <groupId>activemq</groupId>
-      <artifactId>activemq-core</artifactId>
-      <version>3.2</version>
-    </dependency>
-   
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-appserver</artifactId>
+      <version>1.0-alpha-5</version>
     </dependency>
+    <!--<dependency>-->
+      <!--<groupId>org.codehaus.plexus</groupId>-->
+      <!--<artifactId>plexus-utils</artifactId>-->
+    <!--</dependency>-->
   </dependencies>
 </project>

Modified: geronimo/gbuild/trunk/gbuild-agent-application/src/assembly/bin.xml
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent-application/src/assembly/bin.xml?rev=344336&r1=344335&r2=344336&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent-application/src/assembly/bin.xml (original)
+++ geronimo/gbuild/trunk/gbuild-agent-application/src/assembly/bin.xml Tue Nov 15 01:21:06
2005
@@ -2,8 +2,8 @@
   <id>bin</id>
   <formats>
     <format>tar.gz</format>
-    <format>tar.bz2</format>
-    <format>zip</format>
+    <!--<format>tar.bz2</format>-->
+    <!--<format>zip</format>-->
   </formats>
   <fileSets>
     <fileSet>

Modified: geronimo/gbuild/trunk/gbuild-agent-application/src/conf/application.xml
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent-application/src/conf/application.xml?rev=344336&r1=344335&r2=344336&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent-application/src/conf/application.xml (original)
+++ geronimo/gbuild/trunk/gbuild-agent-application/src/conf/application.xml Tue Nov 15 01:21:06
2005
@@ -50,6 +50,18 @@
       </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>
+    </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>
+    
     <!--
     | Logger manager
     -->

Modified: geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgent.java
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgent.java?rev=344336&r1=344335&r2=344336&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgent.java
(original)
+++ geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgent.java
Tue Nov 15 01:21:06 2005
@@ -22,6 +22,9 @@
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.configuration.ConfigurationLoadingException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -44,7 +47,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class ContinuumBuildAgent extends AbstractLogEnabled implements BuildAgent, ExceptionListener
{
+public class ContinuumBuildAgent extends AbstractLogEnabled implements BuildAgent, ExceptionListener,
Startable {
 
     // ----------------------------------------------------------------------
     // Keys for the values that can be in the context
@@ -329,7 +332,14 @@
         return run;
     }
 
-    public synchronized void stop() {
+    public synchronized void start() throws StartingException {
+        run = true;
+        Thread agentThread = new Thread(this);
+        agentThread.setDaemon(false);
+        agentThread.start();
+    }
+
+    public synchronized void stop() throws StoppingException {
         run = false;
     }
 

Modified: geronimo/gbuild/trunk/gbuild-agent/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent/src/main/resources/META-INF/plexus/components.xml?rev=344336&r1=344335&r2=344336&view=diff
==============================================================================
--- 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 Tue
Nov 15 01:21:06 2005
@@ -64,7 +64,7 @@
 
     <component>
       <role>org.apache.maven.continuum.notification.ContinuumNotificationDispatcher</role>
-      <role-hint>agent-notifier</role-hint>
+      <!--<role-hint>agent-notifier</role-hint>-->
       <implementation>org.apache.geronimo.gbuild.agent.MockContinuumNotificationDispatcher</implementation>
     </component>
 
@@ -79,19 +79,6 @@
       </requirements>
     </component>
 
-    <component>
-      <role>org.apache.geronimo.gbuild.agent.BuildAgentExtention</role>
-      <role-hint>work-properties</role-hint>
-      <implementation>org.apache.geronimo.gbuild.agent.FileIncludeExtention</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
-        </requirement>
-      </requirements>
-      <configuration>
-        <file-name-key>work-properties</file-name-key>
-      </configuration>
-    </component>
 
   </components>
 </component-set>

Modified: geronimo/gbuild/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/pom.xml?rev=344336&r1=344335&r2=344336&view=diff
==============================================================================
--- geronimo/gbuild/trunk/pom.xml (original)
+++ geronimo/gbuild/trunk/pom.xml Tue Nov 15 01:21:06 2005
@@ -24,16 +24,16 @@
   <inceptionYear>2005</inceptionYear>
   <mailingLists>
     <mailingList>
-      <name>Continuum Dev List</name>
-      <subscribe>continuum-dev-subscribe@maven.apache.org</subscribe>
-      <unsubscribe>continuum-dev-unsubscribe@maven.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/maven-continuum-dev/</archive>
+      <name>GBuild Dev List</name>
+      <subscribe>dev-subscribe@geronimo.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@geronimo.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/geronimo-dev/</archive>
     </mailingList>
     <mailingList>
-      <name>Continuum User List</name>
-      <subscribe>continuum-users-subscribe@maven.apache.org</subscribe>
-      <unsubscribe>continuum-users-unsubscribe@maven.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/maven-continuum-users/</archive>
+      <name>GBuild User List</name>
+      <subscribe>users-subscribe@maven.apache.org</subscribe>
+      <unsubscribe>users-unsubscribe@maven.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/geronimo-users/</archive>
     </mailingList>
     <mailingList>
       <name>Apache Announce List</name>
@@ -83,9 +83,22 @@
     <name>Apache</name>
     <url>http://www.apache.org/</url>
   </organization>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+	  <groupId>org.codehaus.plexus</groupId>
+	  <artifactId>plexus-maven-plugin</artifactId>
+	  <version>1.1.1</version>
+	  <extensions>true</extensions>
+	</plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
   <modules>
     <module>gbuild-agent</module>
     <module>gbuild-report</module>
+    <module>gbuild-agent-application</module>
   </modules>
   <repositories>
     <repository>



Mime
View raw message