Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 20911 invoked from network); 6 Oct 2005 12:11:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Oct 2005 12:11:16 -0000 Received: (qmail 9332 invoked by uid 500); 6 Oct 2005 12:11:15 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 9313 invoked by uid 500); 6 Oct 2005 12:11:15 -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 9302 invoked by uid 99); 6 Oct 2005 12:11:15 -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; Thu, 06 Oct 2005 05:11:14 -0700 Received: (qmail 20806 invoked by uid 65534); 6 Oct 2005 12:10:54 -0000 Message-ID: <20051006121054.20805.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r306606 - in /maven/continuum/trunk: continuum-api/src/main/java/org/apache/maven/continuum/configuration/ continuum-core/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/configuration/ conti... Date: Thu, 06 Oct 2005 12:10:53 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Thu Oct 6 05:10:44 2005 New Revision: 306606 URL: http://svn.apache.org/viewcvs?rev=306606&view=rev Log: o applicationHome is now accessible for configuration screens o Check if working directory, build output directory and base url aren't null Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.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/configuration/DefaultConfigurationService.java maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Configure.vm maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditContinuumConfiguration.vm Modified: 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=306606&r1=306605&r2=306606&view=diff ============================================================================== --- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java (original) +++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/configuration/ConfigurationService.java Thu Oct 6 05:10:44 2005 @@ -31,6 +31,8 @@ // // ---------------------------------------------------------------------- + File getApplicationHome(); + boolean isInitialized(); void setInitialized( boolean initialized ); 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=306606&r1=306605&r2=306606&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 Thu Oct 6 05:10:44 2005 @@ -1061,11 +1061,32 @@ configurationService.setGuestAccountEnabled( false ); } - configurationService.setWorkingDirectory( configurationService.getFile( (String) configuration.get( "conf.workingDirectory" ) ) ); + if ( configuration.get( "conf.workingDirectory" ) == null ) + { + configurationService.setWorkingDirectory( configurationService.getFile( (String) configuration.get( "conf.workingDirectory" ) ) ); + } + else + { + throw new ContinuumException( "working directory can't be null" ); + } - configurationService.setBuildOutputDirectory( configurationService.getFile( (String) configuration.get( "conf.buildOutputDirectory" ) ) ); + if ( configuration.get( "conf.buildOutputDirectory" ) == null ) + { + configurationService.setBuildOutputDirectory( configurationService.getFile( (String) configuration.get( "conf.buildOutputDirectory" ) ) ); + } + else + { + throw new ContinuumException( "build output directory can't be null" ); + } - configurationService.setUrl( (String) configuration.get( "conf.url" ) ); + if ( configuration.get( "conf.url" ) == null ) + { + configurationService.setUrl( (String) configuration.get( "conf.url" ) ); + } + else + { + throw new ContinuumException( "base url can't be null" ); + } configurationService.setCompanyName( (String) configuration.get( "conf.companyName" ) ); Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java?rev=306606&r1=306605&r2=306606&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java Thu Oct 6 05:10:44 2005 @@ -67,6 +67,11 @@ // // ---------------------------------------------------------------------- + public File getApplicationHome() + { + return applicationHome; + } + public void setInitialized( boolean initialized ) { systemConf.setInitialized( initialized ); Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Configure.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Configure.vm?rev=306606&r1=306605&r2=306606&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Configure.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Configure.vm Thu Oct 6 05:10:44 2005 @@ -35,11 +35,11 @@ - + - +
Working Directory : If you define a relative path, it will be relative to $CONTINUUM_HOME/apps/continuum/ If you define a relative path, it will be relative to $continuum.configuration.applicationHome
Build Output Directory : If you define a relative path, it will be relative to $CONTINUUM_HOME/apps/continuum/ If you define a relative path, it will be relative to $continuum.configuration.applicationHome
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditContinuumConfiguration.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditContinuumConfiguration.vm?rev=306606&r1=306605&r2=306606&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditContinuumConfiguration.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditContinuumConfiguration.vm Thu Oct 6 05:10:44 2005 @@ -19,11 +19,11 @@ Working Directory - + If you define a relative path, it will be relative to $continuum.configuration.applicationHome Build Output Directory - + If you define a relative path, it will be relative to $continuum.configuration.applicationHome Base URL