Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 19703 invoked from network); 12 Aug 2005 07:23:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Aug 2005 07:23:01 -0000 Received: (qmail 24153 invoked by uid 500); 12 Aug 2005 07:23:00 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 24128 invoked by uid 500); 12 Aug 2005 07:23:00 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 24115 invoked by uid 99); 12 Aug 2005 07:23:00 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 12 Aug 2005 00:22:59 -0700 Received: (qmail 19687 invoked by uid 65534); 12 Aug 2005 07:22:59 -0000 Message-ID: <20050812072259.19685.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r232221 [2/2] - in /maven/continuum/trunk: continuum-api/src/main/java/org/apache/maven/continuum/ continuum-api/src/main/java/org/apache/maven/continuum/notification/ continuum-api/src/main/java/org/apache/maven/continuum/store/ continuum-... Date: Fri, 12 Aug 2005 07:22:29 -0000 To: continuum-commits@maven.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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=232221&r1=232220&r2=232221&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 Fri Aug 12 00:21:44 2005 @@ -16,6 +16,18 @@ * limitations under the License. */ +import org.apache.maven.continuum.Continuum; +import org.apache.maven.continuum.model.scm.ScmResult; +import org.apache.maven.continuum.project.AntProject; +import org.apache.maven.continuum.project.ContinuumBuild; +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.ShellProject; +import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult; +import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.codehaus.plexus.util.StringUtils; + import java.io.PrintWriter; import java.io.StringWriter; import java.lang.reflect.InvocationTargetException; @@ -27,25 +39,10 @@ import java.util.Set; import java.util.Vector; -import org.apache.maven.continuum.Continuum; -import org.apache.maven.continuum.project.ContinuumBuild; -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.AntProject; -import org.apache.maven.continuum.project.ShellProject; -import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult; -import org.apache.maven.continuum.scm.ScmResult; - -import org.codehaus.plexus.logging.AbstractLogEnabled; -import org.codehaus.plexus.util.StringUtils; - /** - * @plexus.component - * role="org.apache.maven.continuum.xmlrpc.ContinuumXmlRpc" - * * @author Trygve Laugstøl * @version $Id$ + * @plexus.component role="org.apache.maven.continuum.xmlrpc.ContinuumXmlRpc" */ public class DefaultContinuumXmlRpc extends AbstractLogEnabled @@ -75,8 +72,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.removeProject()", - "Project id: '" + projectId + "'.", e ); + return handleException( "ContinuumXmlRpc.removeProject()", "Project id: '" + projectId + "'.", e ); } } @@ -90,8 +86,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.getProject()", - "Project id: '" + projectId + "'.", e ); + return handleException( "ContinuumXmlRpc.getProject()", "Project id: '" + projectId + "'.", e ); } } @@ -126,8 +121,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.getScmResultForProject()", - "Project id: '" + projectId + "'.", e ); + return handleException( "ContinuumXmlRpc.getScmResultForProject()", "Project id: '" + projectId + "'.", e ); } } @@ -141,8 +135,8 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.getLatestBuildForProject()", - "Project id: '" + projectId + "'.", e ); + return handleException( "ContinuumXmlRpc.getLatestBuildForProject()", "Project id: '" + projectId + "'.", + e ); } } @@ -151,8 +145,7 @@ // Build handling // ---------------------------------------------------------------------- - public Hashtable buildProject( String projectId, - boolean force ) + public Hashtable buildProject( String projectId, boolean force ) { try { @@ -162,8 +155,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.buildProject()", - "Project id: '" + projectId + "'.", e ); + return handleException( "ContinuumXmlRpc.buildProject()", "Project id: '" + projectId + "'.", e ); } } @@ -177,21 +169,18 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.getBuild()", - "Build id: '" + buildId + "'.", e ); + return handleException( "ContinuumXmlRpc.getBuild()", "Build id: '" + buildId + "'.", e ); } } - public Hashtable getBuildsForProject( String projectId, - int start, - int end ) + public Hashtable getBuildsForProject( String projectId, int start, int end ) { try { if ( start != 0 || end != 0 ) { getLogger().warn( "ContinuumXmlRpc.getBuildsForProject() " + - "doesn't support usage of the start and end parameters yet." ); + "doesn't support usage of the start and end parameters yet." ); } // TODO: use start and end @@ -208,8 +197,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.getBuildsForProject()", - "Project id: '" + projectId + "'.", e ); + return handleException( "ContinuumXmlRpc.getBuildsForProject()", "Project id: '" + projectId + "'.", e ); } } @@ -230,8 +218,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.getBuildResultForProject()", - "Build id: '" + buildId + "'.", e ); + return handleException( "ContinuumXmlRpc.getBuildResultForProject()", "Build id: '" + buildId + "'.", e ); } } @@ -260,8 +247,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.addMavenTwoProject()", - "URL: '" + url + "'.", e ); + return handleException( "ContinuumXmlRpc.addMavenTwoProject()", "URL: '" + url + "'.", e ); } } @@ -303,8 +289,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.updateMavenTwoProject()", - "Project id: '" + id + "'.", e ); + return handleException( "ContinuumXmlRpc.updateMavenTwoProject()", "Project id: '" + id + "'.", e ); } } @@ -333,8 +318,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.addMavenOneProject()", - "URL: '" + url + "'.", e ); + return handleException( "ContinuumXmlRpc.addMavenOneProject()", "URL: '" + url + "'.", e ); } } @@ -356,8 +340,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.addMavenOneProject()", - null, e ); + return handleException( "ContinuumXmlRpc.addMavenOneProject()", null, e ); } } @@ -377,8 +360,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.updateMavenTwoProject()", - "Project id: '" + id + "'.", e ); + return handleException( "ContinuumXmlRpc.updateMavenTwoProject()", "Project id: '" + id + "'.", e ); } } @@ -404,8 +386,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.addAntProject()", - null, e ); + return handleException( "ContinuumXmlRpc.addAntProject()", null, e ); } } @@ -425,8 +406,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.updateMavenTwoProject()", - "Project id: '" + id + "'", e ); + return handleException( "ContinuumXmlRpc.updateMavenTwoProject()", "Project id: '" + id + "'", e ); } } @@ -452,8 +432,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.ShellProject()", - null, e ); + return handleException( "ContinuumXmlRpc.ShellProject()", null, e ); } } @@ -473,8 +452,7 @@ } catch ( Throwable e ) { - return handleException( "ContinuumXmlRpc.updateMavenTwoProject()", - "Project id: '" + id + "'", e ); + return handleException( "ContinuumXmlRpc.updateMavenTwoProject()", "Project id: '" + id + "'", e ); } }