You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2005/07/08 19:13:26 UTC

svn commit: r209843 [1/2] - in /maven/continuum/trunk: ./ continuum-api/ continuum-api/src/main/java/org/apache/maven/continuum/ continuum-api/src/main/java/org/apache/maven/continuum/execution/ continuum-api/src/main/java/org/apache/maven/continuum/no...

Author: evenisse
Date: Fri Jul  8 10:13:22 2005
New Revision: 209843

URL: http://svn.apache.org/viewcvs?rev=209843&view=rev
Log:
Set more svn properties

Modified:
    maven/continuum/trunk/LICENSE.txt   (props changed)
    maven/continuum/trunk/NOTICE.txt   (props changed)
    maven/continuum/trunk/README.txt   (props changed)
    maven/continuum/trunk/build.bat   (contents, props changed)
    maven/continuum/trunk/build.sh   (props changed)
    maven/continuum/trunk/continuum-api/pom.xml   (props changed)
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java   (props changed)
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/ContinuumException.java   (props changed)
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java   (props changed)
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorException.java   (props changed)
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcher.java   (props changed)
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java   (props changed)
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuilder.java   (props changed)
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuilderException.java   (props changed)
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java   (props changed)
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java   (props changed)
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStoreException.java   (props changed)
    maven/continuum/trunk/continuum-cc/pom.xml   (props changed)
    maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java   (props changed)
    maven/continuum/trunk/continuum-cc/src/test/java/org/apache/maven/continuum/model/cc/CruiseControlTest.java   (props changed)
    maven/continuum/trunk/continuum-cc/src/test/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilderTest.java   (props changed)
    maven/continuum/trunk/continuum-core/design.apt   (props changed)
    maven/continuum/trunk/continuum-core/pom.xml   (props changed)
    maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml   (contents, props changed)
    maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java   (contents, props changed)
    maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml   (contents, props changed)
    maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java   (contents, props changed)
    maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml   (contents, props changed)
    maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java   (contents, props changed)
    maven/continuum/trunk/continuum-notifiers/pom.xml   (contents, props changed)
    maven/continuum/trunk/continuum-test-projects/ant-cc/src/main/java/Foo.java   (props changed)
    maven/continuum/trunk/continuum-test-projects/ant/src/main/java/Foo.java   (props changed)
    maven/continuum/trunk/continuum-test-projects/m1/src/main/java/Foo.java   (props changed)
    maven/continuum/trunk/continuum-test-projects/m2-modules/module-1/pom.xml   (props changed)
    maven/continuum/trunk/continuum-test-projects/m2-modules/module-1/src/main/java/Foo.java   (props changed)
    maven/continuum/trunk/continuum-test-projects/m2-modules/module-2/pom.xml   (props changed)
    maven/continuum/trunk/continuum-test-projects/m2-modules/module-2/src/main/java/Foo.java   (props changed)
    maven/continuum/trunk/continuum-test-projects/m2-modules/module-3/pom.xml   (props changed)
    maven/continuum/trunk/continuum-test-projects/m2-modules/module-3/src/main/java/Foo.java   (props changed)
    maven/continuum/trunk/continuum-test-projects/m2-modules/pom.xml   (props changed)
    maven/continuum/trunk/continuum-test-projects/m2-no-cim-element/pom.xml   (props changed)
    maven/continuum/trunk/continuum-test-projects/m2-no-cim-element/src/main/java/Foo.java   (props changed)
    maven/continuum/trunk/continuum-test-projects/m2-no-scm-element/pom.xml   (props changed)
    maven/continuum/trunk/continuum-test-projects/m2-no-scm-element/src/main/java/Foo.java   (props changed)
    maven/continuum/trunk/continuum-test-projects/m2/pom.xml   (props changed)
    maven/continuum/trunk/continuum-test-projects/m2/src/main/java/Foo.java   (props changed)
    maven/continuum/trunk/continuum-test-projects/shell/script.sh   (props changed)
    maven/continuum/trunk/continuum-test-projects/test.txt   (props changed)
    maven/continuum/trunk/continuum-web-test/slimdog.sh   (props changed)
    maven/continuum/trunk/continuum-web-test/src/main/test/c1-add-remove-ant-project.test   (props changed)
    maven/continuum/trunk/continuum-web-test/src/main/test/c1-add-remove-m1-project.test   (props changed)
    maven/continuum/trunk/continuum-web-test/src/main/test/c1-add-remove-m2-project.test   (props changed)
    maven/continuum/trunk/continuum-web-test/src/main/test/c1-add-remove-shell-project.test   (props changed)
    maven/continuum/trunk/continuum-web-test/src/main/test/c1-homepage.test   (props changed)
    maven/continuum/trunk/continuum-web/pom.xml   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Call.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/CallApplicationModel.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Login.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/DefaultViewContextPopulator.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/Scalar.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/View.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/ViewContextPopulator.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/ContinuumViewContextPopulatorValve.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/ContinuumViewContextValve.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/FormicaValve.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/LoginValve.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/CssTool.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/DateTool.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormToolException.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/SafePathValidator.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java   (props changed)
    maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties   (props changed)
    maven/continuum/trunk/notes.txt   (props changed)
    maven/continuum/trunk/pom.xml   (props changed)

