Index: web/web.iml =================================================================== --- web/web.iml (revision 199) +++ web/web.iml Wed Mar 26 11:42:25 MSK 2008 @@ -210,6 +210,10 @@ + + + + @@ -504,10 +508,9 @@ jar://$MODULE_DIR$/../lib/commons-codec-1.3.jar!/ - + - jar://$MODULE_DIR$/../lib/log4j-1.2.12.jar!/ @@ -653,10 +656,6 @@ - - - - @@ -731,7 +730,6 @@ - @@ -744,6 +742,7 @@ + @@ -757,7 +756,6 @@ - @@ -791,11 +789,11 @@ - + Index: deprecated-progress/deprecated-progress.iml =================================================================== --- deprecated-progress/deprecated-progress.iml Thu Mar 20 11:48:59 MSK 2008 +++ deprecated-progress/deprecated-progress.iml Thu Mar 20 11:48:59 MSK 2008 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + Index: deprecated-progress/src/jetbrains/buildServer/serverSide/DeprecatedProgressMessagesSupport.java =================================================================== --- deprecated-progress/src/jetbrains/buildServer/serverSide/DeprecatedProgressMessagesSupport.java Thu Mar 20 11:58:52 MSK 2008 +++ deprecated-progress/src/jetbrains/buildServer/serverSide/DeprecatedProgressMessagesSupport.java Thu Mar 20 11:58:52 MSK 2008 @@ -0,0 +1,64 @@ +package jetbrains.buildServer.serverSide; + +import jetbrains.buildServer.messages.BuildMessage1; +import jetbrains.buildServer.messages.DefaultMessagesInfo; +import jetbrains.buildServer.messages.ServiceMessage; +import jetbrains.buildServer.util.EventDispatcher; +import org.jetbrains.annotations.NotNull; + +/** + * This class supports deprecated progress messages. + */ +public class DeprecatedProgressMessagesSupport extends BuildServerAdapter { + private static final String BLOCK_START_PREFIX = "##["; + private static final String BLOCK_END_PREFIX = "##]"; + private static final String MESSAGE_PREFIX = "##"; + + public DeprecatedProgressMessagesSupport(@NotNull final EventDispatcher dispatcher) { + dispatcher.addListener(this); + } + + public void messageReceived(final SRunningBuild build, final BuildMessage1 message) { + super.messageReceived(build, message); + if (message.getTypeId().equals(DefaultMessagesInfo.MSG_TEXT)) { + // skip new service messages + if (ServiceMessage.parse(message) != null) return; + + String text = (String)message.getValue(); + + if (text.startsWith(BLOCK_START_PREFIX)) { + progressStarted(build, message); + } + else if (text.startsWith(BLOCK_END_PREFIX)) { + progressFinished(build, message); + } + else if (text.startsWith(MESSAGE_PREFIX)) { + progressMessage(build, message); + } + } + } + + private void progressMessage(final SRunningBuild build, final BuildMessage1 message) { + String text = (String)message.getValue(); + BuildMessage1 progressMessage = DefaultMessagesInfo.createProgressMessage(text.substring(MESSAGE_PREFIX.length())); + logMessage(build, message, progressMessage); + } + + private void progressFinished(final SRunningBuild build, final BuildMessage1 message) { + BuildMessage1 progressMessage = DefaultMessagesInfo.createBlockEnd("", DefaultMessagesInfo.BLOCK_TYPE_PROGRESS); + logMessage(build, message, progressMessage); + } + + private void progressStarted(final SRunningBuild build, final BuildMessage1 message) { + String text = (String)message.getValue(); + final String activity = text.substring(BLOCK_START_PREFIX.length()); + BuildMessage1 progressMessage = DefaultMessagesInfo.createBlockStart(activity, DefaultMessagesInfo.BLOCK_TYPE_PROGRESS); + logMessage(build, message, progressMessage); + } + + private void logMessage(final SRunningBuild build, final BuildMessage1 message, final BuildMessage1 progressMessage) { + progressMessage.setTimestamp(message.getTimestamp()); // take timestamp from the original message + progressMessage.updateFlowInformation(message.getFlowId()); + build.addBuildMessage(progressMessage); + } +} Index: deprecated-progress/src/META-INF/build-server-plugin.xml =================================================================== --- deprecated-progress/src/META-INF/build-server-plugin.xml Thu Mar 20 11:46:22 MSK 2008 +++ deprecated-progress/src/META-INF/build-server-plugin.xml Thu Mar 20 11:46:22 MSK 2008 @@ -0,0 +1,6 @@ + + + + + +