continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From och...@apache.org
Subject svn commit: r734009 [4/8] - in /continuum/branches/continuum-parallel-builds: ./ continuum-api/src/main/java/org/apache/continuum/buildmanager/ continuum-api/src/main/java/org/apache/continuum/configuration/ continuum-api/src/main/java/org/apache/conti...
Date Tue, 13 Jan 2009 03:00:37 GMT
Modified: continuum/branches/continuum-parallel-builds/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java Mon Jan 12 18:58:46 2009
@@ -79,7 +79,7 @@
         executor.setChrootJailDirectory( chrootJailFile );
         executor.setShellCommandHelper( helper );
         executor.setWorkingDirectoryService( directoryService );
-        executor.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "" ) );
+        //executor.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "" ) );
 
         final Project project = new Project();
         project.setId( 7 );

Modified: continuum/branches/continuum-parallel-builds/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java Mon Jan 12 18:58:46 2009
@@ -44,7 +44,7 @@
     {
         super.setUp();
         builder = new ContinuumProjectBuilder();
-        builder.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "" ) );
+        //builder.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "" ) );
     }
 
     /**

Modified: continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/log4j.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/log4j.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/log4j.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/log4j.xml Mon Jan 12 18:58:46 2009
@@ -1,41 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<!-- ===================================================================== -->
-<!-- Log4j Configuration -->
-<!-- ===================================================================== -->
 
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
-  debug="false">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
 
   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-    <param name="Target" value="System.out"/>
     <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}.%M](%L) %m%n"/>
+      <param name="ConversionPattern" value="%d %-5p %c %x - %m%n"/>
     </layout>
   </appender>
 
   <!-- quiet spring loading :-) -->
-  <category name="org.springframework">
-    <priority value="ERROR"/>
-  </category>
-  <category name="org.codehaus.plexus">
-    <priority value="ERROR"/>
-  </category>
+  <logger name="org.springframework">
+    <level value="ERROR"/>
+  </logger>
+  <logger name="org.codehaus.plexus">
+    <level value="ERROR"/>
+  </logger>
   
-  <category name="org.apache.commons">
-    <priority value="ERROR"/>
-  </category>  
+  <logger name="org.apache.commons">
+    <level value="ERROR"/>
+  </logger>  
+  
+  <logger name="org.apache.maven.continuum.execution.maven.m2">
+    <level value="debug" />
+  </logger>
 
   <!-- JPOX -->
-  <category name="JPOX">
-    <priority value="WARN"/>
-  </category>
-  <category name="JPOX.RDBMS">
-    <priority value="ERROR"/>
-  </category>
+  <logger name="JPOX">
+    <level value="WARN"/>
+  </logger>
+  <logger name="JPOX.RDBMS">
+    <level value="ERROR"/>
+  </logger>
 
   <root>
-    <priority value="INFO"/>
+    <level value="INFO"/>
     <appender-ref ref="CONSOLE"/>
   </root>
 

Modified: continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml Mon Jan 12 18:58:46 2009
@@ -131,10 +131,6 @@
           <role-hint>memory</role-hint>
           <field-name>rbacManager</field-name>
         </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.PlexusContainer</role>
-          <field-name>container</field-name>
-        </requirement>
       </requirements>
     </component>
 

Modified: continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml Mon Jan 12 18:58:46 2009
@@ -64,5 +64,10 @@
       </configuration>
     </component>
 
+    <component>
+      <role>org.apache.maven.continuum.utils.ContinuumUrlValidator</role>
+      <role-hint>continuumUrl</role-hint>
+      <implementation>org.apache.maven.continuum.utils.ContinuumUrlValidator</implementation>
+    </component>
   </components>
 </plexus>

Modified: continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml Mon Jan 12 18:58:46 2009
@@ -85,5 +85,11 @@
         </properties>
       </configuration>
     </component>
+
+    <component>
+      <role>org.apache.maven.continuum.utils.ContinuumUrlValidator</role>
+      <role-hint>continuumUrl</role-hint>
+      <implementation>org.apache.maven.continuum.utils.ContinuumUrlValidator</implementation>
+    </component>
   </components>
 </plexus>

Modified: continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml Mon Jan 12 18:58:46 2009
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>continuum-parent</artifactId>

Modified: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementException.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementException.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementException.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementException.java Mon Jan 12 18:58:46 2009
@@ -21,6 +21,7 @@
 
 /**
  * Exception wrapper for application errors that can't be recovered from.
+ * @version $Id$
  */
 public class DataManagementException
     extends RuntimeException