Propchange: maven/continuum/trunk/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/continuum/trunk/build.bat
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/build.bat?rev=209843&r1=209842&r2=209843&view=diff
==============================================================================
--- maven/continuum/trunk/build.bat (original)
+++ maven/continuum/trunk/build.bat Fri Jul  8 10:13:22 2005
@@ -1,42 +1,42 @@
-@echo off
-@REM Decide how to startup depending on the version of windows
-
-@REM -- Win98ME
-if NOT "%OS%"=="Windows_NT" goto Win9xArg
-
-@REM -- 4NT shell
-if "%eval[2+2]" == "4" goto 4NTArgs
-
-@REM -- Regular WinNT shell
-set MAVEN_CMD_LINE_ARGS=%*
-goto endInit
-
-@REM The 4NT Shell from jp software
-:4NTArgs
-set MAVEN_CMD_LINE_ARGS=%$
-goto endInit
-
-:Win9xArg
-@REM Slurp the command line arguments.  This loop allows for an unlimited number
-@REM of agruments (up to the command line limit, anyway).
-set MAVEN_CMD_LINE_ARGS=
-:Win9xApp
-if %1a==a goto endInit
-set MAVEN_CMD_LINE_ARGS=%MAVEN_CMD_LINE_ARGS% %1
-shift
-goto Win9xApp
-
-@REM Reaching here means variables are defined and arguments have been captured
-:endInit
-
-SET INCLUDES=continuum-api/pom.xml,continuum-cc/pom.xml,continuum-core/pom.xml,continuum-model/pom.xml,continuum-notifiers/pom.xml,continuum-notifiers/continuum-notifier-irc/pom.xml,continuum-notifiers/continuum-notifier-jabber/pom.xml,continuum-notifiers/continuum-notifier-msn/pom.xml,continuum-web/pom.xml,continuum-xmlrpc/pom.xml
-
-call m2 -N install %MAVEN_CMD_LINE_ARGS%
-cd continuum-notifiers
-call m2 -N install %MAVEN_CMD_LINE_ARGS%
-cd ..
-call m2 -r -Dmaven.reactor.includes=*/pom.xml clean:clean %MAVEN_CMD_LINE_ARGS%
-call m2 -r -Dmaven.reactor.includes="%INCLUDES%" install %MAVEN_CMD_LINE_ARGS%
-cd continuum-plexus-application
-call build.bat %MAVEN_CMD_LINE_ARGS%
-cd ..
+@echo off
+@REM Decide how to startup depending on the version of windows
+
+@REM -- Win98ME
+if NOT "%OS%"=="Windows_NT" goto Win9xArg
+
+@REM -- 4NT shell
+if "%eval[2+2]" == "4" goto 4NTArgs
+
+@REM -- Regular WinNT shell
+set MAVEN_CMD_LINE_ARGS=%*
+goto endInit
+
+@REM The 4NT Shell from jp software
+:4NTArgs
+set MAVEN_CMD_LINE_ARGS=%$
+goto endInit
+
+:Win9xArg
+@REM Slurp the command line arguments.  This loop allows for an unlimited number
+@REM of agruments (up to the command line limit, anyway).
+set MAVEN_CMD_LINE_ARGS=
+:Win9xApp
+if %1a==a goto endInit
+set MAVEN_CMD_LINE_ARGS=%MAVEN_CMD_LINE_ARGS% %1
+shift
+goto Win9xApp
+
+@REM Reaching here means variables are defined and arguments have been captured
+:endInit
+
+SET INCLUDES=continuum-api/pom.xml,continuum-cc/pom.xml,continuum-core/pom.xml,continuum-model/pom.xml,continuum-notifiers/pom.xml,continuum-notifiers/continuum-notifier-irc/pom.xml,continuum-notifiers/continuum-notifier-jabber/pom.xml,continuum-notifiers/continuum-notifier-msn/pom.xml,continuum-web/pom.xml,continuum-xmlrpc/pom.xml
+
+call m2 -N install %MAVEN_CMD_LINE_ARGS%
+cd continuum-notifiers
+call m2 -N install %MAVEN_CMD_LINE_ARGS%
+cd ..
+call m2 -r -Dmaven.reactor.includes=*/pom.xml clean:clean %MAVEN_CMD_LINE_ARGS%
+call m2 -r -Dmaven.reactor.includes="%INCLUDES%" install %MAVEN_CMD_LINE_ARGS%
+cd continuum-plexus-application
+call build.bat %MAVEN_CMD_LINE_ARGS%
+cd ..

Propchange: maven/continuum/trunk/build.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/build.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/ContinuumException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuilderException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStoreException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-cc/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-cc/src/test/java/org/apache/maven/continuum/model/cc/CruiseControlTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-cc/src/test/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-core/design.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-core/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml?rev=209843&r1=209842&r2=209843&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml Fri Jul  8 10:13:22 2005
@@ -1,18 +1,18 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.maven.continuum</groupId>
-    <artifactId>continuum-parent-notifiers</artifactId>
-    <version>1.0-alpha-3-SNAPSHOT</version>
-  </parent>
-  <artifactId>continuum-notifier-irc</artifactId>
-  <name>Continuum IRC Notifier</name>
-  <version>1.0-alpha-3-SNAPSHOT</version>
-  <dependencies>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-ircbot</artifactId>
-      <version>1.1-alpha-4-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-</project>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.continuum</groupId>
+    <artifactId>continuum-parent-notifiers</artifactId>
+    <version>1.0-alpha-3-SNAPSHOT</version>
+  </parent>
+  <artifactId>continuum-notifier-irc</artifactId>
+  <name>Continuum IRC Notifier</name>
+  <version>1.0-alpha-3-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-ircbot</artifactId>
+      <version>1.1-alpha-4-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>

