continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r702321 - in /continuum/branches/continuum-1.2.x: 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/m...
Date Tue, 07 Oct 2008 01:43:49 GMT
Author: ctan
Date: Mon Oct  6 18:43:48 2008
New Revision: 702321

URL: http://svn.apache.org/viewvc?rev=702321&view=rev
Log:
[CONTINUUM-1572] use ContinuumPropertiesReleaseDescriptorStore in DefaultContinuumReleaseManager

Modified:
    continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
    continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
    continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
    continuum/branches/continuum-1.2.x/continuum-release/src/main/resources/META-INF/plexus/components.xml
    continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
    continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
    continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java

Modified: continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?rev=702321&r1=702320&r2=702321&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
(original)
+++ continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
Mon Oct  6 18:43:48 2008
@@ -295,10 +295,10 @@
         return descriptor;
     }
 
-    private ReleaseDescriptor readReleaseDescriptor( String workingDirectory )
+    private ContinuumReleaseDescriptor readReleaseDescriptor( String workingDirectory )
         throws ContinuumReleaseException
     {
-        ReleaseDescriptor descriptor = new ReleaseDescriptor();
+        ReleaseDescriptor descriptor = new ContinuumReleaseDescriptor();
         descriptor.setWorkingDirectory( workingDirectory );
 
         try
@@ -310,7 +310,7 @@
             throw new ContinuumReleaseException( "Failed to parse descriptor file.", e );
         }
 
-        return descriptor;
+        return (ContinuumReleaseDescriptor) descriptor;
     }
 
     public Map getListeners()

Modified: continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java?rev=702321&r1=702320&r2=702321&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
(original)
+++ continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
Mon Oct  6 18:43:48 2008
@@ -20,6 +20,7 @@
  */
 
 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/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java?rev=702321&r1=702320&r2=702321&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
(original)
+++ continuum/branches/continuum-1.2.x/continuum-release/src/main/java/org/apache/maven/continuum/release/tasks/PerformReleaseProjectTask.java
Mon Oct  6 18:43:48 2008
@@ -20,6 +20,7 @@
  */
 
 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/branches/continuum-1.2.x/continuum-release/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-release/src/main/resources/META-INF/plexus/components.xml?rev=702321&r1=702320&r2=702321&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-release/src/main/resources/META-INF/plexus/components.xml
(original)
+++ continuum/branches/continuum-1.2.x/continuum-release/src/main/resources/META-INF/plexus/components.xml
Mon Oct  6 18:43:48 2008
@@ -26,7 +26,7 @@
       <requirements>
         <requirement>
           <role>org.apache.maven.shared.release.config.ReleaseDescriptorStore</role>
-          <role-hint>properties</role-hint>
+          <role-hint>continuum-release-properties</role-hint>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.taskqueue.TaskQueue</role>

Modified: continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java?rev=702321&r1=702320&r2=702321&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
(original)
+++ continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
Mon Oct  6 18:43:48 2008
@@ -30,7 +30,6 @@
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.shared.release.ReleaseResult;
-import org.apache.maven.shared.release.config.ReleaseDescriptor;
 
 import java.io.File;
 import java.util.List;

Modified: continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java?rev=702321&r1=702320&r2=702321&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
(original)
+++ continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
Mon Oct  6 18:43:48 2008
@@ -19,6 +19,7 @@
  * 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;
@@ -84,7 +85,7 @@
         Map preparedReleases = releaseManager.getPreparedReleases();
         if ( preparedReleases.containsKey( releaseId ) )
         {
-            ReleaseDescriptor descriptor = (ReleaseDescriptor) preparedReleases.get( releaseId
);
+            ContinuumReleaseDescriptor descriptor = (ContinuumReleaseDescriptor) preparedReleases.get(
releaseId );
 
             preparedReleaseName = descriptor.getReleaseVersions().get( releaseId ).toString();
 

Modified: continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java?rev=702321&r1=702320&r2=702321&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java
(original)
+++ continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java
Mon Oct  6 18:43:48 2008
@@ -19,6 +19,7 @@
  * 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;
@@ -69,7 +70,7 @@
         Map preparedReleases = releaseManager.getPreparedReleases();
         if ( preparedReleases.containsKey( releaseId ) )
         {
-            ReleaseDescriptor descriptor = (ReleaseDescriptor) preparedReleases.get( releaseId
);
+            ContinuumReleaseDescriptor descriptor = (ContinuumReleaseDescriptor) preparedReleases.get(
releaseId );
 
             preparedReleaseName = descriptor.getReleaseVersions().get( releaseId ).toString();
 



Mime
View raw message