continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r232762 - in /maven/continuum/trunk: continuum-api/src/main/java/org/apache/maven/continuum/ continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/ continuum-core-it/src/test/java/org/apache/maven/continuum/it/ continuum-...
Date Mon, 15 Aug 2005 05:41:19 GMT
Author: brett
Date: Sun Aug 14 22:40:49 2005
New Revision: 232762

URL: http://svn.apache.org/viewcvs?rev=232762&view=rev
Log:
merge maven project into main project

Modified:
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
    maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java
    maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelper.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java
    maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java
    maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo
    maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml
    maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java

Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=232762&r1=232761&r2=232762&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
(original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
Sun Aug 14 22:40:49 2005
@@ -21,7 +21,6 @@
 import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.ContinuumBuildSettings;
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.project.MavenOneProject;
 import org.apache.maven.continuum.project.MavenTwoProject;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
@@ -118,15 +117,6 @@
     // ----------------------------------------------------------------------
 
     ContinuumProjectBuildingResult addMavenOneProject( String metadataUrl )
-        throws ContinuumException;
-
-    String addMavenOneProject( MavenOneProject project )
-        throws ContinuumException;
-
-    MavenOneProject getMavenOneProject( String id )
-        throws ContinuumException;
-
-    void updateMavenOneProject( MavenOneProject project )
         throws ContinuumException;
 
     // ----------------------------------------------------------------------

Modified: maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java?rev=232762&r1=232761&r2=232762&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java
(original)
+++ maven/continuum/trunk/continuum-cc/src/main/java/org/apache/maven/continuum/project/builder/cc/CruiseControlProjectBuilder.java
Sun Aug 14 22:40:49 2005
@@ -19,7 +19,6 @@
 import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.project.MavenOneProject;
 import org.apache.maven.continuum.project.builder.AbstractContinuumProjectBuilder;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuilderException;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
@@ -181,7 +180,7 @@
                         "A configuration can only have a single 'ant' or 'maven' schedule."
);
                 }
 
-                project = new MavenOneProject();
+                project = new ContinuumProject();
 
                 project.setExecutorId( ContinuumBuildExecutor.MAVEN_ONE_EXECUTOR_ID );
             }

Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java?rev=232762&r1=232761&r2=232762&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java
(original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ContinuumXmlRpcClient.java
Sun Aug 14 22:40:49 2005
@@ -22,7 +22,6 @@
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.project.MavenOneProject;
 import org.apache.maven.continuum.project.MavenTwoProject;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.apache.maven.continuum.xmlrpc.XmlRpcHelper;
@@ -223,28 +222,6 @@
         return (ContinuumProjectBuildingResult) invoke( "addMavenOneProject", new Object[]{metadataUrl,},
                                                         ContinuumProjectBuildingResult.class
);
     }
-
-    public String addMavenOneProject( MavenOneProject mavenOneProject )
-        throws ContinuumException
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    public MavenOneProject getMavenOneProject( String s )
-        throws ContinuumException
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    public void updateMavenOneProject( MavenOneProject mavenOneProject )
-        throws ContinuumException
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    // ----------------------------------------------------------------------
-    // Ant Projects
-    // ----------------------------------------------------------------------
 
     // ----------------------------------------------------------------------
     // Notification

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=232762&r1=232761&r2=232762&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Sun Aug 14 22:40:49 2005
@@ -36,7 +36,6 @@
 import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.ContinuumBuildSettings;
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.project.MavenOneProject;
 import org.apache.maven.continuum.project.MavenTwoProject;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.apache.maven.continuum.project.builder.maven.MavenOneContinuumProjectBuilder;
@@ -339,14 +338,6 @@
     }
 
     // ----------------------------------------------------------------------
-    // Build inforation
-    // ----------------------------------------------------------------------
-
-    // ----------------------------------------------------------------------
-    // Ant Projects
-    // ----------------------------------------------------------------------
-
-    // ----------------------------------------------------------------------
     // Maven 1.x projects
     // ----------------------------------------------------------------------
 
@@ -355,26 +346,6 @@
     {
         return executeAddProjectsFromMetadataActivity( metadataUrl, MavenOneContinuumProjectBuilder.ID,
                                                        MavenOneBuildExecutor.ID );
-    }
-
-    public String addMavenOneProject( MavenOneProject project )
-        throws ContinuumException
-    {
-        project.setExecutorId( MavenOneBuildExecutor.ID );
-
-        return executeAddProjectFromScmActivity( project );
-    }
-
-    public MavenOneProject getMavenOneProject( String projectId )
-        throws ContinuumException
-    {
-        return (MavenOneProject) getProject( projectId );
-    }
-
-    public void updateMavenOneProject( MavenOneProject project )
-        throws ContinuumException
-    {
-        updateProject( (ContinuumProject) project );
     }
 
     // ----------------------------------------------------------------------

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java?rev=232762&r1=232761&r2=232762&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
Sun Aug 14 22:40:49 2005
@@ -18,7 +18,7 @@
 
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.notification.ContinuumRecipientSource;
-import org.apache.maven.continuum.project.MavenOneProject;
+import org.apache.maven.continuum.project.ContinuumProject;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -43,7 +43,7 @@
     // MavenOneMetadataHelper Implementation
     // ----------------------------------------------------------------------
 