Propchange: maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java?rev=209843&r1=209842&r2=209843&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java Fri Jul  8 10:13:22 2005
@@ -1,253 +1,253 @@
-package org.apache.maven.continuum.notification.irc;
-
-/*
- * Copyright 2004-2005 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.
- */
-
-import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
-import org.apache.maven.continuum.project.ContinuumBuild;
-import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.project.ContinuumProjectState;
-import org.apache.maven.continuum.store.ContinuumStore;
-import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.codehaus.plexus.notification.NotificationException;
-import org.codehaus.plexus.notification.notifier.AbstractNotifier;
-import org.codehaus.plexus.ircbot.IrcBot;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- */
-public class IrcContinuumNotifier
-    extends AbstractNotifier
-{
-    // ----------------------------------------------------------------------
-    // Requirements
-    // ----------------------------------------------------------------------
-
-    /**
-     * @plexus.requirement
-     */
-    private ContinuumStore store;
-
-    /**
-     * @plexus.configuration
-     */
-    private IrcBot ircClient;
-
-    // ----------------------------------------------------------------------
-    // Notifier Implementation
-    // ----------------------------------------------------------------------
-
-    public void sendNotification( String source,
-                                  Set recipients,
-                                  Map configuration,
-                                  Map context )
-        throws NotificationException
-    {
-        ContinuumProject project = (ContinuumProject) context.get( ContinuumNotificationDispatcher.CONTEXT_PROJECT );
-
-        ContinuumBuild build = (ContinuumBuild) context.get( ContinuumNotificationDispatcher.CONTEXT_BUILD );
-
-        // ----------------------------------------------------------------------
-        // If there wasn't any building done, don't notify
-        // ----------------------------------------------------------------------
-
-        if ( build == null )
-        {
-            return;
-        }
-        // ----------------------------------------------------------------------
-        //
-        // ----------------------------------------------------------------------
-
-        /*
-        if ( recipients.size() == 0 )
-        {
-            getLogger().info( "No IRC recipients for '" + project.getName() + "'." );
-
-            return;
-        }
-        */
-
-        // ----------------------------------------------------------------------
-        // Generate and send message
-        // ----------------------------------------------------------------------
-
-        try
-        {
-            if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_BUILD_COMPLETE ) )
-            {
-                buildComplete( project, build, configuration );
-            }
-        }
-        catch ( ContinuumException e )
-        {
-            throw new NotificationException( "Error while notifiying.", e );
-        }
-    }
-
-    private void buildComplete( ContinuumProject project,
-                                ContinuumBuild build,
-                                Map configuration )
-        throws ContinuumException
-    {
-        // ----------------------------------------------------------------------
-        // Check if the message should be sent at all
-        // ----------------------------------------------------------------------
-
-        ContinuumBuild previousBuild = getPreviousBuild( project, build );
-
-        if ( !shouldNotify( build, previousBuild ) )
-        {
-            return;
-        }
-
-        // ----------------------------------------------------------------------
-        // Gather configuration values
-        // ----------------------------------------------------------------------
-
-        String host = (String) configuration.get( "host" );
-
-        int port = Integer.parseInt( (String) configuration.get( "port" ) );
-
-        String channel = (String) configuration.get( "channel" );
-
-        // ----------------------------------------------------------------------
-        // Send message
-        // ----------------------------------------------------------------------
-
-        ircClient.connect( host, port, "continuum" );
-
-        ircClient.logon();
-
-        ircClient.sendMessageToChannel( channel, generateMessage( project, build ) );
-
-        ircClient.logoff();
-
-        ircClient.disconnect();
-    }
-
-    private String generateMessage( ContinuumProject project, ContinuumBuild build )
-    {
-        int state = build.getState();
-
-        if ( state == ContinuumProjectState.OK )
-        {
-            return "BUILD SUCCESSFUL: " + project.getName();
-        }
-        else if ( state == ContinuumProjectState.FAILED )
-        {
-            return "BUILD FAILURE: " + project.getName();
-        }
-        else if ( state == ContinuumProjectState.ERROR )
-        {
-            return "BUILD ERROR: " + project.getName();
-        }
-        else
-        {
-            getLogger().warn( "Unknown build state " + build.getState() );
-
-            return "ERROR: Unknown build state " + build.getState();
-        }
-    }
-
-    private boolean shouldNotify( ContinuumBuild build, ContinuumBuild previousBuild )
-    {
-        if ( build == null )
-        {
-            return true;
-        }
-
-        // Always send if the project failed
-        if ( build.getState() == ContinuumProjectState.FAILED || build.getState() == ContinuumProjectState.ERROR )
-        {
-            return true;
-        }
-
-        // Send if this is the first build
-        if ( previousBuild == null )
-        {
-            return true;
-        }
-
-        // Send if the state has changed
-        getLogger().info(
-                          "Current build state: " + build.getState() + ", previous build state: "
-                              + previousBuild.getState() );
-
-        if ( build.getState() != previousBuild.getState() )
-        {
-            return true;
-        }
-
-        getLogger().info( "Same state, not sending message." );
-
-        return false;
-    }
-
-    private ContinuumBuild getPreviousBuild( ContinuumProject project, ContinuumBuild currentBuild )
-        throws ContinuumException
-    {
-        Collection builds;
-
-        try
-        {
-            builds = store.getBuildsForProject( project.getId(), 0, 0 );
-        }
-        catch ( ContinuumStoreException ex )
-        {
-            throw new ContinuumException( "Error while finding the last project build.", ex );
-        }
-
-        if ( builds.size() == 0 )
-        {
-            return null;
-        }
-
-        Iterator itr = builds.iterator();
-        ContinuumBuild build = (ContinuumBuild) itr.next();
-
-        if ( currentBuild != null && !build.getId().equals( currentBuild.getId() ) )
-        {
-            throw new ContinuumException( "INTERNAL ERROR: The current build wasn't the first in the build list. "
-                                          + "Current build: '" + currentBuild.getId() + "', " + "first build: '"
-                                          + build.getId() + "'." );
-        }
-
-        if ( !itr.hasNext() )
-        {
-            return null;
-        }
-
-        return (ContinuumBuild) itr.next();
-    }
-
-    /**
-     * @see org.codehaus.plexus.notification.notifier.Notifier#sendNotification(java.lang.String, java.util.Set, java.util.Properties)
-     */
-    public void sendNotification( String arg0, Set arg1, Properties arg2 )
-        throws NotificationException
-    {
-        throw new NotificationException( "Not implemented." );
-    }
-}
+package org.apache.maven.continuum.notification.irc;
+
+/*
+ * Copyright 2004-2005 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.
+ */
+
+import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
+import org.apache.maven.continuum.project.ContinuumBuild;
+import org.apache.maven.continuum.project.ContinuumProject;
+import org.apache.maven.continuum.project.ContinuumProjectState;
+import org.apache.maven.continuum.store.ContinuumStore;
+import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.notification.NotificationException;
+import org.codehaus.plexus.notification.notifier.AbstractNotifier;
+import org.codehaus.plexus.ircbot.IrcBot;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+public class IrcContinuumNotifier
+    extends AbstractNotifier
+{
+    // ----------------------------------------------------------------------
+    // Requirements
+    // ----------------------------------------------------------------------
+
+    /**
+     * @plexus.requirement
+     */
+    private ContinuumStore store;
+
+    /**
+     * @plexus.configuration
+     */
+    private IrcBot ircClient;
+
+    // ----------------------------------------------------------------------
+    // Notifier Implementation
+    // ----------------------------------------------------------------------
+
+    public void sendNotification( String source,
+                                  Set recipients,
+                                  Map configuration,
+                                  Map context )
+        throws NotificationException
+    {
+        ContinuumProject project = (ContinuumProject) context.get( ContinuumNotificationDispatcher.CONTEXT_PROJECT );
+
+        ContinuumBuild build = (ContinuumBuild) context.get( ContinuumNotificationDispatcher.CONTEXT_BUILD );
+
+        // ----------------------------------------------------------------------
+        // If there wasn't any building done, don't notify
+        // ----------------------------------------------------------------------
+
+        if ( build == null )
+        {
+            return;
+        }
+        // ----------------------------------------------------------------------
+        //
+        // ----------------------------------------------------------------------
+
+        /*
+        if ( recipients.size() == 0 )
+        {
+            getLogger().info( "No IRC recipients for '" + project.getName() + "'." );
+
+            return;
+        }
+        */
+
+        // ----------------------------------------------------------------------
+        // Generate and send message
+        // ----------------------------------------------------------------------
+
+        try
+        {
+            if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_BUILD_COMPLETE ) )
+            {
+                buildComplete( project, build, configuration );
+            }
+        }
+        catch ( ContinuumException e )
+        {
+            throw new NotificationException( "Error while notifiying.", e );
+        }
+    }
+
+    private void buildComplete( ContinuumProject project,
+                                ContinuumBuild build,
+                                Map configuration )
+        throws ContinuumException
+    {
+        // ----------------------------------------------------------------------
+        // Check if the message should be sent at all
+        // ----------------------------------------------------------------------
+
+        ContinuumBuild previousBuild = getPreviousBuild( project, build );
+
+        if ( !shouldNotify( build, previousBuild ) )
+        {
+            return;
+        }
+
+        // ----------------------------------------------------------------------
+        // Gather configuration values
+        // ----------------------------------------------------------------------
+
+        String host = (String) configuration.get( "host" );
+
+        int port = Integer.parseInt( (String) configuration.get( "port" ) );
+
+        String channel = (String) configuration.get( "channel" );
+
+        // ----------------------------------------------------------------------
+        // Send message
+        // ----------------------------------------------------------------------
+
+        ircClient.connect( host, port, "continuum" );
+
+        ircClient.logon();
+
+        ircClient.sendMessageToChannel( channel, generateMessage( project, build ) );
+
+        ircClient.logoff();
+
+        ircClient.disconnect();
+    }
+
+    private String generateMessage( ContinuumProject project, ContinuumBuild build )
+    {
+        int state = build.getState();
+
+        if ( state == ContinuumProjectState.OK )
+        {
+            return "BUILD SUCCESSFUL: " + project.getName();
+        }
+        else if ( state == ContinuumProjectState.FAILED )
+        {
+            return "BUILD FAILURE: " + project.getName();
+        }
+        else if ( state == ContinuumProjectState.ERROR )
+        {
+            return "BUILD ERROR: " + project.getName();
+        }
+        else
+        {
+            getLogger().warn( "Unknown build state " + build.getState() );
+
+            return "ERROR: Unknown build state " + build.getState();
+        }
+    }
+
+    private boolean shouldNotify( ContinuumBuild build, ContinuumBuild previousBuild )
+    {
+        if ( build == null )
+        {
+            return true;
+        }
+
+        // Always send if the project failed
+        if ( build.getState() == ContinuumProjectState.FAILED || build.getState() == ContinuumProjectState.ERROR )
+        {
+            return true;
+        }
+
+        // Send if this is the first build
+        if ( previousBuild == null )
+        {
+            return true;
+        }
+
+        // Send if the state has changed
+        getLogger().info(
+                          "Current build state: " + build.getState() + ", previous build state: "
+                              + previousBuild.getState() );
+
+        if ( build.getState() != previousBuild.getState() )
+        {
+            return true;
+        }
+
+        getLogger().info( "Same state, not sending message." );
+
+        return false;
+    }
+
+    private ContinuumBuild getPreviousBuild( ContinuumProject project, ContinuumBuild currentBuild )
+        throws ContinuumException
+    {
+        Collection builds;
+
+        try
+        {
+            builds = store.getBuildsForProject( project.getId(), 0, 0 );
+        }
+        catch ( ContinuumStoreException ex )
+        {
+            throw new ContinuumException( "Error while finding the last project build.", ex );
+        }
+
+        if ( builds.size() == 0 )
+        {
+            return null;
+        }
+
+        Iterator itr = builds.iterator();
+        ContinuumBuild build = (ContinuumBuild) itr.next();
+
+        if ( currentBuild != null && !build.getId().equals( currentBuild.getId() ) )
+        {
+            throw new ContinuumException( "INTERNAL ERROR: The current build wasn't the first in the build list. "
+                                          + "Current build: '" + currentBuild.getId() + "', " + "first build: '"
+                                          + build.getId() + "'." );
+        }
+
+        if ( !itr.hasNext() )
+        {
+            return null;
+        }
+
+        return (ContinuumBuild) itr.next();
+    }
+
+    /**
+     * @see org.codehaus.plexus.notification.notifier.Notifier#sendNotification(java.lang.String, java.util.Set, java.util.Properties)
+     */
+    public void sendNotification( String arg0, Set arg1, Properties arg2 )
+        throws NotificationException
+    {
+        throw new NotificationException( "Not implemented." );
+    }
+}

