continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From och...@apache.org
Subject svn commit: r775582 - in /continuum/branches/continuum-flat-multi-module: continuum-api/src/main/java/org/apache/continuum/taskqueue/ continuum-commons/src/test/java/org/apache/maven/continuum/utils/ continuum-core/src/main/java/org/apache/continuum/bu...
Date Sun, 17 May 2009 05:45:38 GMT
Author: oching
Date: Sun May 17 05:45:37 2009
New Revision: 775582

URL: http://svn.apache.org/viewvc?rev=775582&view=rev
Log:
o set default value for new field in continuum model
o variable refactoring

Modified:
    continuum/branches/continuum-flat-multi-module/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java
    continuum/branches/continuum-flat-multi-module/continuum-commons/src/test/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryServiceTest.java
    continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java
    continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
    continuum/branches/continuum-flat-multi-module/continuum-model/src/main/mdo/continuum.xml

Modified: continuum/branches/continuum-flat-multi-module/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java?rev=775582&r1=775581&r2=775582&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java
(original)
+++ continuum/branches/continuum-flat-multi-module/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java
Sun May 17 05:45:37 2009
@@ -44,10 +44,10 @@
     
     private final String scmRootUrl;
     
-    private final List<Project> projectsWithSimilarScmRoot;
+    private final List<Project> projectsWithCommonScmRoot;
 
     public CheckOutTask( int projectId, File workingDirectory, String projectName, String
scmUserName,
-                         String scmPassword, String scmRootUrl, List<Project> projectsWithSimilarScmRoot
)
+                         String scmPassword, String scmRootUrl, List<Project> projectsWithCommonScmRoot
)
     {
         this.projectId = projectId;
 
@@ -61,7 +61,7 @@
         
         this.scmRootUrl = scmRootUrl;
         
-        this.projectsWithSimilarScmRoot = projectsWithSimilarScmRoot;
+        this.projectsWithCommonScmRoot = projectsWithCommonScmRoot;
     }
 
     public int getProjectId()
@@ -106,8 +106,8 @@
         return scmRootUrl;
     }
 
-    public List<Project> getProjectsWithSimilarScmRoot()
+    public List<Project> getProjectsWithCommonScmRoot()
     {
-        return projectsWithSimilarScmRoot;
+        return projectsWithCommonScmRoot;
     }
 }

Modified: continuum/branches/continuum-flat-multi-module/continuum-commons/src/test/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryServiceTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-commons/src/test/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryServiceTest.java?rev=775582&r1=775581&r2=775582&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-commons/src/test/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryServiceTest.java
(original)
+++ continuum/branches/continuum-flat-multi-module/continuum-commons/src/test/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryServiceTest.java
Sun May 17 05:45:37 2009
@@ -25,7 +25,6 @@
 
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 import org.jmock.Expectations;
 import org.jmock.Mockery;

Modified: continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java?rev=775582&r1=775581&r2=775582&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java
(original)
+++ continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java
Sun May 17 05:45:37 2009
@@ -871,9 +871,9 @@
         {
             try
             {
-                BuildDefinition buildDefinition = buildDefinitionDao.getDefaultBuildDefinition(
task.getProjectId() );
+                BuildDefinition buildDefinition = buildDefinitionDao.getDefaultBuildDefinition(
task.getProjectId() );                
                 checkoutProject( task.getProjectId(), task.getProjectName(), task.getWorkingDirectory(),
-                                 null, task.getScmUserName(), task.getScmPassword(), buildDefinition,
null );
+                                 task.getScmRootUrl(), task.getScmUserName(), task.getScmPassword(),
buildDefinition, task.getProjectsWithCommonScmRoot() );
             }
             catch ( ContinuumStoreException e )
             {

Modified: continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java?rev=775582&r1=775581&r2=775582&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
(original)
+++ continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
Sun May 17 05:45:37 2009
@@ -95,7 +95,7 @@
 
         context.put( AbstractContinuumAction.KEY_PROJECT_SCM_ROOT_URL, task.getScmRootUrl()
);
 
-        context.put( AbstractContinuumAction.KEY_PROJECTS_IN_GROUP_WITH_COMMON_SCM_ROOT,
task.getProjectsWithSimilarScmRoot() );
+        context.put( AbstractContinuumAction.KEY_PROJECTS_IN_GROUP_WITH_COMMON_SCM_ROOT,
task.getProjectsWithCommonScmRoot() );
         
         try
         {

Modified: continuum/branches/continuum-flat-multi-module/continuum-model/src/main/mdo/continuum.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-model/src/main/mdo/continuum.xml?rev=775582&r1=775581&r2=775582&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-model/src/main/mdo/continuum.xml
(original)
+++ continuum/branches/continuum-flat-multi-module/continuum-model/src/main/mdo/continuum.xml
Sun May 17 05:45:37 2009
@@ -317,7 +317,7 @@
           <version>1.1.0+</version>
           <type>String</type>
         </field>
-        <field>
+        <field jpox.null-value="default">
           <name>checkedOutInSingleDirectory</name>
           <version>1.4.0+</version>
           <type>boolean</type>



Mime
View raw message