You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2005/12/08 05:46:38 UTC
svn commit: r354977 - in /geronimo/gbuild/trunk/gbuild-agent/src:
main/java/org/apache/geronimo/gbuild/agent/PropertiesBuildTaskProducer.java
test/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgentTest.java
Author: dblevins
Date: Wed Dec 7 20:46:17 2005
New Revision: 354977
URL: http://svn.apache.org/viewcvs?rev=354977&view=rev
Log:
Added some additional project related headers.
Modified:
geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/PropertiesBuildTaskProducer.java
geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgentTest.java
Modified: geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/PropertiesBuildTaskProducer.java
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/PropertiesBuildTaskProducer.java?rev=354977&r1=354976&r2=354977&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/PropertiesBuildTaskProducer.java (original)
+++ geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/PropertiesBuildTaskProducer.java Wed Dec 7 20:46:17 2005
@@ -20,6 +20,7 @@
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.project.ContinuumProjectState;
+import org.apache.maven.continuum.core.action.AbstractContinuumAction;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException;
@@ -189,15 +190,28 @@
map.put(KEY_STORE, store);
- map.put(KEY_PROJECT_ID, new Integer(project.getId()));
+ Integer projectId = new Integer(project.getId());
- map.put(KEY_BUILD_DEFINITION_ID, new Integer(bd.getId()));
- map.put("build.id", new Integer(bd.getId()));
+ map.put(KEY_PROJECT_ID, projectId);
+
+ map.put(AbstractContinuumAction.KEY_PROJECT_ID, projectId);
+
+ Integer buildId = new Integer(bd.getId());
+
+ map.put(KEY_BUILD_DEFINITION_ID, buildId);
+
+ map.put(AbstractContinuumAction.KEY_BUILD_DEFINITION_ID, projectId);
+
+ map.put("build.id", buildId);
+
+ map.put(AbstractContinuumAction.KEY_BUILD_ID, projectId);
map.put(KEY_TRIGGER, new Integer(ContinuumProjectState.TRIGGER_FORCED));
addProperties("project.", def, map);
+
addProperties(headerPrefix, def, map);
+
addProperties(includePrefix, def, map);
producer.send(session.createObjectMessage(map));
Modified: geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgentTest.java
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgentTest.java?rev=354977&r1=354976&r2=354977&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgentTest.java (original)
+++ geronimo/gbuild/trunk/gbuild-agent/src/test/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgentTest.java Wed Dec 7 20:46:17 2005
@@ -12,6 +12,7 @@
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.store.ContinuumStore;
+import org.apache.maven.continuum.core.action.AbstractContinuumAction;
import org.codehaus.plexus.embed.Embedder;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
@@ -137,6 +138,7 @@
map.put(AbstractContinuumAgentAction.KEY_STORE, store);
map.put(AbstractContinuumAgentAction.KEY_PROJECT_ID, new Integer(project.getId()));
+ map.put(AbstractContinuumAction.KEY_PROJECT_ID, new Integer(project.getId()));
map.put(AbstractContinuumAgentAction.KEY_BUILD_DEFINITION_ID, new Integer(bd.getId()));
map.put(AbstractContinuumAgentAction.KEY_TRIGGER, new Integer(0));