Propchange: maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml?rev=209843&r1=209842&r2=209843&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml Fri Jul  8 10:13:22 2005
@@ -1,18 +1,18 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.maven.continuum</groupId>
-    <artifactId>continuum-parent-notifiers</artifactId>
-    <version>1.0-alpha-3-SNAPSHOT</version>
-  </parent>
-  <artifactId>continuum-notifier-jabber</artifactId>
-  <name>Continuum Jabber Notifier</name>
-  <version>1.0-alpha-3-SNAPSHOT</version>
-  <dependencies>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-jabber</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-</project>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.continuum</groupId>
+    <artifactId>continuum-parent-notifiers</artifactId>
+    <version>1.0-alpha-3-SNAPSHOT</version>
+  </parent>
+  <artifactId>continuum-notifier-jabber</artifactId>
+  <name>Continuum Jabber Notifier</name>
+  <version>1.0-alpha-3-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-jabber</artifactId>
+      <version>1.0-alpha-1-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>

Propchange: maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java?rev=209843&r1=209842&r2=209843&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java Fri Jul  8 10:13:22 2005
@@ -1,312 +1,312 @@
-package org.apache.maven.continuum.notification.jabber;
-
-/*
- * Copyright 2004-2005 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.
- */
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
-import org.apache.maven.continuum.project.ContinuumBuild;
-import org.apache.maven.continuum.project.ContinuumProject;
-
-import org.codehaus.plexus.jabber.JabberClient;
-import org.codehaus.plexus.jabber.JabberClientException;
-import org.codehaus.plexus.notification.NotificationException;
-import org.codehaus.plexus.notification.notifier.AbstractNotifier;
-import org.codehaus.plexus.util.StringUtils;
-
-/**
- * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- */
-public class JabberContinuumNotifier
-    extends AbstractNotifier
-{
-    // ----------------------------------------------------------------------
-    // Requirements
-    // ----------------------------------------------------------------------
-
-    /**
-     * @plexus.requirement
-     */
-    private JabberClient jabberClient;
-
-    // ----------------------------------------------------------------------
-    // Configuration
-    // ----------------------------------------------------------------------
-
-    /**
-     * @plexus.configuration
-     */
-    private String fromAddress;
-
-    /**
-     * @plexus.configuration
-     */
-    private String fromPassword;
-
-    /**
-     * @plexus.configuration
-     */
-    private String host;
-
-    /**
-     * @plexus.configuration
-     */
-    private String port;
-
-    // ----------------------------------------------------------------------
-    // Notifier Implementation
-    // ----------------------------------------------------------------------
-
-    public void sendNotification( String source,
-                                  Set recipients,
-                                  Map configuration,
-                                  Map context )
-        throws NotificationException
-    {
-        ContinuumProject project = (ContinuumProject) context.get( ContinuumNotificationDispatcher.CONTEXT_PROJECT );
-
-        ContinuumBuild build = (ContinuumBuild) context.get( ContinuumNotificationDispatcher.CONTEXT_BUILD );
-
-        // ----------------------------------------------------------------------
-        //
-        // ----------------------------------------------------------------------
-
-        if ( recipients.size() == 0 )
-        {
-            getLogger().info( "No mail recipients for '" + project.getName() + "'." );
-
-            return;
-        }
-
-        // ----------------------------------------------------------------------
-        //
-        // ----------------------------------------------------------------------
-
-        if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_BUILD_STARTED ) )
-        {
-            buildStarted( project, recipients, configuration );
-        }
-        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_CHECKOUT_STARTED ) )
-        {
-            checkoutStarted( project, recipients, configuration );
-        }
-        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_CHECKOUT_COMPLETE ) )
-        {
-            checkoutComplete( project, recipients, configuration );
-        }
-        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_RUNNING_GOALS ) )
-        {
-            runningGoals( project, build, recipients, configuration );
-        }
-        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_GOALS_COMPLETED ) )
-        {
-            goalsCompleted( project, build, recipients, configuration );
-        }
-        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_BUILD_COMPLETE ) )
-        {
-            buildComplete( project, build, recipients, configuration );
-        }
-        else
-        {
-            getLogger().warn( "Unknown source: '" + source + "'." );
-        }
-    }
-
-    // ----------------------------------------------------------------------
-    //
-    // ----------------------------------------------------------------------
-
-    private void buildStarted( ContinuumProject project, Set recipients, Map configuration )
-        throws NotificationException
-    {
-        sendMessage( project, null, "Build started.", recipients, configuration );
-    }
-
-    private void checkoutStarted( ContinuumProject project, Set recipients, Map configuration )
-        throws NotificationException
-    {
-        sendMessage( project, null, "Checkout started.", recipients, configuration );
-    }
-
-    private void checkoutComplete( ContinuumProject project, Set recipients, Map configuration )
-        throws NotificationException
-    {
-        sendMessage( project, null, "Checkout complete.", recipients, configuration );
-    }
-
-    private void runningGoals( ContinuumProject project, ContinuumBuild build, Set recipients, Map configuration )
-        throws NotificationException
-    {
-        sendMessage( project, build, "Running goals.", recipients, configuration );
-    }
-
-    private void goalsCompleted( ContinuumProject project, ContinuumBuild build, Set recipients, Map configuration )
-        throws NotificationException
-    {
-        if ( build.getError() == null )
-        {
-            sendMessage( project, build, "Goals completed. state: " + build.getState(), recipients, configuration );
-        }
-        else
-        {
-            sendMessage( project, build, "Goals completed.", recipients, configuration );
-        }
-    }
-
-    private void buildComplete( ContinuumProject project, ContinuumBuild build, Set recipients, Map configuration )
-        throws NotificationException
-    {
-        if ( build.getError() == null )
-        {
-            sendMessage( project, build, "Build complete. state: " + build.getState(), recipients, configuration );
-        }
-        else
-        {
-            sendMessage( project, build, "Build complete.", recipients, configuration );
-        }
-    }
-
-    private void sendMessage( ContinuumProject project,
-                              ContinuumBuild build,
-                              String msg,
-                              Set recipients,
-                              Map configuration )
-        throws NotificationException
-    {
-        String message = "Build event for project '" + project.getName() + "':" + msg;
-
-        jabberClient.setHost( getHost( configuration ) );
-
-        if ( configuration.containsKey( "port" ) )
-        {
-            jabberClient.setPort( ( (Integer) configuration.get( "port" ) ).intValue() );
-        }
-
-        jabberClient.setUser( getUsername( configuration ) );
-
-        jabberClient.setPassword( getPassword( configuration ) );
-
-        try
-        {
-            jabberClient.connect();
-
-            jabberClient.logon();
-
-            for ( Iterator i = recipients.iterator(); i.hasNext(); )
-            {
-                String recipient = (String) i.next();
-
-                if ( isGroup( configuration ) )
-                {
-                    jabberClient.sendMessageToGroup( recipient, message );
-                }
-                else
-                {
-                    jabberClient.sendMessageToUser( recipient, message );
-                }
-            }
-        }
-        catch ( JabberClientException e )
-        {
-            throw new NotificationException( "Exception while sending message.", e );
-        }
-        finally
-        {
-            try
-            {
-                jabberClient.logoff();
-            }
-            catch ( JabberClientException e )
-            {
-
-            }
-        }
-    }
-
-    public void sendNotification( String arg0, Set arg1, Properties arg2 )
-        throws NotificationException
-    {
-        throw new NotificationException( "Not implemented." );
-    }
-
-    private String getHost( Map configuration )
-    {
-        if ( configuration.containsKey( "host" ) )
-        {
-            return (String) configuration.get( "host" );
-        }
-        else
-        {
-            if ( configuration.containsKey( "address" ) )
-            {
-                String username = (String) configuration.get( "address" );
-
-                if ( username.indexOf( "@" ) > 0 )
-                {
-                    return username.substring( username.indexOf( "@" ) + 1 );
-                }
-            }
-        }
-
-        return host;
-    }
-
-    private String getUsername( Map configuration )
-    {
-        if ( configuration.containsKey( "address" ) )
-        {
-            String username = (String) configuration.get( "address" );
-
-            if ( username.indexOf( "@" ) > 0 )
-            {
-                username = username.substring( 0, username.indexOf( "@" ) );
-            }
-
-            return username;
-        }
-
-        return fromAddress;
-    }
-
-    private String getPassword( Map configuration )
-    {
-        if ( configuration.containsKey( "password" ) )
-        {
-            String password = (String) configuration.get( "password" );
-
-            return password;
-        }
-
-        return fromPassword;
-    }
-
-    private boolean isGroup( Map configuration )
-    {
-        if ( configuration.containsKey( "isGroup" ) )
-        {
-            return ( (Boolean) configuration.get( "isGroup" ) ).booleanValue();
-        }
-        else
-        {
-            return false;
-        }
-    }
-}
+package org.apache.maven.continuum.notification.jabber;
+
+/*
+ * Copyright 2004-2005 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.
+ */
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
+import org.apache.maven.continuum.project.ContinuumBuild;
+import org.apache.maven.continuum.project.ContinuumProject;
+
+import org.codehaus.plexus.jabber.JabberClient;
+import org.codehaus.plexus.jabber.JabberClientException;
+import org.codehaus.plexus.notification.NotificationException;
+import org.codehaus.plexus.notification.notifier.AbstractNotifier;
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+public class JabberContinuumNotifier
+    extends AbstractNotifier
+{
+    // ----------------------------------------------------------------------
+    // Requirements
+    // ----------------------------------------------------------------------
+
+    /**
+     * @plexus.requirement
+     */
+    private JabberClient jabberClient;
+
+    // ----------------------------------------------------------------------
+    // Configuration
+    // ----------------------------------------------------------------------
+
+    /**
+     * @plexus.configuration
+     */
+    private String fromAddress;
+
+    /**
+     * @plexus.configuration
+     */
+    private String fromPassword;
+
+    /**
+     * @plexus.configuration
+     */
+    private String host;
+
+    /**
+     * @plexus.configuration
+     */
+    private String port;
+
+    // ----------------------------------------------------------------------
+    // Notifier Implementation
+    // ----------------------------------------------------------------------
+
+    public void sendNotification( String source,
+                                  Set recipients,
+                                  Map configuration,
+                                  Map context )
+        throws NotificationException
+    {
+        ContinuumProject project = (ContinuumProject) context.get( ContinuumNotificationDispatcher.CONTEXT_PROJECT );
+
+        ContinuumBuild build = (ContinuumBuild) context.get( ContinuumNotificationDispatcher.CONTEXT_BUILD );
+
+        // ----------------------------------------------------------------------
+        //
+        // ----------------------------------------------------------------------
+
+        if ( recipients.size() == 0 )
+        {
+            getLogger().info( "No mail recipients for '" + project.getName() + "'." );
+
+            return;
+        }
+
+        // ----------------------------------------------------------------------
+        //
+        // ----------------------------------------------------------------------
+
+        if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_BUILD_STARTED ) )
+        {
+            buildStarted( project, recipients, configuration );
+        }
+        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_CHECKOUT_STARTED ) )
+        {
+            checkoutStarted( project, recipients, configuration );
+        }
+        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_CHECKOUT_COMPLETE ) )
+        {
+            checkoutComplete( project, recipients, configuration );
+        }
+        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_RUNNING_GOALS ) )
+        {
+            runningGoals( project, build, recipients, configuration );
+        }
+        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_GOALS_COMPLETED ) )
+        {
+            goalsCompleted( project, build, recipients, configuration );
+        }
+        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_BUILD_COMPLETE ) )
+        {
+            buildComplete( project, build, recipients, configuration );
+        }
+        else
+        {
+            getLogger().warn( "Unknown source: '" + source + "'." );
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //
+    // ----------------------------------------------------------------------
+
+    private void buildStarted( ContinuumProject project, Set recipients, Map configuration )
+        throws NotificationException
+    {
+        sendMessage( project, null, "Build started.", recipients, configuration );
+    }
+
+    private void checkoutStarted( ContinuumProject project, Set recipients, Map configuration )
+        throws NotificationException
+    {
+        sendMessage( project, null, "Checkout started.", recipients, configuration );
+    }
+
+    private void checkoutComplete( ContinuumProject project, Set recipients, Map configuration )
+        throws NotificationException
+    {
+        sendMessage( project, null, "Checkout complete.", recipients, configuration );
+    }
+
+    private void runningGoals( ContinuumProject project, ContinuumBuild build, Set recipients, Map configuration )
+        throws NotificationException
+    {
+        sendMessage( project, build, "Running goals.", recipients, configuration );
+    }
+
+    private void goalsCompleted( ContinuumProject project, ContinuumBuild build, Set recipients, Map configuration )
+        throws NotificationException
+    {
+        if ( build.getError() == null )
+        {
+            sendMessage( project, build, "Goals completed. state: " + build.getState(), recipients, configuration );
+        }
+        else
+        {
+            sendMessage( project, build, "Goals completed.", recipients, configuration );
+        }
+    }
+
+    private void buildComplete( ContinuumProject project, ContinuumBuild build, Set recipients, Map configuration )
+        throws NotificationException
+    {
+        if ( build.getError() == null )
+        {
+            sendMessage( project, build, "Build complete. state: " + build.getState(), recipients, configuration );
+        }
+        else
+        {
+            sendMessage( project, build, "Build complete.", recipients, configuration );
+        }
+    }
+
+    private void sendMessage( ContinuumProject project,
+                              ContinuumBuild build,
+                              String msg,
+                              Set recipients,
+                              Map configuration )
+        throws NotificationException
+    {
+        String message = "Build event for project '" + project.getName() + "':" + msg;
+
+        jabberClient.setHost( getHost( configuration ) );
+
+        if ( configuration.containsKey( "port" ) )
+        {
+            jabberClient.setPort( ( (Integer) configuration.get( "port" ) ).intValue() );
+        }
+
+        jabberClient.setUser( getUsername( configuration ) );
+
+        jabberClient.setPassword( getPassword( configuration ) );
+
+        try
+        {
+            jabberClient.connect();
+
+            jabberClient.logon();
+
+            for ( Iterator i = recipients.iterator(); i.hasNext(); )
+            {
+                String recipient = (String) i.next();
+
+                if ( isGroup( configuration ) )
+                {
+                    jabberClient.sendMessageToGroup( recipient, message );
+                }
+                else
+                {
+                    jabberClient.sendMessageToUser( recipient, message );
+                }
+            }
+        }
+        catch ( JabberClientException e )
+        {
+            throw new NotificationException( "Exception while sending message.", e );
+        }
+        finally
+        {
+            try
+            {
+                jabberClient.logoff();
+            }
+            catch ( JabberClientException e )
+            {
+
+            }
+        }
+    }
+
+    public void sendNotification( String arg0, Set arg1, Properties arg2 )
+        throws NotificationException
+    {
+        throw new NotificationException( "Not implemented." );
+    }
+
+    private String getHost( Map configuration )
+    {
+        if ( configuration.containsKey( "host" ) )
+        {
+            return (String) configuration.get( "host" );
+        }
+        else
+        {
+            if ( configuration.containsKey( "address" ) )
+            {
+                String username = (String) configuration.get( "address" );
+
+                if ( username.indexOf( "@" ) > 0 )
+                {
+                    return username.substring( username.indexOf( "@" ) + 1 );
+                }
+            }
+        }
+
+        return host;
+    }
+
+    private String getUsername( Map configuration )
+    {
+        if ( configuration.containsKey( "address" ) )
+        {
+            String username = (String) configuration.get( "address" );
+
+            if ( username.indexOf( "@" ) > 0 )
+            {
+                username = username.substring( 0, username.indexOf( "@" ) );
+            }
+
+            return username;
+        }
+
+        return fromAddress;
+    }
+
+    private String getPassword( Map configuration )
+    {
+        if ( configuration.containsKey( "password" ) )
+        {
+            String password = (String) configuration.get( "password" );
+
+            return password;
+        }
+
+        return fromPassword;
+    }
+
+    private boolean isGroup( Map configuration )
+    {
+        if ( configuration.containsKey( "isGroup" ) )
+        {
+            return ( (Boolean) configuration.get( "isGroup" ) ).booleanValue();
+        }
+        else
+        {
+            return false;
+        }
+    }
+}

