Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 3071 invoked from network); 19 Jul 2005 03:44:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 Jul 2005 03:44:37 -0000 Received: (qmail 90687 invoked by uid 500); 19 Jul 2005 03:44:37 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 90660 invoked by uid 500); 19 Jul 2005 03:44:36 -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 90647 invoked by uid 99); 19 Jul 2005 03:44:36 -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; Mon, 18 Jul 2005 20:44:25 -0700 Received: (qmail 3019 invoked by uid 65534); 19 Jul 2005 03:44:23 -0000 Message-ID: <20050719034423.3018.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r219612 - in /maven/continuum/trunk: ./ continuum-api/src/main/java/org/apache/maven/continuum/configuration/ continuum-api/src/main/java/org/apache/maven/continuum/utils/ continuum-core-it/src/test/java/org/apache/maven/continuum/it/ conti... Date: Tue, 19 Jul 2005 03:44:21 -0000 To: continuum-commits@maven.apache.org From: trygvis@apache.org X-Mailer: svnmailer-1.0.2 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trygvis Date: Mon Jul 18 20:44:01 2005 New Revision: 219612 URL: http://svn.apache.org/viewcvs?rev=219612&view=rev Log: o Creating continuum-test to be able to reuse common stuff for testing. - Moving ContinuumUtils and ConfigurationService to continuum-api o Attempting to move the build output directories under target/ instead of under the current working directory. Added: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationLoadingException.java (with props) maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java (with props) maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationStoringException.java (with props) maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/utils/ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java (with props) maven/continuum/trunk/continuum-test/ maven/continuum/trunk/continuum-test/src/ maven/continuum/trunk/continuum-test/src/main/ maven/continuum/trunk/continuum-test/src/main/java/ maven/continuum/trunk/continuum-test/src/main/java/org/ maven/continuum/trunk/continuum-test/src/main/java/org/apache/ maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/ maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/ maven/continuum/trunk/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java (with props) Removed: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/ConfigurationLoadingException.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/ConfigurationStoringException.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/AbstractContinuumTest.java Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java maven/continuum/trunk/continuum-core/pom.xml maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutorTest.java maven/continuum/trunk/pom.xml Added: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationLoadingException.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationLoadingException.java?rev=219612&view=auto ============================================================================== --- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationLoadingException.java (added) +++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationLoadingException.java Mon Jul 18 20:44:01 2005 @@ -0,0 +1,24 @@ +package org.apache.maven.continuum.configuration; + +/** + * @author Jason van Zyl + * @version $Id:$ + */ +public class ConfigurationLoadingException + extends Exception +{ + public ConfigurationLoadingException( String message ) + { + super( message ); + } + + public ConfigurationLoadingException( Throwable cause ) + { + super( cause ); + } + + public ConfigurationLoadingException( String message, Throwable cause ) + { + super( message, cause ); + } +} Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationLoadingException.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationLoadingException.java ------------------------------------------------------------------------------ svn:keywords = Id Added: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java?rev=219612&view=auto ============================================================================== --- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java (added) +++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java Mon Jul 18 20:44:01 2005 @@ -0,0 +1,58 @@ +package org.apache.maven.continuum.configuration; + +/* + * Copyright 2004-2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.File; + +/** + * @author Jason van Zyl + * @version $Id:$ + */ +public interface ConfigurationService +{ + String ROLE = ConfigurationService.class.getName(); + + // ---------------------------------------------------------------------- + // + // ---------------------------------------------------------------------- + + public static final String CONFIGURATION_URL = "url"; + + public static final String CONFIGURATION_BUILD_OUTPUT_DIRECTORY = "build-output-directory"; + + // ---------------------------------------------------------------------- + // + // ---------------------------------------------------------------------- + + String getUrl(); + + void setUrl( String url ); + + File getBuildOutputDirectory(); + + void setBuildOutputDirectory( File buildOutputDirectory ); + + // ---------------------------------------------------------------------- + // + // ---------------------------------------------------------------------- + + void load() + throws ConfigurationLoadingException; + + void store() + throws ConfigurationStoringException; +} Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java ------------------------------------------------------------------------------ svn:keywords = Id Added: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationStoringException.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationStoringException.java?rev=219612&view=auto ============================================================================== --- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationStoringException.java (added) +++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationStoringException.java Mon Jul 18 20:44:01 2005 @@ -0,0 +1,24 @@ +package org.apache.maven.continuum.configuration; + +/** + * @author Jason van Zyl + * @version $Id:$ + */ +public class ConfigurationStoringException + extends Exception +{ + public ConfigurationStoringException( String message ) + { + super( message ); + } + + public ConfigurationStoringException( Throwable cause ) + { + super( cause ); + } + + public ConfigurationStoringException( String message, Throwable cause ) + { + super( message, cause ); + } +} Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationStoringException.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationStoringException.java ------------------------------------------------------------------------------ svn:keywords = Id Added: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java?rev=219612&view=auto ============================================================================== --- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java (added) +++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java Mon Jul 18 20:44:01 2005 @@ -0,0 +1,45 @@ +package org.apache.maven.continuum.utils; + +/* + * Copyright 2004-2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.StringWriter; +import java.io.PrintWriter; + +/** + * @author Trygve Laugstøl + * @version $Id$ + */ +public class ContinuumUtils +{ + public static String throwableToString( Throwable error ) + { + if ( error == null ) + { + return ""; + } + + StringWriter writer = new StringWriter(); + + PrintWriter printer = new PrintWriter( writer ); + + error.printStackTrace( printer ); + + printer.flush(); + + return writer.getBuffer().toString(); + } +} Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java?rev=219612&r1=219611&r2=219612&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java (original) +++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java Mon Jul 18 20:44:01 2005 @@ -35,6 +35,7 @@ import org.apache.maven.continuum.xmlrpc.XmlRpcHelper; import org.apache.maven.continuum.Continuum; +import org.apache.maven.continuum.AbstractContinuumTest; import org.apache.maven.continuum.store.ContinuumStore; import org.apache.maven.continuum.scm.ScmResult; import org.apache.maven.continuum.scm.ScmFile; @@ -109,19 +110,7 @@ context.put( "plexus.home", plexusHome.getAbsolutePath() ); - // TODO: Replace with AbstractContinuumTest.makeConfiguration( plexusHome.getAbsolutePath() ); - File configFile = new File( plexusHome.getAbsolutePath(), "conf/configuration.xml" ); - - if ( !configFile.getParentFile().exists() && - !configFile.getParentFile().mkdirs() ) - { - throw new IOException( "Could not make directory: '" + configFile.getParentFile() + "'." ); - } - - FileUtils.fileWrite( configFile.getAbsolutePath(), - "" + - "target/build-output" + - ""); + AbstractContinuumTest.makeConfiguration( plexusHome.getAbsolutePath() ); } public final void setUp() Modified: maven/continuum/trunk/continuum-core/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/pom.xml?rev=219612&r1=219611&r2=219612&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/pom.xml (original) +++ maven/continuum/trunk/continuum-core/pom.xml Mon Jul 18 20:44:01 2005 @@ -11,7 +11,7 @@ @@ -19,6 +19,10 @@ continuum-api + org.apache.maven.continuum + continuum-test + + jpox jpox @@ -66,7 +70,7 @@ quartz quartz 1.4.5 - +