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/11/18 08:51:56 UTC
svn commit: r345469 - in /geronimo/gbuild/trunk/gbuild-agent/src:
main/java/org/apache/geronimo/gbuild/agent/
test/java/org/apache/geronimo/gbuild/agent/
Author: dblevins
Date: Thu Nov 17 23:51:44 2005
New Revision: 345469
URL: http://svn.apache.org/viewcvs?rev=345469&view=rev
Log:
Encapsulated the connection and run instances for better syncronization
Modified:
geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/AbstractContinuumBuildAgent.java
geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/BuildResultsContinuumAgent.java
geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgent.java
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/AbstractContinuumBuildAgent.java
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/AbstractContinuumBuildAgent.java?rev=345469&r1=345468&r2=345469&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/AbstractContinuumBuildAgent.java (original)
+++ geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/AbstractContinuumBuildAgent.java Thu Nov 17 23:51:44 2005
@@ -43,9 +43,9 @@
*/
protected String coordinatorUrl;
- protected boolean run;
+ private boolean run;
- protected Connection connection;
+ private Connection connection;
public synchronized void start() throws StartingException {
try {
@@ -121,5 +121,17 @@
} catch (Exception e) {
throw new BuildAgentException("Message.getObject failed on "+ message.getJMSMessageID(), e);
}
+ }
+
+ public void setRun(boolean run) {
+ this.run = run;
+ }
+
+ public Connection getConnection() {
+ return connection;
+ }
+
+ public void setConnection(Connection connection) {
+ this.connection = connection;
}
}
Modified: geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/BuildResultsContinuumAgent.java
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/BuildResultsContinuumAgent.java?rev=345469&r1=345468&r2=345469&view=diff
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/BuildResultsContinuumAgent.java (original)
+++ geronimo/gbuild/trunk/gbuild-agent/src/main/java/org/apache/geronimo/gbuild/agent/BuildResultsContinuumAgent.java Thu Nov 17 23:51:44 2005
@@ -45,13 +45,13 @@
getLogger().debug("buildResultsTopic " + buildResultsTopic);
// Create a Session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Session session = getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer resultsConsumer = createConsumer(session, buildResultsTopic);
getLogger().info("Continuum Build Agent started and waiting for work.");
- while (run) {
+ while (isRunning()) {
// Wait for a message
Message message = resultsConsumer.receive(1000);
@@ -62,7 +62,7 @@
} else if (message instanceof ObjectMessage) {
try {
- getLogger().info("Message Received "+ message.getJMSMessageID() +" on "+ connection.getClientID()+":"+buildResultsTopic);
+ getLogger().info("Message Received "+ message.getJMSMessageID() +" on "+ getConnection().getClientID()+":"+buildResultsTopic);
ObjectMessage objectMessage = (ObjectMessage) message;
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=345469&r1=345468&r2=345469&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 Thu Nov 17 23:51:44 2005
@@ -105,7 +105,7 @@
getLogger().debug("contributor "+contributor);
// Create a Session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Session session = getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer buildConsumer = createQueueConsumer(session, buildTaskQueue);
@@ -113,7 +113,7 @@
getLogger().info("Continuum Build Agent started and waiting for work.");
- while (run) {
+ while (isRunning()) {
// Wait for a message
Message message = buildConsumer.receive(1000);
@@ -124,7 +124,7 @@
} else if (message instanceof ObjectMessage) {
try {
- getLogger().info("Message Received "+ message.getJMSMessageID() +" on "+ connection.getClientID()+":"+buildTaskQueue);
+ getLogger().info("Message Received "+ message.getJMSMessageID() +" on "+ getConnection().getClientID()+":"+buildTaskQueue);
ObjectMessage objectMessage = (ObjectMessage) message;
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=345469&r1=345468&r2=345469&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 Thu Nov 17 23:51:44 2005
@@ -123,7 +123,7 @@
public void execute(Map def) throws Exception {
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Session session = getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue buildQueue = session.createQueue(buildTaskQueue);
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=345469&r1=345468&r2=345469&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 Thu Nov 17 23:51:44 2005
@@ -57,7 +57,7 @@
broker.stop();
}
- public void _testBuild() throws Exception {
+ public void testBuild() throws Exception {
Project project = new Project();
project.setId(10);
@@ -140,7 +140,6 @@
map.put(AbstractContinuumAgentAction.KEY_BUILD_DEFINITION_ID, new Integer(bd.getId()));
map.put(AbstractContinuumAgentAction.KEY_TRIGGER, new Integer(0));
- System.out.println("Sending " + goal);
producer.send(session.createObjectMessage(map));
}