Propchange: maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml?rev=209843&r1=209842&r2=209843&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml Fri Jul  8 10:13:22 2005
@@ -1,18 +1,18 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.maven.continuum</groupId>
-    <artifactId>continuum-parent-notifiers</artifactId>
-    <version>1.0-alpha-3-SNAPSHOT</version>
-  </parent>
-  <artifactId>continuum-notifier-msn</artifactId>
-  <name>Continuum MSN Notifier</name>
-  <version>1.0-alpha-3-SNAPSHOT</version>
-  <dependencies>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-msn</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-</project>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.continuum</groupId>
+    <artifactId>continuum-parent-notifiers</artifactId>
+    <version>1.0-alpha-3-SNAPSHOT</version>
+  </parent>
+  <artifactId>continuum-notifier-msn</artifactId>
+  <name>Continuum MSN Notifier</name>
+  <version>1.0-alpha-3-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-msn</artifactId>
+      <version>1.0-alpha-1-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>

Propchange: maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java?rev=209843&r1=209842&r2=209843&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java Fri Jul  8 10:13:22 2005
@@ -1,259 +1,259 @@
-package org.apache.maven.continuum.notification.msn;
-
-/*
- * Copyright 2004-2005 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.
- */
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
-import org.apache.maven.continuum.project.ContinuumBuild;
-import org.apache.maven.continuum.project.ContinuumProject;
-
-import org.codehaus.plexus.msn.MsnClient;
-import org.codehaus.plexus.msn.MsnException;
-import org.codehaus.plexus.notification.NotificationException;
-import org.codehaus.plexus.notification.notifier.AbstractNotifier;
-import org.codehaus.plexus.util.StringUtils;
-
-/**
- * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
- * @version $Id$
- */
-public class MsnContinuumNotifier
-    extends AbstractNotifier
-{
-    // ----------------------------------------------------------------------
-    // Requirements
-    // ----------------------------------------------------------------------
-
-    /**
-     * @plexus.requirement
-     */
-    private MsnClient msnClient;
-
-    // ----------------------------------------------------------------------
-    // Configuration
-    // ----------------------------------------------------------------------
-
-    /**
-     * @plexus.configuration
-     */
-    private String fromAddress;
-
-    /**
-     * @plexus.configuration
-     */
-    private String fromPassword;
-
-    // ----------------------------------------------------------------------
-    //
-    // ----------------------------------------------------------------------
-
-    // ----------------------------------------------------------------------
-    // Notifier Implementation
-    // ----------------------------------------------------------------------
-
-    public void sendNotification( String source,
-                                  Set recipients,
-                                  Map configuration,
-                                  Map context )
-        throws NotificationException
-    {
-        ContinuumProject project = (ContinuumProject) context.get( ContinuumNotificationDispatcher.CONTEXT_PROJECT );
-
-        ContinuumBuild build = (ContinuumBuild) context.get( ContinuumNotificationDispatcher.CONTEXT_BUILD );
-
-        // ----------------------------------------------------------------------
-        //
-        // ----------------------------------------------------------------------
-
-        if ( recipients.size() == 0 )
-        {
-            getLogger().info( "No mail recipients for '" + project.getName() + "'." );
-
-            return;
-        }
-
-        // ----------------------------------------------------------------------
-        //
-        // ----------------------------------------------------------------------
-
-        if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_BUILD_STARTED ) )
-        {
-            buildStarted( project, recipients, configuration );
-        }
-        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_CHECKOUT_STARTED ) )
-        {
-            checkoutStarted( project, recipients, configuration );
-        }
-        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_CHECKOUT_COMPLETE ) )
-        {
-            checkoutComplete( project, recipients, configuration );
-        }
-        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_RUNNING_GOALS ) )
-        {
-            runningGoals( project, build, recipients, configuration );
-        }
-        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_GOALS_COMPLETED ) )
-        {
-            goalsCompleted( project, build, recipients, configuration );
-        }
-        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_BUILD_COMPLETE ) )
-        {
-            buildComplete( project, build, recipients, configuration );
-        }
-        else
-        {
-            getLogger().warn( "Unknown source: '" + source + "'." );
-        }
-    }
-
-    // ----------------------------------------------------------------------
-    //
-    // ----------------------------------------------------------------------
-
-    private void buildStarted( ContinuumProject project, Set recipients, Map configuration )
-        throws NotificationException
-    {
-        sendMessage( project, null, "Build started.", recipients, configuration );
-    }
-
-    private void checkoutStarted( ContinuumProject project, Set recipients, Map configuration )
-        throws NotificationException
-    {
-        sendMessage( project, null, "Checkout started.", recipients, configuration );
-    }
-
-    private void checkoutComplete( ContinuumProject project, Set recipients, Map configuration )
-        throws NotificationException
-    {
-        sendMessage( project, null, "Checkout complete.", recipients, configuration );
-    }
-
-    private void runningGoals( ContinuumProject project, ContinuumBuild build, Set recipients, Map configuration )
-        throws NotificationException
-    {
-        sendMessage( project, build, "Running goals.", recipients, configuration );
-    }
-
-    private void goalsCompleted( ContinuumProject project, ContinuumBuild build, Set recipients, Map configuration )
-        throws NotificationException
-    {
-        if ( build.getError() == null )
-        {
-            sendMessage( project, build, "Goals completed. state: " + build.getState(), recipients, configuration );
-        }
-        else
-        {
-            sendMessage( project, build, "Goals completed.", recipients, configuration );
-        }
-    }
-
-    private void buildComplete( ContinuumProject project, ContinuumBuild build, Set recipients, Map configuration )
-        throws NotificationException
-    {
-        if ( build.getError() == null )
-        {
-            sendMessage( project, build, "Build complete. state: " + build.getState(), recipients, configuration );
-        }
-        else
-        {
-            sendMessage( project, build, "Build complete.", recipients, configuration );
-        }
-    }
-
-    private void sendMessage( ContinuumProject project,
-                              ContinuumBuild build,
-                              String msg,
-                              Set recipients,
-                              Map configuration )
-        throws NotificationException
-    {
-        String message = "Build event for project '" + project.getName() + "':" + msg;
-
-        msnClient.setLogin( getUsername( configuration ) );
-
-        msnClient.setPassword( getPassword( configuration ) );
-
-        try
-        {
-            msnClient.login();
-
-            for ( Iterator i = recipients.iterator(); i.hasNext(); )
-            {
-                String recipient = (String) i.next();
-
-                msnClient.sendMessage( recipient, message );
-            }
-        }
-        catch ( MsnException e )
-        {
-            throw new NotificationException( "Exception while sending message.", e );
-        }
-        finally
-        {
-            try
-            {
-                msnClient.logout();
-            }
-            catch ( MsnException e )
-            {
-
-            }
-        }
-    }
-
-    /**
-     * @see org.codehaus.plexus.notification.notifier.Notifier#sendNotification(java.lang.String, java.util.Set, java.util.Properties)
-     */
-    public void sendNotification( String arg0, Set arg1, Properties arg2 )
-        throws NotificationException
-    {
-        throw new NotificationException( "Not implemented." );
-    }
-
-    private String getUsername( Map configuration )
-    {
-        if ( configuration.containsKey( "address" ) )
-        {
-            String username = (String) configuration.get( "address" );
-
-            if ( username.indexOf( "@" ) > 0 )
-            {
-                username = username.substring( 0, username.indexOf( "@" ) );
-            }
-
-            return username;
-        }
-
-        return fromAddress;
-    }
-
-    private String getPassword( Map configuration )
-    {
-        if ( configuration.containsKey( "password" ) )
-        {
-            String password = (String) configuration.get( "password" );
-
-            return password;
-        }
-
-        return fromPassword;
-    }
-}
+package org.apache.maven.continuum.notification.msn;
+
+/*
+ * Copyright 2004-2005 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.
+ */
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
+import org.apache.maven.continuum.project.ContinuumBuild;
+import org.apache.maven.continuum.project.ContinuumProject;
+
+import org.codehaus.plexus.msn.MsnClient;
+import org.codehaus.plexus.msn.MsnException;
+import org.codehaus.plexus.notification.NotificationException;
+import org.codehaus.plexus.notification.notifier.AbstractNotifier;
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+public class MsnContinuumNotifier
+    extends AbstractNotifier
+{
+    // ----------------------------------------------------------------------
+    // Requirements
+    // ----------------------------------------------------------------------
+
+    /**
+     * @plexus.requirement
+     */
+    private MsnClient msnClient;
+
+    // ----------------------------------------------------------------------
+    // Configuration
+    // ----------------------------------------------------------------------
+
+    /**
+     * @plexus.configuration
+     */
+    private String fromAddress;
+
+    /**
+     * @plexus.configuration
+     */
+    private String fromPassword;
+
+    // ----------------------------------------------------------------------
+    //
+    // ----------------------------------------------------------------------
+
+    // ----------------------------------------------------------------------
+    // Notifier Implementation
+    // ----------------------------------------------------------------------
+
+    public void sendNotification( String source,
+                                  Set recipients,
+                                  Map configuration,
+                                  Map context )
+        throws NotificationException
+    {
+        ContinuumProject project = (ContinuumProject) context.get( ContinuumNotificationDispatcher.CONTEXT_PROJECT );
+
+        ContinuumBuild build = (ContinuumBuild) context.get( ContinuumNotificationDispatcher.CONTEXT_BUILD );
+
+        // ----------------------------------------------------------------------
+        //
+        // ----------------------------------------------------------------------
+
+        if ( recipients.size() == 0 )
+        {
+            getLogger().info( "No mail recipients for '" + project.getName() + "'." );
+
+            return;
+        }
+
+        // ----------------------------------------------------------------------
+        //
+        // ----------------------------------------------------------------------
+
+        if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_BUILD_STARTED ) )
+        {
+            buildStarted( project, recipients, configuration );
+        }
+        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_CHECKOUT_STARTED ) )
+        {
+            checkoutStarted( project, recipients, configuration );
+        }
+        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_CHECKOUT_COMPLETE ) )
+        {
+            checkoutComplete( project, recipients, configuration );
+        }
+        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_RUNNING_GOALS ) )
+        {
+            runningGoals( project, build, recipients, configuration );
+        }
+        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_GOALS_COMPLETED ) )
+        {
+            goalsCompleted( project, build, recipients, configuration );
+        }
+        else if ( source.equals( ContinuumNotificationDispatcher.MESSAGE_ID_BUILD_COMPLETE ) )
+        {
+            buildComplete( project, build, recipients, configuration );
+        }
+        else
+        {
+            getLogger().warn( "Unknown source: '" + source + "'." );
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //
+    // ----------------------------------------------------------------------
+
+    private void buildStarted( ContinuumProject project, Set recipients, Map configuration )
+        throws NotificationException
+    {
+        sendMessage( project, null, "Build started.", recipients, configuration );
+    }
+
+    private void checkoutStarted( ContinuumProject project, Set recipients, Map configuration )
+        throws NotificationException
+    {
+        sendMessage( project, null, "Checkout started.", recipients, configuration );
+    }
+
+    private void checkoutComplete( ContinuumProject project, Set recipients, Map configuration )
+        throws NotificationException
+    {
+        sendMessage( project, null, "Checkout complete.", recipients, configuration );
+    }
+
+    private void runningGoals( ContinuumProject project, ContinuumBuild build, Set recipients, Map configuration )
+        throws NotificationException
+    {
+        sendMessage( project, build, "Running goals.", recipients, configuration );
+    }
+
+    private void goalsCompleted( ContinuumProject project, ContinuumBuild build, Set recipients, Map configuration )
+        throws NotificationException
+    {
+        if ( build.getError() == null )
+        {
+            sendMessage( project, build, "Goals completed. state: " + build.getState(), recipients, configuration );
+        }
+        else
+        {
+            sendMessage( project, build, "Goals completed.", recipients, configuration );
+        }
+    }
+
+    private void buildComplete( ContinuumProject project, ContinuumBuild build, Set recipients, Map configuration )
+        throws NotificationException
+    {
+        if ( build.getError() == null )
+        {
+            sendMessage( project, build, "Build complete. state: " + build.getState(), recipients, configuration );
+        }
+        else
+        {
+            sendMessage( project, build, "Build complete.", recipients, configuration );
+        }
+    }
+
+    private void sendMessage( ContinuumProject project,
+                              ContinuumBuild build,
+                              String msg,
+                              Set recipients,
+                              Map configuration )
+        throws NotificationException
+    {
+        String message = "Build event for project '" + project.getName() + "':" + msg;
+
+        msnClient.setLogin( getUsername( configuration ) );
+
+        msnClient.setPassword( getPassword( configuration ) );
+
+        try
+        {
+            msnClient.login();
+
+            for ( Iterator i = recipients.iterator(); i.hasNext(); )
+            {
+                String recipient = (String) i.next();
+
+                msnClient.sendMessage( recipient, message );
+            }
+        }
+        catch ( MsnException e )
+        {
+            throw new NotificationException( "Exception while sending message.", e );
+        }
+        finally
+        {
+            try
+            {
+                msnClient.logout();
+            }
+            catch ( MsnException e )
+            {
+
+            }
+        }
+    }
+
+    /**
+     * @see org.codehaus.plexus.notification.notifier.Notifier#sendNotification(java.lang.String, java.util.Set, java.util.Properties)
+     */
+    public void sendNotification( String arg0, Set arg1, Properties arg2 )
+        throws NotificationException
+    {
+        throw new NotificationException( "Not implemented." );
+    }
+
+    private String getUsername( Map configuration )
+    {
+        if ( configuration.containsKey( "address" ) )
+        {
+            String username = (String) configuration.get( "address" );
+
+            if ( username.indexOf( "@" ) > 0 )
+            {
+                username = username.substring( 0, username.indexOf( "@" ) );
+            }
+
+            return username;
+        }
+
+        return fromAddress;
+    }
+
+    private String getPassword( Map configuration )
+    {
+        if ( configuration.containsKey( "password" ) )
+        {
+            String password = (String) configuration.get( "password" );
+
+            return password;
+        }
+
+        return fromPassword;
+    }
+}