-    public void mapMetadata( File metadata, MavenOneProject project )
+    public void mapMetadata( File metadata, ContinuumProject project )
         throws MavenOneMetadataHelperException
     {
         Xpp3Dom mavenProject;
@@ -222,12 +222,6 @@
             }
 
             notifiers.add( notifier );
-        }
-
-        // Goals
-        if ( StringUtils.isEmpty( project.getGoals() ) )
-        {
-            project.setGoals( "clean:clean jar:install" );
         }
 
         // ----------------------------------------------------------------------

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java?rev=232762&r1=232761&r2=232762&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
Sun Aug 14 22:40:49 2005
@@ -22,7 +22,6 @@
 import org.apache.maven.continuum.execution.ContinuumBuildExecutorException;
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.project.MavenOneProject;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
@@ -57,22 +56,18 @@
     // Builder Implementation
     // ----------------------------------------------------------------------
 
-    public ContinuumBuildExecutionResult build( ContinuumProject p, File buildOutput )
-        throws ContinuumBuildExecutorException
-    {
-        MavenOneProject project = (MavenOneProject) p;
-
-        String commandLine = StringUtils.clean( project.getCommandLineArguments() ) + " "
+
-            StringUtils.clean( project.getGoals() );
-
-        return executeShellCommand( project, null, commandLine, buildOutput );
-    }
-
     public ContinuumBuildExecutionResult build( ContinuumProject project, BuildDefinition
buildDefinition,
                                                 File buildOutput )
         throws ContinuumBuildExecutorException
     {
-        return build( project, buildOutput );
+        // TODO: get from installation
+//        String executable = project.getExecutable();
+        String executable = "maven";
+
+        String arguments = StringUtils.clean( buildDefinition.getArguments() ) + " " +
+            StringUtils.clean( buildDefinition.getGoals() );
+
+        return executeShellCommand( project, executable, arguments, buildOutput );
     }
 
     public void updateProjectFromCheckOut( File workingDirectory, ContinuumProject project
)
@@ -87,7 +82,7 @@
 
         try
         {
-            metadataHelper.mapMetadata( projectXmlFile, (MavenOneProject) project );
+            metadataHelper.mapMetadata( projectXmlFile, project );
         }
         catch ( MavenOneMetadataHelperException e )
         {

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelper.java?rev=232762&r1=232761&r2=232762&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelper.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelper.java
Sun Aug 14 22:40:49 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import org.apache.maven.continuum.project.MavenOneProject;
+import org.apache.maven.continuum.project.ContinuumProject;
 
 import java.io.File;
 
@@ -28,6 +28,6 @@
 {
     String ROLE = MavenOneMetadataHelper.class.getName();
 
-    void mapMetadata( File metadata, MavenOneProject project )
+    void mapMetadata( File metadata, ContinuumProject project )
         throws MavenOneMetadataHelperException;
 }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java?rev=232762&r1=232761&r2=232762&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
Sun Aug 14 22:40:49 2005
@@ -20,7 +20,7 @@
 import org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelper;
 import org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelperException;
 import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.apache.maven.continuum.project.MavenOneProject;
+import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.builder.AbstractContinuumProjectBuilder;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
@@ -67,11 +67,9 @@
             return result;
         }
 
-        MavenOneProject project;
-
         try
         {
-            project = new MavenOneProject();
+            ContinuumProject project = new ContinuumProject();
 
             metadataHelper.mapMetadata( pomFile, project );
 

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java?rev=232762&r1=232761&r2=232762&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java
(original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java
Sun Aug 14 22:40:49 2005
@@ -19,7 +19,7 @@
 import org.apache.maven.continuum.AbstractContinuumTest;
 import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
-import org.apache.maven.continuum.project.MavenOneProject;
+import org.apache.maven.continuum.project.ContinuumProject;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
@@ -61,7 +61,7 @@
         // Make the "existing" project
         // ----------------------------------------------------------------------
 
-        MavenOneProject project = new MavenOneProject();
+        ContinuumProject project = new ContinuumProject();
 
         project.setName( "Maven" );
 
@@ -87,8 +87,6 @@
 
         project.setVersion( "1.1-SNAPSHOT" );
 
-        project.setGoals( "clean:clean jar:install" );
-
         // ----------------------------------------------------------------------
         //
         // ----------------------------------------------------------------------
@@ -110,7 +108,5 @@
         assertEquals( "dev@maven.apache.org", actualNotifier.getConfiguration().get( "address"
) );
 
         assertEquals( "1.1-SNAPSHOT", project.getVersion() );
-
-        assertEquals( "clean:clean jar:install", project.getGoals() );
     }
 }

Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java?rev=232762&r1=232761&r2=232762&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java
(original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java
Sun Aug 14 22:40:49 2005
@@ -17,7 +17,7 @@
  */
 
 import org.apache.maven.continuum.model.project.ProjectNotifier;
-import org.apache.maven.continuum.project.MavenOneProject;
+import org.apache.maven.continuum.project.ContinuumProject;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.codehaus.plexus.PlexusTestCase;
@@ -55,7 +55,7 @@
 
         assertEquals( "result.projects.length", 1, result.getProjects().size() );
 
-        MavenOneProject project = (MavenOneProject) result.getProjects().get( 0 );
+        ContinuumProject project = (ContinuumProject) result.getProjects().get( 0 );
 
         assertNotNull( project );
 
@@ -70,7 +70,5 @@
         assertEquals( "dev@maven.apache.org", notifier.getConfiguration().get( "address"
) );
 
         assertEquals( "1.1-SNAPSHOT", project.getVersion() );
-
-        assertEquals( "clean:clean jar:install", project.getGoals() );
     }
 }