Propchange: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementException.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementTool.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementTool.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementTool.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementTool.java Mon Jan 12 18:58:46 2009
@@ -24,6 +24,7 @@
 
 /**
  * Delegate to the correct data management tool.
+ * @version $Id$
  */
 public interface DataManagementTool
 {

Propchange: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementTool.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseFactoryConfigurator.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseFactoryConfigurator.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseFactoryConfigurator.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseFactoryConfigurator.java Mon Jan 12 18:58:46 2009
@@ -19,6 +19,10 @@
  * under the License.
  */
 
+/**
+ * 
+ * @version $Id$
+ */
 public interface DatabaseFactoryConfigurator
 {
     void configure( DatabaseParams params );

Propchange: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseFactoryConfigurator.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseParams.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseParams.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseParams.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseParams.java Mon Jan 12 18:58:46 2009
@@ -23,6 +23,7 @@
 
 /**
  * Bean for storing database parameters.
+ * @version $Id$
  */
 public class DatabaseParams
 {

Propchange: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseParams.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DataManagementCli.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DatabaseFormat.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DatabaseFormat.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DatabaseFormat.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DatabaseFormat.java Mon Jan 12 18:58:46 2009
@@ -21,6 +21,7 @@
 
 /**
  * Enumeration of known database formats.
+ * @version $Id$
  */
 public enum DatabaseFormat
 {

Propchange: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DatabaseFormat.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml Mon Jan 12 18:58:46 2009
@@ -16,7 +16,7 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-
+  <!-- $Id$ -->
 <plexus>
   <components>
     <component>

Propchange: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/DefaultDatabaseFactoryConfigurator.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/DefaultDatabaseFactoryConfigurator.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/DefaultDatabaseFactoryConfigurator.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/DefaultDatabaseFactoryConfigurator.java Mon Jan 12 18:58:46 2009
@@ -25,6 +25,7 @@
 import java.util.Properties;
 
 /**
+ * @version $Id$
  * @plexus.component role="org.apache.maven.continuum.management.DatabaseFactoryConfigurator" role-hint="continuum"
  */
 public class DefaultDatabaseFactoryConfigurator

Propchange: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/DefaultDatabaseFactoryConfigurator.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java Mon Jan 12 18:58:46 2009
@@ -46,7 +46,7 @@
 
 /**
  * JDO implementation the database management tool API.
- *
+ * @version $Id$
  * @plexus.component role="org.apache.maven.continuum.management.DataManagementTool" role-hint="continuum-jdo"
  */
 public class JdoDataManagementTool

Propchange: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/JdoDataManagementTool.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/LegacyJdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/LegacyJdoDataManagementTool.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/LegacyJdoDataManagementTool.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/LegacyJdoDataManagementTool.java Mon Jan 12 18:58:46 2009
@@ -66,7 +66,7 @@
 
 /**
  * JDO implementation the database management tool API.
- *
+ * @version $Id$
  * @plexus.component role="org.apache.maven.continuum.management.DataManagementTool" role-hint="legacy-continuum-jdo"
  */
 public class LegacyJdoDataManagementTool

Propchange: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-jdo/src/main/java/org/apache/maven/continuum/management/LegacyJdoDataManagementTool.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/DefaultDatabaseFactoryConfigurator.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/DefaultDatabaseFactoryConfigurator.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/DefaultDatabaseFactoryConfigurator.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/DefaultDatabaseFactoryConfigurator.java Mon Jan 12 18:58:46 2009
@@ -27,6 +27,7 @@
  */
 
 /**
+ * @version $Id$
  * @plexus.component role="org.apache.maven.continuum.management.DatabaseFactoryConfigurator" role-hint="redback"
  */
 public class DefaultDatabaseFactoryConfigurator

Propchange: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/DefaultDatabaseFactoryConfigurator.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/JdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/JdoDataManagementTool.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/JdoDataManagementTool.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/JdoDataManagementTool.java Mon Jan 12 18:58:46 2009
@@ -32,7 +32,7 @@
 
 /**
  * JDO implementation the database management tool API.
- *
+ * @version $Id$
  * @plexus.component role="org.apache.maven.continuum.management.DataManagementTool" role-hint="redback-jdo"
  */
 public class JdoDataManagementTool

Propchange: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/JdoDataManagementTool.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java Mon Jan 12 18:58:46 2009
@@ -65,7 +65,7 @@
 
 /**
  * JDO implementation the database management tool API.
- *
+ * @version $Id$
  * @plexus.component role="org.apache.maven.continuum.management.DataManagementTool" role-hint="legacy-redback-jdo"
  */
 public class LegacyJdoDataManagementTool

Propchange: continuum/branches/continuum-parallel-builds/continuum-data-management/data-management-redback-jdo/src/main/java/org/apache/maven/continuum/management/redback/LegacyJdoDataManagementTool.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-docs/src/site/apt/installation/upgrade.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-docs/src/site/apt/installation/upgrade.apt?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-docs/src/site/apt/installation/upgrade.apt (original)
+++ continuum/branches/continuum-parallel-builds/continuum-docs/src/site/apt/installation/upgrade.apt Mon Jan 12 18:58:46 2009
@@ -40,7 +40,7 @@
 
         * {{http://repo1.maven.org/maven2/org/apache/maven/continuum/data-management-cli/1.1/data-management-cli-1.1-app.jar}}
         
-        * {{http://repo1.maven.org/maven2/org/apache/maven/continuum/data-management-cli/1.2/data-management-cli-1.2-app.jar}}
+        * {{http://repo1.maven.org/maven2/org/apache/continuum/data-management-cli/1.2/data-management-cli-1.2-app.jar}}
 
     The first version of this tool is 1.1-beta-2
 

Modified: continuum/branches/continuum-parallel-builds/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt (original)
+++ continuum/branches/continuum-parallel-builds/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt Mon Jan 12 18:58:46 2009
@@ -32,7 +32,9 @@
 
   By default, Continuum adds each sub-module POM as an individual Continuum Project. If you want to add only the root POM without sub-modules, check the "load only root as recursive build" field.
   
-  You can choose a Build Definition Template which will be applied to your project.
+  You can choose a Build Definition Template which will be applied to your project.  If you choose a Build Definition
+  Template, the build definitions from the template will be added in addition to any build definitions that are defined
+  at the project group level.
 
 * {Maven 1 project}
     

Propchange: continuum/branches/continuum-parallel-builds/continuum-docs/src/site/xdoc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 18:58:46 2009
@@ -1,2 +1,2 @@
-/continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339
+/continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024,725845,726103,726239,726462
 /continuum/trunk/continuum-docs/src/site/xdoc:690494-690520

Modified: continuum/branches/continuum-parallel-builds/continuum-docs/src/site/xdoc/release-notes.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-docs/src/site/xdoc/release-notes.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-docs/src/site/xdoc/release-notes.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-docs/src/site/xdoc/release-notes.xml Mon Jan 12 18:58:46 2009
@@ -4,18 +4,23 @@
   </properties>  
 <body>
 
-  <h2>Apache Continuum 1.3.0 Release Notes</h2>
+  <h2>Apache Continuum 1.3.1 Release Notes</h2>
   
-  <p>The Apache Continuum team is pleased to announce Apache Continuum 1.3.0.</p>
+  <p>The Apache Continuum team is pleased to announce Apache Continuum 1.3.1.</p>
 
-  <p>Apache Continuum 1.3.0 includes the following new features:</p>
+  <p>As the first public release in the 1.3 series, Apache Continuum 1.3.1 includes the following new features:</p>
 
   <p><b>Transient State</b> -- Continuum now separates transient errors such as an unreachable scm system from build failures.</p>
 
   <p><b>Migration to Struts 2</b> -- The web framework underlying Continuum has been changed from WebWork to Struts 2.0.12.
     For more information on the S2 framework, visit <a href="http://struts.apache.org">http://struts.apache.org</a>.</p>
 
-  <h2>Release Notes - Continuum - Version 1.3.0</h2>
+  <p>To learn more about how the Continuum dev team versions releases, see our
+      <a href="http://continuum.apache.org/development/release.html">release guidelines</a>.</p>  
+
+  <h2>Release Notes - Continuum - Version 1.3.1</h2>    
+
+  <h2>Release Notes - Continuum - Version 1.3.0 (test build)</h2>
 
   <h2>        Improvement
   </h2>

Modified: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-api/pom.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-api/pom.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-api/pom.xml Mon Jan 12 18:58:46 2009
@@ -31,5 +31,13 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
 	</dependency>
+  <dependency>
+    <groupId>org.springframework</groupId>
+    <artifactId>spring-context-support</artifactId>
+  </dependency>      
+  <dependency>
+    <groupId>javax.annotation</groupId>
+    <artifactId>jsr250-api</artifactId>
+  </dependency>      	
   </dependencies>
 </project>

Propchange: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-api/pom.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java Mon Jan 12 18:58:46 2009
@@ -40,6 +40,8 @@
 
 import java.util.List;
 
+import javax.annotation.Resource;
+
 public abstract class AbstractContinuumNotifier
     implements Notifier
 {
@@ -49,29 +51,18 @@
 
     private Logger log = LoggerFactory.getLogger( getClass() );
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private ConfigurationService configurationService;
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private BuildResultDao buildResultDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private ProjectDao projectDao;
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private ProjectScmRootDao projectScmRootDao;
 
-    /**
-     * @plexus.configuration
-     */
     private boolean alwaysSend = false;
 
     protected String getBuildOutput( Project project, BuildResult buildResult )

Propchange: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-irc/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-irc/pom.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-irc/pom.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-irc/pom.xml Mon Jan 12 18:58:46 2009
@@ -37,21 +37,13 @@
       <artifactId>continuum-notifier-api</artifactId>
       <version>${pom.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+    </dependency>      
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+    </dependency>        
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate</id>
-            <goals>
-              <goal>descriptor</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 </project>

Modified: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java Mon Jan 12 18:58:46 2009
@@ -40,6 +40,7 @@
 import org.schwering.irc.lib.ssl.SSLIRCConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -47,13 +48,16 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Resource;
+
 /**
  * <b>This implementation assumes there aren't concurrent acces to the IRCConnection</b>
  *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.notification.Notifier" role-hint="irc"
+ * 
  */
+@Service("notifier#irc")
 public class IrcContinuumNotifier
     extends AbstractContinuumNotifier
     implements Disposable
@@ -64,15 +68,10 @@
     // Requirements
     // ----------------------------------------------------------------------
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private ConfigurationService configurationService;
 
-    /**
-     * @plexus.configuration default-value="6667"
-     */
-    private int defaultPort;
+    private int defaultPort = 6667;
 
     /**
      * key is upper(hostname) + port + upper(nick) + upper(alternateNick)

Modified: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-jabber/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-jabber/pom.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-jabber/pom.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-jabber/pom.xml Mon Jan 12 18:58:46 2009
@@ -33,6 +33,14 @@
       <version>${pom.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+    </dependency>      
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+    </dependency>     
+    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-jabber</artifactId>
       <version>1.0-alpha-4</version>

Modified: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java Mon Jan 12 18:58:46 2009
@@ -34,15 +34,19 @@
 import org.codehaus.plexus.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Resource;
+
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
  */
+@Service("notifier#jabber")
 public class JabberContinuumNotifier
     extends AbstractContinuumNotifier
 {
@@ -52,14 +56,10 @@
     // Requirements
     // ----------------------------------------------------------------------
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private JabberClient jabberClient;
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private ConfigurationService configurationService;
 
     // ----------------------------------------------------------------------

Modified: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-msn/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-msn/pom.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-msn/pom.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-msn/pom.xml Mon Jan 12 18:58:46 2009
@@ -43,5 +43,13 @@
       <artifactId>continuum-notifier-api</artifactId>
       <version>${pom.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+    </dependency>      
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+    </dependency>     
   </dependencies>
 </project>

Modified: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java Mon Jan 12 18:58:46 2009
@@ -34,15 +34,19 @@
 import org.codehaus.plexus.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Resource;
+
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
  */
+@Service("notifier#msn")
 public class MsnContinuumNotifier
     extends AbstractContinuumNotifier
 {
@@ -52,14 +56,10 @@
     // Requirements
     // ----------------------------------------------------------------------
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private MsnClient msnClient;
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private ConfigurationService configurationService;
 
     // ----------------------------------------------------------------------

Modified: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-wagon/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-wagon/pom.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-wagon/pom.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-wagon/pom.xml Mon Jan 12 18:58:46 2009
@@ -50,6 +50,14 @@
       <artifactId>plexus-component-api</artifactId>
     </dependency>    
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+    </dependency>      
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+    </dependency>     
+    <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-test</artifactId>
       <scope>test</scope>
@@ -83,17 +91,6 @@
           <argLine>-noverify</argLine>
         </configuration>    
       </plugin>		
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>descriptor</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

Propchange: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-wagon/pom.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java Mon Jan 12 18:58:46 2009
@@ -67,17 +67,20 @@
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Resource;
+
 /**
  * @author <a href="mailto:hisidro@exist.com">Henry Isidro</a>
  * @author <a href="mailto:nramirez@exist.com">Napoleon Esmundo C. Ramirez</a>
- * @plexus.component role="org.apache.maven.continuum.notification.Notifier" role-hint="wagon"
  */
+@Service("notifier#wagon")
 public class WagonContinuumNotifier
     extends AbstractContinuumNotifier
     implements Contextualizable
@@ -88,24 +91,16 @@
 
     private Logger log = LoggerFactory.getLogger( getClass() );
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private ConfigurationService configurationService;
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private WagonManager wagonManager;
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private MavenProjectBuilder projectBuilder;
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private MavenSettingsBuilder settingsBuilder;
 
     /**

Propchange: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/Context.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/Servlet.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/ServletServer.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/WagonContinuumNotifierTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java Mon Jan 12 18:58:46 2009
@@ -26,7 +26,8 @@
 import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
 import org.apache.continuum.purge.executor.DaysOldDirectoryPurgeExecutor;
 import org.apache.continuum.purge.executor.RetentionCountDirectoryPurgeExecutor;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * DirectoryPurgeController
@@ -35,9 +36,10 @@
  * @plexus.component role="org.apache.continuum.purge.controller.PurgeController" role-hint="purge-directory"
  */
 public class DirectoryPurgeController
-    extends AbstractLogEnabled
     implements PurgeController
 {
+    private Logger log = LoggerFactory.getLogger( DirectoryPurgeController.class );
+
     private ContinuumPurgeExecutor purgeExecutor;
 
     public void doPurge( String path )
@@ -48,7 +50,7 @@
         }
         catch ( ContinuumPurgeExecutorException e )
         {
-            getLogger().error( e.getMessage(), e );
+            log.error( e.getMessage(), e );
         }
     }
 

Modified: continuum/branches/continuum-parallel-builds/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java Mon Jan 12 18:58:46 2009
@@ -31,7 +31,8 @@
 import org.apache.continuum.purge.executor.ReleasedSnapshotsRepositoryPurgeExecutor;
 import org.apache.continuum.purge.executor.RetentionCountRepositoryPurgeExecutor;
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * DefaultPurgeController
@@ -40,9 +41,10 @@
  * @plexus.component role="org.apache.continuum.purge.controller.PurgeController" role-hint="purge-repository"
  */
 public class RepositoryPurgeController
-    extends AbstractLogEnabled
     implements PurgeController
 {
+    private Logger log = LoggerFactory.getLogger( RepositoryPurgeController.class );
+
     private ContinuumPurgeExecutor purgeExecutor;
 
     private ContinuumPurgeExecutor purgeReleasedSnapshotsExecutor;
@@ -106,7 +108,7 @@
         }
         catch ( ContinuumPurgeExecutorException e )
         {
-            getLogger().error( e.getMessage(), e );
+            log.error( e.getMessage(), e );
         }
     }
 }
\ No newline at end of file

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/pom.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumPropertiesReleaseDescriptorStore.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumReleaseDescriptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/continuum/release/config/ContinuumReleaseDescriptor.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/continuum/release/phase/AbstractContinuumRunGoalsPhase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPerformGoalsPhase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/continuum/release/phase/RunPrepareGoalsPhase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java Mon Jan 12 18:58:46 2009
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import org.apache.commons.lang.BooleanUtils;
 import org.apache.continuum.model.repository.LocalRepository;
 import org.apache.continuum.release.config.ContinuumReleaseDescriptor;
 import org.apache.maven.continuum.installation.InstallationService;
@@ -49,6 +50,7 @@
 /**
  * @author Jason van Zyl
  * @author Edwin Punzalan
+ * @version $Id$
  */
 public class DefaultContinuumReleaseManager
     implements ContinuumReleaseManager
@@ -269,6 +271,12 @@
         descriptor.setDevelopmentVersions( devVersions );
         descriptor.setPreparationGoals( releaseProperties.getProperty( "prepareGoals" ) );
         
+        String useEditMode = releaseProperties.getProperty( "useEditMode" );
+        if ( BooleanUtils.toBoolean( useEditMode ) )
+        {
+            descriptor.setScmUseEditMode( Boolean.valueOf( useEditMode ) );
+        } 
+        
         LocalRepository repository = project.getProjectGroup().getLocalRepository();
         
         if ( repository != null )

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java Mon Jan 12 18:58:46 2009
@@ -27,6 +27,7 @@
 
 /**
  * @author Edwin Punzalan
+ * @version $Id$
  */
 public class DefaultReleaseManagerListener
     implements ReleaseManagerListener, ContinuumReleaseManagerListener

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java Mon Jan 12 18:58:46 2009
@@ -34,6 +34,7 @@
 
 /**
  * @author Edwin Punzalan
+ * @version $Id$
  */
 public abstract class AbstractReleaseTaskExecutor
     implements ReleaseTaskExecutor

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/AbstractReleaseTaskExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java Mon Jan 12 18:58:46 2009
@@ -53,6 +53,7 @@
 
 /**
  * @author Edwin Punzalan
+ * @version $Id$
  */
 public class PerformReleaseTaskExecutor
     extends AbstractReleaseTaskExecutor

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java Mon Jan 12 18:58:46 2009
@@ -29,6 +29,7 @@
 
 /**
  * @author Edwin Punzalan
+ * @version $Id$
  */
 public class PrepareReleaseTaskExecutor
     extends AbstractReleaseTaskExecutor

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PrepareReleaseTaskExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutor.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutor.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutor.java Mon Jan 12 18:58:46 2009
@@ -23,6 +23,7 @@
 
 /**
  * @author Edwin Punzalan
+ * @version $Id$
  */
 public interface ReleaseTaskExecutor
     extends TaskExecutor

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutor.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/RollbackReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/RollbackReleaseTaskExecutor.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/RollbackReleaseTaskExecutor.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/RollbackReleaseTaskExecutor.java Mon Jan 12 18:58:46 2009
@@ -28,6 +28,7 @@
 
 /**
  * @author Edwin Punzalan
+ * @version $Id$
  */
 public class RollbackReleaseTaskExecutor
     extends AbstractReleaseTaskExecutor

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/RollbackReleaseTaskExecutor.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java Mon Jan 12 18:58:46 2009
@@ -57,6 +57,7 @@
  * Generate the reactor projects
  *
  * @author Edwin Punzalan
+ * @version $Id$
  */
 public class GenerateReactorProjectsPhase
     extends AbstractReleasePhase

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/GenerateReactorProjectsPhase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java Mon Jan 12 18:58:46 2009
@@ -44,6 +44,7 @@
  * Update working copy
  *
  * @author Edwin Punzalan
+ * @version $Id$
  */
 public class UpdateWorkingCopyPhase
     extends AbstractReleasePhase

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/phase/UpdateWorkingCopyPhase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java Mon Jan 12 18:58:46 2009
@@ -26,6 +26,7 @@
 
 /**
  * @author Edwin Punzalan
+ * @version $Id$
  */
 public abstract class AbstractReleaseProjectTask
     implements Task, ReleaseProjectTask

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java Mon Jan 12 18:58:46 2009
@@ -28,6 +28,7 @@
 
 /**
  * @author Edwin Punzalan
+ * @version $Id$
  */
 public class PerformReleaseProjectTask
     extends AbstractReleaseProjectTask

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java Mon Jan 12 18:58:46 2009
@@ -25,6 +25,7 @@
 
 /**
  * @author Edwin Punzalan
+ * @version $Id$
  */
 public class PrepareReleaseProjectTask
     extends AbstractReleaseProjectTask

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PrepareReleaseProjectTask.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/ReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/ReleaseProjectTask.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/ReleaseProjectTask.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/ReleaseProjectTask.java Mon Jan 12 18:58:46 2009
@@ -24,6 +24,7 @@
 
 /**
  * @author Edwin Punzalan
+ * @version $Id$
  */
 public interface ReleaseProjectTask
 {

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/ReleaseProjectTask.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java Mon Jan 12 18:58:46 2009
@@ -25,6 +25,7 @@
 
 /**
  * @author Edwin Punzalan
+ * @version $Id$
  */
 public class RollbackReleaseProjectTask
     extends AbstractReleaseProjectTask

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/RollbackReleaseProjectTask.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-reports/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-reports/pom.xml?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-reports/pom.xml (original)
+++ continuum/branches/continuum-parallel-builds/continuum-reports/pom.xml Mon Jan 12 18:58:46 2009
@@ -31,6 +31,14 @@
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+    </dependency>     
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+    </dependency>       
     <!-- Not needed for the moment
     <dependency>
       <groupId>org.apache.continuum</groupId>
@@ -43,20 +51,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate</id>
-            <goals>
-              <goal>descriptor</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 </project>

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/pom.xml
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-LF
+native

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/pom.xml
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/pom.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java?rev=734009&r1=734008&r2=734009&view=diff
==============================================================================
--- continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java (original)
+++ continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java Mon Jan 12 18:58:46 2009
@@ -23,8 +23,10 @@
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.util.DirectoryScanner;
+import org.springframework.stereotype.Service;
 import org.xml.sax.SAXException;
 
+import javax.annotation.Resource;
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.File;
 import java.io.IOException;
@@ -36,16 +38,14 @@
 /**
  * @author <a href="mailto:olamy@apache.org">olamy</a>
  * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.reports.surefire.ReportTestSuiteGenerator" role-hint="default"
  * @since 12 nov. 07
  */
+@Service("reportTestSuiteGenerator")
 public class DefaultReportTestSuiteGenerator
     implements ReportTestSuiteGenerator, Initializable
 {
 
-    /**
-     * @plexus.requirement
-     */
+    @Resource
     private ConfigurationService configurationService;
 
     private List<String> defaultIncludes;

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-LF
+native

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGenerator.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportFailure.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-LF
+native

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportFailure.java
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportFailure.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTest.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-LF
+native

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTest.java
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestCase.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-LF
+native

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestCase.java
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestResult.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-LF
+native

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestResult.java
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestResult.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuite.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-LF
+native

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuite.java
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuite.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuiteGenerator.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-LF
+native

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuiteGenerator.java
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuiteGenerator.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuiteGeneratorException.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-LF
+native

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuiteGeneratorException.java
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/main/java/org/apache/maven/continuum/reports/surefire/ReportTestSuiteGeneratorException.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/ConfigurationServiceMock.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-LF
+native

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jan 12 18:58:46 2009
@@ -1 +1 @@
-URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
+Author Date Id Revision

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/test/resources/continuum-core/TEST-org.apache.maven.continuum.DefaultContinuumTest.xml
            ('svn:executable' removed)

Propchange: continuum/branches/continuum-parallel-builds/continuum-reports/src/test/resources/continuum-core/TEST-org.apache.maven.continuum.TestAction.xml
            ('svn:executable' removed)



Mime
View raw message