Propchange: maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/continuum/trunk/continuum-notifiers/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-notifiers/pom.xml?rev=209843&r1=209842&r2=209843&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/pom.xml (original)
+++ maven/continuum/trunk/continuum-notifiers/pom.xml Fri Jul  8 10:13:22 2005
@@ -1,29 +1,29 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.maven.continuum</groupId>
-    <artifactId>continuum-parent</artifactId>
-    <version>1.0</version>
-  </parent>
-  <artifactId>continuum-parent-notifiers</artifactId>
-  <name>Continuum Notifiers</name>
-  <packaging>pom</packaging>
-  <version>1.0-alpha-3-SNAPSHOT</version>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.continuum</groupId>
-      <artifactId>continuum-api</artifactId>
-      <version>1.0-alpha-3-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-notification</artifactId>
-      <version>1.0-alpha-4-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  <modules>
-    <module>continuum-notifier-irc</module>
-    <module>continuum-notifier-jabber</module>
-    <module>continuum-notifier-msn</module>
-  </modules>
-</project>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.continuum</groupId>
+    <artifactId>continuum-parent</artifactId>
+    <version>1.0</version>
+  </parent>
+  <artifactId>continuum-parent-notifiers</artifactId>
+  <name>Continuum Notifiers</name>
+  <packaging>pom</packaging>
+  <version>1.0-alpha-3-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.continuum</groupId>
+      <artifactId>continuum-api</artifactId>
+      <version>1.0-alpha-3-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-notification</artifactId>
+      <version>1.0-alpha-4-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+  <modules>
+    <module>continuum-notifier-irc</module>
+    <module>continuum-notifier-jabber</module>
+    <module>continuum-notifier-msn</module>
+  </modules>
+</project>

Propchange: maven/continuum/trunk/continuum-notifiers/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/ant-cc/src/main/java/Foo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/ant/src/main/java/Foo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/m1/src/main/java/Foo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/m2-modules/module-1/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/m2-modules/module-1/src/main/java/Foo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/m2-modules/module-2/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/m2-modules/module-2/src/main/java/Foo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/m2-modules/module-3/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/m2-modules/module-3/src/main/java/Foo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/m2-modules/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/m2-no-cim-element/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/m2-no-cim-element/src/main/java/Foo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/m2-no-scm-element/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/m2-no-scm-element/src/main/java/Foo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/m2/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/m2/src/main/java/Foo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/shell/script.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-test-projects/test.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-web-test/slimdog.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-web-test/src/main/test/c1-add-remove-ant-project.test
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-web-test/src/main/test/c1-add-remove-m1-project.test
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-web-test/src/main/test/c1-add-remove-m2-project.test
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-web-test/src/main/test/c1-add-remove-shell-project.test
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-web-test/src/main/test/c1-homepage.test
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-web/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Call.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/CallApplicationModel.java
------------------------------------------------------------------------------
    svn:eol-style = native