Modified: maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo?rev=232762&r1=232761&r2=232762&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo Sun Aug
14 22:40:49 2005
@@ -68,14 +68,6 @@
         <column name="M2_GOALS"/>
       </field>
     </class>
-    <class name="MavenOneProject" persistence-capable-superclass="org.apache.maven.continuum.project.ContinuumProject"
-           detachable="true">
-      <inheritance strategy="new-table"/>
-      <field name="commandLineArguments" persistence-modifier="persistent"/>
-      <field name="goals" persistence-modifier="persistent">
-        <column name="M1_GOALS"/>
-      </field>
-    </class>
     <class name="ContinuumBuildSettings" detachable="true">
       <field name="name" persistence-modifier="persistent"/>
       <field name="cronExpression" persistence-modifier="persistent"/>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml?rev=232762&r1=232761&r2=232762&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml Sun Aug
14 22:40:49 2005
@@ -1,20 +1,22 @@
 <form>
   <extend>continuumProject</extend>
   <id>maven-1Project</id>
-  <target-class>org.apache.maven.continuum.project.MavenOneProject</target-class>
-  <lookup-expression>getMavenOneProject(#id)</lookup-expression>
+  <target-class>org.apache.maven.continuum.project.ContinuumProject</target-class>
+  <lookup-expression>getProject(#id)</lookup-expression>
   <elements>
-    <element>
-      <id>project.goals</id>
-      <validators>
-        <validator>
-          <id>required</id>
-          <error-message-key>project.goals.error</error-message-key>
-        </validator>
-      </validators>
-      <expression>goals</expression>
-      <type>text</type>
-    </element>
+    <!-- TODO - build definition
+        <element>
+          <id>project.goals</id>
+          <validators>
+            <validator>
+              <id>required</id>
+              <error-message-key>project.goals.error</error-message-key>
+            </validator>
+          </validators>
+          <expression>goals</expression>
+          <type>text</type>
+        </element>
+    -->
   </elements>
 
   <!-- Add -->
@@ -23,17 +25,7 @@
     <action>addEntity</action>
     <view>Summary.vm</view>
     <view-on-failure>Add.vm</view-on-failure>
-    <fid-on-failure>maven-1Project</fid-on-failure>        
-    <expression>addMavenOneProject(#entity)</expression>
+    <fid-on-failure>maven-1Project</fid-on-failure>
+    <expression>addProject(#entity,"maven-one")</expression>
   </add>
-
-  <!-- Update -->
-  <update>
-    <title-key>project.title.update</title-key>
-    <action>updateEntity</action>
-    <view>Summary.vm</view>
-    <view-on-failure>Edit.vm</view-on-failure>
-    <expression>updateMavenOneProject(#entity)</expression>
-  </update>
-
 </form>

Modified: maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java?rev=232762&r1=232761&r2=232762&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java
(original)
+++ maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java
Sun Aug 14 22:40:49 2005
@@ -17,10 +17,10 @@
  */
 
 import org.apache.maven.continuum.Continuum;
+import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
 import org.apache.maven.continuum.execution.shell.ShellBuildExecutor;
 import org.apache.maven.continuum.model.scm.ScmResult;
 import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.project.MavenOneProject;
 import org.apache.maven.continuum.project.MavenTwoProject;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -245,11 +245,11 @@
     {
         try
         {
-            MavenOneProject project = new MavenOneProject();
+            ContinuumProject project = new ContinuumProject();
 
             xmlRpcHelper.hashtableToObject( mavenOneProject, project );
 
-            String projectId = continuum.addMavenOneProject( project );
+            String projectId = continuum.addProject( project, ContinuumBuildExecutor.MAVEN_ONE_EXECUTOR_ID
);
 
             Collection projectIds = new ArrayList();
 
@@ -269,11 +269,11 @@
 
         try
         {
-            MavenOneProject project = continuum.getMavenOneProject( id );
+            ContinuumProject project = continuum.getProject( id );
 
             xmlRpcHelper.hashtableToObject( mavenOneProject, project );
 
-            continuum.updateMavenOneProject( project );
+            continuum.updateProject( project );
 
             return makeHashtable();
         }



Mime
View raw message