You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ke...@apache.org on 2006/09/20 17:40:12 UTC
svn commit: r448240 - in /maven/continuum/branches/release-integration/continuum/continuum-release: ./ src/main/java/org/apache/maven/continuum/release/tasks/ src/test/java/org/apache/maven/continuum/release/executors/

Author: kenney
Date: Wed Sep 20 08:40:11 2006
New Revision: 448240

URL: http://svn.apache.org/viewvc?view=rev&rev=448240
Log:
merge r448221 from trunk - move target/test-classes scm-src to target/.


Modified:
    maven/continuum/branches/release-integration/continuum/continuum-release/pom.xml
    maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
    maven/continuum/branches/release-integration/continuum/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/pom.xml?view=diff&rev=448240&r1=448239&r2=448240
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/pom.xml (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/pom.xml Wed Sep 20 08:40:11 2006
@@ -38,7 +38,7 @@
     <testResources>
       <testResource>
         <directory>src/test/scm</directory>
-        <targetPath>scm-src</targetPath>
+        <targetPath>../scm-src</targetPath>
       </testResource>
     </testResources>
   </build>

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java?view=diff&rev=448240&r1=448239&r2=448240
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/AbstractReleaseProjectTask.java Wed Sep 20 08:40:11 2006
@@ -32,6 +32,8 @@
 
     private ReleaseManagerListener listener;
 
+    private long maxExecutionTime;
+
     public AbstractReleaseProjectTask( String releaseId, ReleaseDescriptor descriptor,
                                        ReleaseManagerListener listener )
     {
@@ -68,5 +70,15 @@
     public void setListener( ReleaseManagerListener listener )
     {
         this.listener = listener;
+    }
+
+    public long getMaxExecutionTime()
+    {
+         return maxExecutionTime;
+    }
+
+    public void setMaxExecutionTime( long maxTime )
+    {
+        this.maxExecutionTime = maxTime;
     }
 }

Modified: maven/continuum/branches/release-integration/continuum/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/release-integration/continuum/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java?view=diff&rev=448240&r1=448239&r2=448240
==============================================================================
--- maven/continuum/branches/release-integration/continuum/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java (original)
+++ maven/continuum/branches/release-integration/continuum/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java Wed Sep 20 08:40:11 2006
@@ -77,7 +77,7 @@
     public void testReleaseSimpleProject()
         throws Exception
     {
-        String scmPath = new File( getBasedir(), "target/test-classes/scm-src" ).getAbsolutePath().replace( '\\', '/' );
+        String scmPath = new File( getBasedir(), "target/scm-src" ).getAbsolutePath().replace( '\\', '/' );
         File workDir = new File( getBasedir(), "target/test-classes/work-dir" );
         FileUtils.deleteDirectory( workDir );
         File testDir = new File( getBasedir(), "target/test-classes/test-dir" );
@@ -111,7 +111,7 @@
     public void testReleaseSimpleProjectWithNextVersion()
         throws Exception
     {
-        String scmPath = new File( getBasedir(), "target/test-classes/scm-src" ).getAbsolutePath().replace( '\\', '/' );
+        String scmPath = new File( getBasedir(), "target/scm-src" ).getAbsolutePath().replace( '\\', '/' );
         File workDir = new File( getBasedir(), "target/test-classes/work-dir" );
         FileUtils.deleteDirectory( workDir );
         File testDir = new File( getBasedir(), "target/test-classes/test-dir" );