continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r702682 - in /continuum/trunk: continuum-release/src/main/java/org/apache/maven/continuum/release/ continuum-release/src/main/java/org/apache/maven/continuum/release/executors/ continuum-release/src/main/java/org/apache/maven/continuum/rele...
Date Wed, 08 Oct 2008 02:11:25 GMT
Author: ctan
Date: Tue Oct  7 19:11:24 2008
New Revision: 702682

URL: http://svn.apache.org/viewvc?rev=702682&view=rev
Log:
merge -r 702679:702680 from continuum-1.2.x branch
- removed unused import
- changed back to ReleaseDescriptor

Modified:
    continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
    continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
    continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?rev=702682&r1=702681&r2=702682&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
(original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
Tue Oct  7 19:11:24 2008
@@ -295,7 +295,7 @@
         return descriptor;
     }
 
-    private ContinuumReleaseDescriptor readReleaseDescriptor( String workingDirectory )
+    private ReleaseDescriptor readReleaseDescriptor( String workingDirectory )
         throws ContinuumReleaseException
     {
         ReleaseDescriptor descriptor = new ContinuumReleaseDescriptor();
@@ -310,7 +310,7 @@
             throw new ContinuumReleaseException( "Failed to parse descriptor file.", e );
         }
 
-        return (ContinuumReleaseDescriptor) descriptor;
+        return descriptor;
     }
 
     public Map getListeners()

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java?rev=702682&r1=702681&r2=702682&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
(original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
Tue Oct  7 19:11:24 2008
@@ -20,7 +20,6 @@
  */
 
 import org.apache.continuum.model.repository.LocalRepository;
-import org.apache.continuum.release.config.ContinuumReleaseDescriptor;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java?rev=702682&r1=702681&r2=702682&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
(original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
Tue Oct  7 19:11:24 2008
@@ -20,7 +20,6 @@
  */
 
 import org.apache.continuum.model.repository.LocalRepository;
-import org.apache.continuum.release.config.ContinuumReleaseDescriptor;
 import org.apache.maven.continuum.model.system.Profile;
 import org.apache.maven.shared.release.ReleaseManagerListener;
 import org.apache.maven.shared.release.config.ReleaseDescriptor;

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java?rev=702682&r1=702681&r2=702682&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
Tue Oct  7 19:11:24 2008
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.continuum.release.config.ContinuumReleaseDescriptor;
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
@@ -85,7 +84,7 @@
         Map preparedReleases = releaseManager.getPreparedReleases();
         if ( preparedReleases.containsKey( releaseId ) )
         {
-            ContinuumReleaseDescriptor descriptor = (ContinuumReleaseDescriptor) preparedReleases.get(
releaseId );
+            ReleaseDescriptor descriptor = (ReleaseDescriptor) preparedReleases.get( releaseId
);
 
             preparedReleaseName = descriptor.getReleaseVersions().get( releaseId ).toString();
 

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java?rev=702682&r1=702681&r2=702682&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java
Tue Oct  7 19:11:24 2008
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.continuum.release.config.ContinuumReleaseDescriptor;
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
@@ -70,7 +69,7 @@
         Map preparedReleases = releaseManager.getPreparedReleases();
         if ( preparedReleases.containsKey( releaseId ) )
         {
-            ContinuumReleaseDescriptor descriptor = (ContinuumReleaseDescriptor) preparedReleases.get(
releaseId );
+            ReleaseDescriptor descriptor = (ReleaseDescriptor) preparedReleases.get( releaseId
);
 
             preparedReleaseName = descriptor.getReleaseVersions().get( releaseId ).toString();
 



Mime
View raw message