Author: handyande
Date: Thu Mar 1 09:20:00 2007
New Revision: 513413
URL: http://svn.apache.org/viewvc?view=rev&rev=513413
Log:
Split BuildResult out to a Summary too, as the lists do not include the lengthy
outputs
Modified:
maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/ContinuumClient.java
maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/ProjectsReader.java
maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/SampleClient.java
maven/sandbox/trunk/continuum/continuum-client/src/main/mdo/continuum-client.xml
Modified:
maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/ContinuumClient.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/ContinuumClient.java?view=diff&rev=513413&r1=513412&r2=513413
==============================================================================
---
maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/ContinuumClient.java
(original)
+++
maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/ContinuumClient.java
Thu Mar 1 09:20:00 2007
@@ -25,6 +25,7 @@
import org.apache.maven.continuum.client.project.Project;
import org.apache.maven.continuum.client.project.ProjectSummary;
import org.apache.maven.continuum.client.project.BuildResult;
+import org.apache.maven.continuum.client.project.BuildResultSummary;
import java.util.Hashtable;
import java.net.URL;
@@ -136,7 +137,7 @@
return getProject( summary.getId() );
}
- public BuildResult[] getBuildResultsForProject( int projectId )
+ public BuildResultSummary[] getBuildResultsForProject( int projectId )
throws ClientException
{
try
@@ -149,7 +150,7 @@
}
}
- public BuildResult[] getBuildResultsForProject( Project project )
+ public BuildResultSummary[] getBuildResultsForProject( Project project )
throws ClientException
{
return getBuildResultsForProject( project.getId() );
Modified:
maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/ProjectsReader.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/ProjectsReader.java?view=diff&rev=513413&r1=513412&r2=513413
==============================================================================
---
maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/ProjectsReader.java
(original)
+++
maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/ProjectsReader.java
Thu Mar 1 09:20:00 2007
@@ -27,6 +27,7 @@
import org.apache.maven.continuum.client.project.Schedule;
import org.apache.maven.continuum.client.project.ProjectSummary;
import org.apache.maven.continuum.client.project.BuildResult;
+import org.apache.maven.continuum.client.project.BuildResultSummary;
import org.apache.xmlrpc.XmlRpcClient;
import org.apache.xmlrpc.XmlRpcException;
@@ -328,7 +329,7 @@
return instance;
}
- public BuildResult[] readBuildResultsForProject( int projectId )
+ public BuildResultSummary[] readBuildResultsForProject( int projectId )
throws XmlRpcException, IOException
{
XmlRpcClient client = new XmlRpcClient( server );
@@ -336,7 +337,6 @@
vect.add( new Integer( projectId ) );
Object obj = client.execute( "continuum.getBuildResultsForProject",
vect );
Collection set = new ArrayList();
- System.out.println( obj );
if ( obj instanceof Hashtable )
{
Hashtable table = (Hashtable) obj;
@@ -374,26 +374,31 @@
}
}
- BuildResult populateBuildResult( Hashtable hashtable, BuildResult instance
)
+ private BuildResultSummary populateBuildResultSummary( Hashtable
hashtable, BuildResultSummary instance )
{
instance.setId( Integer.parseInt( (String) hashtable.get( "id" ) ) );
instance.setState( Integer.parseInt( (String) hashtable.get( "state" )
) );
instance.setBuildNumber( Integer.parseInt( (String) hashtable.get(
"buildNumber" ) ) );
+ instance.setStartTime( Long.parseLong( (String) hashtable.get(
"startTime") ) );
+ instance.setEndTime( Long.parseLong( (String) hashtable.get( "endTime"
) ) );
+ instance.setSuccess( hashtable.get( "success" ).equals( "true" ) );
+ instance.setExitCode( Integer.parseInt( (String) hashtable.get(
"exitCode" ) ) );
+
+ return instance;
+ }
+
+ private BuildResult populateBuildResult( Hashtable hashtable, BuildResult
instance )
+ {
+ populateBuildResultSummary( hashtable, instance );
+
String trigger = (String) hashtable.get( "trigger" );
if ( trigger != null )
{
instance.setTrigger( Integer.parseInt( trigger ) );
}
- instance.setStartTime( Long.parseLong( (String) hashtable.get(
"startTime") ) );
- instance.setEndTime( Long.parseLong( (String) hashtable.get( "endTime"
) ) );
instance.setError( (String) hashtable.get( "error" ) );
- instance.setSuccess( hashtable.get( "success" ).equals( "true" ) );
- instance.setExitCode( Integer.parseInt( (String) hashtable.get(
"exitCode" ) ) );
-// TODO: build the ScmResult (if not summary)
+// TODO: build the ScmResult
// instance.setScmResult( (ScmResult) hashtable.get( "scmResult" ) );
-// TODO: build the TestResult
-// instance.setTestResult( ( TestResult ) hashtable.get( "testResult" )
);
- instance.setModifiedDependencies( parseDependencies( (Vector)
hashtable.get( "modifiedDependencies" ) ) );
return instance;
}
Modified:
maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/SampleClient.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/SampleClient.java?view=diff&rev=513413&r1=513412&r2=513413
==============================================================================
---
maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/SampleClient.java
(original)
+++
maven/sandbox/trunk/continuum/continuum-client/src/main/java/org/apache/maven/continuum/client/SampleClient.java
Thu Mar 1 09:20:00 2007
@@ -3,6 +3,7 @@
import org.apache.maven.continuum.client.project.Project;
import org.apache.maven.continuum.client.project.ProjectSummary;
import org.apache.maven.continuum.client.project.BuildResult;
+import org.apache.maven.continuum.client.project.BuildResultSummary;
import java.net.URL;
import java.util.Date;
Modified:
maven/sandbox/trunk/continuum/continuum-client/src/main/mdo/continuum-client.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/continuum/continuum-client/src/main/mdo/continuum-client.xml?view=diff&rev=513413&r1=513412&r2=513413
==============================================================================
---
maven/sandbox/trunk/continuum/continuum-client/src/main/mdo/continuum-client.xml
(original)
+++
maven/sandbox/trunk/continuum/continuum-client/src/main/mdo/continuum-client.xml
Thu Mar 1 09:20:00 2007
@@ -386,10 +386,10 @@
</class>
<class>
- <name>BuildResult</name>
+ <name>BuildResultSummary</name>
<version>1.1.0+</version>
<description><![CDATA[
- This class is a single continuum build.
+ This class is a summary of a single continuum build.
]]></description>
<fields>
<field>
@@ -409,11 +409,6 @@
<type>int</type>
</field>
<field>
- <name>trigger</name>
- <version>1.1.0+</version>
- <type>int</type>
- </field>
- <field>
<name>startTime</name>
<version>1.1.0+</version>
<type>long</type>
@@ -424,11 +419,6 @@
<type>long</type>
</field>
<field>
- <name>error</name>
- <version>1.1.0+</version>
- <type>String</type>
- </field>
- <field>
<name>success</name>
<version>1.1.0+</version>
<type>boolean</type>
@@ -437,6 +427,27 @@
<name>exitCode</name>
<version>1.1.0+</version>
<type>int</type>
+ </field>
+ </fields>
+ </class>
+
+ <class>
+ <name>BuildResult</name>
+ <version>1.1.0+</version>
+ <superClass>BuildResultSummary</superClass>
+ <description><![CDATA[
+ This class is a summary of a single continuum build.
+ ]]></description>
+ <fields>
+ <field>
+ <name>trigger</name>
+ <version>1.1.0+</version>
+ <type>int</type>
+ </field>
+ <field>
+ <name>error</name>
+ <version>1.1.0+</version>
+ <type>String</type>
</field>
<field>
<name>scmResult</name>
