You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jv...@apache.org on 2005/07/23 20:41:33 UTC
svn commit: r224502 [1/2] - in /maven/continuum/trunk: ./
continuum-api/src/main/java/org/apache/maven/continuum/
continuum-api/src/main/java/org/apache/maven/continuum/build/settings/
continuum-core/src/main/java/org/apache/maven/continuum/ continuum-...
Author: jvanzyl
Date: Sat Jul 23 11:40:50 2005
New Revision: 224502
URL: http://svn.apache.org/viewcvs?rev=224502&view=rev
Log:
o first round of testing for new model and build scheduling
Added:
maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsActivationException.java
maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsActivator.java
maven/continuum/trunk/continuum-xmlrpc/src/test/resources/
maven/continuum/trunk/continuum-xmlrpc/src/test/resources/org/
maven/continuum/trunk/continuum-xmlrpc/src/test/resources/org/apache/
maven/continuum/trunk/continuum-xmlrpc/src/test/resources/org/apache/maven/
maven/continuum/trunk/continuum-xmlrpc/src/test/resources/org/apache/maven/continuum/
maven/continuum/trunk/continuum-xmlrpc/src/test/resources/org/apache/maven/continuum/xmlrpc/
maven/continuum/trunk/continuum-xmlrpc/src/test/resources/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpcTest.xml
Modified:
maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.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/TestUtils.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.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/execution/maven/m2/DefaultMavenBuilderHelper.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/ContinuumInitializer.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/ContinuumRecipientSource.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java
maven/continuum/trunk/continuuFrom continuum-commits-return-666-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Sat Jul 23 18:42:02 2005
Return-Path: <co...@maven.apache.org>
Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org
Received: (qmail 5300 invoked from network); 23 Jul 2005 18:42:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
by minotaur.apache.org with SMTP; 23 Jul 2005 18:42:02 -0000
Received: (qmail 58259 invoked by uid 500); 23 Jul 2005 18:42:02 -0000
Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org
Received: (qmail 58208 invoked by uid 500); 23 Jul 2005 18:42:01 -0000
Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <ma...@maven.apache.org>
List-Unsubscribe: <ma...@maven.apache.org>
List-Post: <ma...@maven.apache.org>
List-Id: <continuum-commits.maven.apache.org>
Reply-To: continuum-dev@maven.apache.org
Delivered-To: mailing list continuum-commits@maven.apache.org
Received: (qmail 58129 invoked by uid 99); 23 Jul 2005 18:42: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; Sat, 23 Jul 2005 11:41:49 -0700
Received: (qmail 5196 invoked by uid 65534); 23 Jul 2005 18:41:47 -0000
Message-ID: <20...@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r224502 [2/2] - in /maven/continuum/trunk: ./
continuum-api/src/main/java/org/apache/maven/continuum/
continuum-api/src/main/java/org/apache/maven/continuum/build/settings/
continuum-core/src/main/java/org/apache/maven/continuum/ continuum-...
Date: Sat, 23 Jul 2005 18:41:33 -0000
To: continuum-commits@maven.apache.org
From: jvanzyl@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
Modified: maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml Sat Jul 23 11:40:50 2005
@@ -53,6 +53,19 @@
</component>
<component>
+ <role>org.apache.maven.continuum.build.settings.BuildSettingsActivator</role>
+ <implementation>org.apache.maven.continuum.build.settings.DefaultBuildSettingsActivator</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.continuum.store.ContinuumStore</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.continuum.scheduler.ContinuumScheduler</role>
+ </requirement>
+ </requirements>
+ </component>
+
+ <component>
<role>org.apache.maven.continuum.Continuum</role>
<implementation>org.apache.maven.continuum.DefaultContinuum</implementation>
<requirements>
@@ -73,6 +86,9 @@
</requirement>
<requirement>
<role>org.apache.maven.continuum.initialization.ContinuumInitializer</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.continuum.build.settings.BuildSettingsActivator</role>
</requirement>
</requirements>
</component>
Modified: maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml?rev=224502&r1=224501&r2=m-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumBuildJob.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumScheduler.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScm.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTask.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/AbstractContinuumTrigger.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/alarmclock/AlarmClockTrigger.java
maven/con224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml (original)
+++ maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml Sat Jul 23 11:40:50 2005
@@ -4,10 +4,12 @@
<component>
<role>org.apache.maven.continuum.Continuum</role>
</component>
+ <!--
<component>
<role>org.apache.maven.continuum.trigger.ContinuumTrigger</role>
<role-hint>quartz-alarm-clock</role-hint>
</component>
+ -->
<component>
<role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role>
<role-hint>build-project</role-hint>
Added: maven/continuum/trunk/continuum-xmlrpc/src/test/resources/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpcTest.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xmlrpc/src/test/resources/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpcTest.xml?rev=224502&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/src/test/resources/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpcTest.xml (added)
+++ maven/continuum/trunk/continuum-xmlrpc/src/test/resources/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpcTest.xml Sat Jul 23 11:40:50 2005
@@ -0,0 +1,11 @@
+<plexus>
+ <components>
+ <component>
+ <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
+ <implementation>org.apache.maven.continuum.configuration.DefaultConfigurationService</implementation>
+ <configuration>
+ <inMemoryMode>true</inMemoryMode>
+ </configuration>
+ </component>
+ </components>
+</plexus>
Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/pom.xml?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/tinuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/quartz/QuartzAlarmClockTrigger.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java
maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml
maven/continuum/trunk/pom.xml
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=224502&r1=224501&r2=224502&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 Sat Jul 23 11:40:50 2005
@@ -94,6 +94,9 @@
void buildProject( String projectId, boolean force )
throws ContinuumException;
+ void buildProjectGroup( ContinuumProjectGroup projectGroup, ContinuumBuildSettings buildSettings )
+ throws ContinuumException;
+
// ----------------------------------------------------------------------
// Build information
// ----------------------------------------------------------------------
Added: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsActivationException.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsActivationException.java?rev=224502&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsActivationException.java (added)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsActivationException.java Sat Jul 23 11:40:50 2005
@@ -0,0 +1,24 @@
+package org.apache.maven.continuum.build.settings;
+
+/**
+ * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @version $Id:$
+ */
+public class BuildSettingsActivationException
+ extends Exception
+{
+ public BuildSettingsActivationException( String message )
+ {
+ super( message );
+ }
+
+ public BuildSettingsActivationException( Throwable cause )
+ {
+ super( cause );
+ }
+
+ public BuildSettingsActivationException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+}
Added: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsActivator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsActivator.java?rev=224502&view=auto
=========================pom.xml Sat Jul 23 11:40:50 2005
@@ -201,7 +201,9 @@
<module>continuum-plexus-application</module>
<module>continuum-test</module>
<module>continuum-web</module>
+ <!--
<module>continuum-xfire</module>
+ -->
<module>continuum-xmlrpc</module>
</modules>
</project>
=====================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsActivator.java (added)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsActivator.java Sat Jul 23 11:40:50 2005
@@ -0,0 +1,22 @@
+package org.apache.maven.continuum.build.settings;
+
+import org.apache.maven.continuum.Continuum;
+
+/**
+ * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @version $Id:$
+ */
+public interface BuildSettingsActivator
+{
+ String ROLE = BuildSettingsActivator.class.getName();
+
+ /**
+ * Grab all the stored {@link org.apache.maven.continuum.project.ContinuumBuildSettings} objects
+ * and activate them by looking at the scheduling information contained within and submitting a
+ * Job to the scheduler.
+ *
+ * @throws BuildSettingsActivationException
+ */
+ void activateBuildSettings( Continuum continuum )
+ throws BuildSettingsActivationException;
+}
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=224502&r1=224501&r2=224502&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 Sat Jul 23 11:40:50 2005
@@ -16,8 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.continuum.configuration.ConfigurationService;
+import org.apache.maven.continuum.build.settings.BuildSettingsActivationException;
+import org.apache.maven.continuum.build.settings.BuildSettingsActivator;
import org.apache.maven.continuum.configuration.ConfigurationLoadingException;
+import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.configuration.ConfigurationStoringException;
import org.apache.maven.continuum.core.ContinuumCore;
import org.apache.maven.continuum.core.action.AbstractContinuumAction;
@@ -28,16 +30,18 @@
import org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor;
import org.apache.maven.continuum.execution.maven.m2.MavenTwoBuildExecutor;
import org.apache.maven.continuum.execution.shell.ShellBuildExecutor;
+import org.apache.maven.continuum.initialization.ContinuumInitializationException;
+import org.apache.maven.continuum.initialization.ContinuumInitializer;
import org.apache.maven.continuum.project.AntProject;
import org.apache.maven.continuum.project.ContinuumBuild;
+import org.apache.maven.continuum.project.ContinuumBuildSettings;
import org.apache.maven.continuum.project.ContinuumNotifier;
import org.apache.maven.continuum.project.ContinuumProject;
+import org.apache.maven.continuum.project.ContinuumProjectGroup;
import org.apache.maven.continuum.project.ContinuumSchedule;
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.ContinuumProjectGroup;
-import org.apache.maven.continuum.project.ContinuumBuildSettings;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
import org.apache.maven.continuum.project.builder.maven.MavenOneContinuumProjectBuilder;
import org.apache.maven.continuum.project.builder.maven.MavenTwoContinuumProjectBuilder;
@@ -47,15 +51,10 @@
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
import org.apache.maven.continuum.utils.ProjectSorter;
-import org.apache.maven.continuum.initialization.ContinuumInitializer;
-import org.apache.maven.continuum.initialization.ContinuumInitializationException;
-
import org.codehaus.plexus.action.ActionManager;
import org.codehaus.plexus.action.Action;
import org.codehaus.plexus.action.ActionNotFoundException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException;
@@ -67,6 +66,7 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -107,6 +107,11 @@
*/
private ContinuumInitializer initializer;
+ /**
+ * @plexus.requirement
+ */
+ private BuildSettingsActivator buildSettingsActivator;
+
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
@@ -187,8 +192,6 @@
buildProjects( true );
}
- // TODO: take a Properties here so that we can be extensible. For example we would like to be able
- // to specify an update or clean checkout as well.
public void buildProjects( boolean force )
throws ContinuumException
{
@@ -223,12 +226,6 @@
*/
}
- public List getProjectsInBuildOrder()
- throws CycleDetectedException, ContinuumException
- {
- return ProjectSorter.getSortedProjects( getProjects() );
- }
-
public void buildProject( String projectId )
throws ContinuumException
{
@@ -241,6 +238,36 @@
core.buildProject( projectId, force );
}
+ public void buildProjectGroup( ContinuumProjectGroup projectGroup, ContinuumBuildSettings buildSettings )
+ throws ContinuumException
+ {
+ Set projects = projectGroup.getProjects();
+
+ for ( Iterator j = projects.iterator(); j.hasNext(); )
+ {
+ ContinuumProject project = (ContinuumProject) j.next();
+
+ try
+ {
+ buildProject( project.getId(), false );
+ }
+ catch ( ContinuumException ex )
+ {
+ getLogger().error( "Could not enqueue project: " + project.getId() + " ('" + project.getName() + "').", ex );
+ }
+ }
+ }
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ public List getProjectsInBuildOrder()
+ throws CycleDetectedException, ContinuumException
+ {
+ return ProjectSorter.getSortedProjects( getProjects() );
+ }
+
// ----------------------------------------------------------------------
// Build inforation
// ----------------------------------------------------------------------
@@ -570,6 +597,20 @@
configurationService.setInitialized( true );
}
+
+ // ----------------------------------------------------------------------
+ // Activate all the Build settings in the system
+ // ----------------------------------------------------------------------
+
+ try
+ {
+ buildSettingsActivator.activateBuildSettings( this );
+ }
+ catch ( BuildSettingsActivationException e )
+ {
+ throw new StartingException( "Error activating build settings.", e );
+ }
+
}
catch ( ConfigurationLoadingException e )
{
@@ -768,4 +809,8 @@
return new ContinuumException( message, cause );
}
+
+ // ----------------------------------------------------------------------
+ // Build settings
+ // ----------------------------------------------------------------------
}
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/TestUtils.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/TestUtils.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/TestUtils.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/TestUtils.java Sat Jul 23 11:40:50 2005
@@ -16,11 +16,10 @@
* limitations under the License.
*/
+import junit.framework.Assert;
import org.apache.maven.continuum.project.ContinuumBuild;
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.store.ContinuumStore;
-
-import junit.framework.Assert;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java Sat Jul 23 11:40:50 2005
@@ -18,7 +18,6 @@
import org.apache.maven.continuum.buildqueue.BuildProjectTask;
import org.apache.maven.continuum.store.ContinuumStore;
-
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.taskqueue.Task;
import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Sat Jul 23 11:40:50 2005
@@ -16,10 +16,6 @@
* limitations under the License.
*/
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.maven.continuum.core.action.AbstractContinuumAction;
import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
import org.apache.maven.continuum.project.ContinuumBuild;
@@ -30,10 +26,13 @@
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
import org.apache.maven.continuum.utils.ContinuumUtils;
-
import org.codehaus.plexus.action.ActionManager;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.StringUtils;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java Sat Jul 23 11:40:50 2005
@@ -16,17 +16,16 @@
* limitations under the License.
*/
+import org.apache.maven.continuum.buildqueue.BuildProjectTask;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.taskqueue.TaskQueueException;
+import org.codehaus.plexus.taskqueue.TaskViabilityEvaluator;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-
-import org.apache.maven.continuum.buildqueue.BuildProjectTask;
-
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.taskqueue.TaskQueueException;
-import org.codehaus.plexus.taskqueue.TaskViabilityEvaluator;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
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=224502&r1=224501&r2=224502&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 Sat Jul 23 11:40:50 2005
@@ -1,12 +1,13 @@
package org.apache.maven.continuum.configuration;
+import org.apache.maven.continuum.profile.ContinuumJdk;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import org.codehaus.plexus.util.xml.Xpp3DomWriter;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.apache.maven.continuum.profile.ContinuumJdk;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.io.File;
import java.io.FileNotFoundException;
@@ -14,16 +15,17 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
+import java.util.Date;
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
-import java.util.Date;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
*/
public class DefaultConfigurationService
+ extends AbstractLogEnabled
implements ConfigurationService
{
/**
@@ -64,6 +66,8 @@
public void setInitialized( boolean initialized )
{
+ getLogger().info( "Setting the initialization state to " + initialized );
+
this.initialized = initialized;
}
@@ -212,6 +216,10 @@
protected void processOutboundConfiguration()
{
configuration = new Xpp3Dom( CONFIGURATION );
+
+ System.out.println( "initialized = " + initialized );
+
+ System.out.println( ">>>>>>>>>>>>>>>>>>> Boolean.toString( initialized ) = " + Boolean.toString( initialized ) );
configuration.addChild( createDom( CONFIGURATION_INITIALIZED, Boolean.toString( initialized ) ) );
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java Sat Jul 23 11:40:50 2005
@@ -16,20 +16,19 @@
* limitations under the License.
*/
-import java.util.Collection;
-
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
import org.apache.maven.continuum.project.ContinuumBuild;
-import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.project.ContinuumNotifier;
+import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager;
-import org.apache.maven.continuum.scm.ScmResult;
import org.apache.maven.continuum.scm.ContinuumScm;
+import org.apache.maven.continuum.scm.ScmResult;
import org.apache.maven.continuum.store.ContinuumStore;
-
import org.codehaus.plexus.taskqueue.TaskQueue;
+
+import java.util.Collection;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java Sat Jul 23 11:40:50 2005
@@ -16,27 +16,18 @@
* limitations under the License.
*/
-import java.io.File;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.buildqueue.BuildProjectTask;
import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
import org.apache.maven.continuum.project.ContinuumBuild;
-import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.project.ContinuumNotifier;
+import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager;
-import org.apache.maven.continuum.scm.ScmResult;
import org.apache.maven.continuum.scm.ContinuumScm;
+import org.apache.maven.continuum.scm.ScmResult;
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
-
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@@ -45,6 +36,14 @@
import org.codehaus.plexus.taskqueue.TaskQueue;
import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.codehaus.plexus.util.StringUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java Sat Jul 23 11:40:50 2005
@@ -16,23 +16,22 @@
* limitations under the License.
*/
-import java.io.File;
-import java.util.Map;
-
import org.apache.maven.continuum.core.ContinuumCore;
import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
import org.apache.maven.continuum.project.ContinuumBuild;
import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager;
-import org.apache.maven.continuum.scm.ScmResult;
import org.apache.maven.continuum.scm.ContinuumScm;
+import org.apache.maven.continuum.scm.ScmResult;
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
-
import org.codehaus.plexus.action.AbstractAction;
import org.codehaus.plexus.taskqueue.TaskQueue;
import org.codehaus.plexus.util.StringUtils;
+
+import java.io.File;
+import java.util.Map;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java Sat Jul 23 11:40:50 2005
@@ -16,10 +16,10 @@
* limitations under the License.
*/
+import org.apache.maven.continuum.project.ContinuumProject;
+
import java.io.File;
import java.util.Map;
-
-import org.apache.maven.continuum.project.ContinuumProject;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java Sat Jul 23 11:40:50 2005
@@ -16,15 +16,15 @@
* limitations under the License.
*/
-import java.io.File;
-import java.util.Map;
-
import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.scm.ContinuumScmException;
import org.apache.maven.continuum.scm.ScmResult;
import org.apache.maven.continuum.utils.ContinuumUtils;
import org.codehaus.plexus.scm.NoSuchScmProviderException;
import org.codehaus.plexus.util.StringUtils;
+
+import java.io.File;
+import java.util.Map;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java Sat Jul 23 11:40:50 2005
@@ -3,14 +3,14 @@
*/
package org.apache.maven.continuum.core.action;
+import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
-import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuilderException;
+import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
import org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManagerException;
-import org.apache.maven.continuum.ContinuumException;
-import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URL;
import java.util.Map;
/**
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java Sat Jul 23 11:40:50 2005
@@ -16,18 +16,18 @@
* limitations under the License.
*/
-import java.util.Collection;
-import java.util.Date;
-import java.util.Map;
-
import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.utils.ContinuumUtils;
import org.apache.maven.continuum.execution.ContinuumBuildExecutionResult;
import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
import org.apache.maven.continuum.project.ContinuumBuild;
import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.scm.ScmResult;
+import org.apache.maven.continuum.utils.ContinuumUtils;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.Map;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java Sat Jul 23 11:40:50 2005
@@ -16,13 +16,12 @@
* limitations under the License.
*/
-import java.util.Map;
-
import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.scm.ScmResult;
import org.apache.maven.continuum.store.ContinuumStoreException;
-
import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
+
+import java.util.Map;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java Sat Jul 23 11:40:50 2005
@@ -4,13 +4,12 @@
package org.apache.maven.continuum.core.action;
import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.store.ContinuumStoreException;
import org.apache.maven.continuum.project.ContinuumProject;
+import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.util.Map;
-
-import org.codehaus.plexus.util.StringUtils;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java Sat Jul 23 11:40:50 2005
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-import java.util.Map;
-import java.io.File;
-
+import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
import org.apache.maven.continuum.execution.ContinuumBuildExecutorException;
import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.apache.maven.continuum.ContinuumException;
+
+import java.io.File;
+import java.util.Map;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java Sat Jul 23 11:40:50 2005
@@ -16,18 +16,17 @@
* limitations under the License.
*/
-import java.util.List;
-import java.util.Iterator;
-import java.io.File;
-
-import org.apache.maven.continuum.utils.shell.ShellCommandHelper;
import org.apache.maven.continuum.utils.shell.ExecutionResult;
-
+import org.apache.maven.continuum.utils.shell.ShellCommandHelper;
+import org.codehaus.plexus.commandline.ExecutableResolver;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.commandline.ExecutableResolver;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java Sat Jul 23 11:40:50 2005
@@ -16,16 +16,15 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.continuum.execution.AbstractBuildExecutor;
import org.apache.maven.continuum.execution.ContinuumBuildExecutionResult;
import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
import org.apache.maven.continuum.execution.ContinuumBuildExecutorException;
import org.apache.maven.continuum.project.AntProject;
import org.apache.maven.continuum.project.ContinuumProject;
-
import org.codehaus.plexus.util.StringUtils;
+
+import java.io.File;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java Sat Jul 23 11:40:50 2005
@@ -16,15 +16,14 @@
* limitations under the License.
*/
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
-
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
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=224502&r1=224501&r2=224502&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 Sat Jul 23 11:40:50 2005
@@ -16,21 +16,20 @@
* limitations under the License.
*/
-import java.io.File;
-import java.io.FileReader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
import org.apache.maven.continuum.notification.ContinuumRecipientSource;
import org.apache.maven.continuum.project.ContinuumNotifier;
import org.apache.maven.continuum.project.MavenOneProject;
-
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
+
+import java.io.File;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
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=224502&r1=224501&r2=224502&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 Sat Jul 23 11:40:50 2005
@@ -16,16 +16,15 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.continuum.execution.AbstractBuildExecutor;
import org.apache.maven.continuum.execution.ContinuumBuildExecutionResult;
import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
import org.apache.maven.continuum.execution.ContinuumBuildExecutorException;
import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.project.MavenOneProject;
-
import org.codehaus.plexus.util.StringUtils;
+
+import java.io.File;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
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=224502&r1=224501&r2=224502&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 Sat Jul 23 11:40:50 2005
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.continuum.project.MavenOneProject;
+
+import java.io.File;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Sat Jul 23 11:40:50 2005
@@ -19,16 +19,16 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.continuum.project.ContinuumDependency;
import org.apache.maven.continuum.project.ContinuumDeveloper;
import org.apache.maven.continuum.project.ContinuumNotifier;
import org.apache.maven.continuum.project.MavenTwoProject;
-import org.apache.maven.continuum.project.ContinuumDependency;
import org.apache.maven.model.CiManagement;
+import org.apache.maven.model.Dependency;
import org.apache.maven.model.Developer;
import org.apache.maven.model.Notifier;
import org.apache.maven.model.Repository;
import org.apache.maven.model.Scm;
-import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.settings.MavenSettingsBuilder;
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java Sat Jul 23 11:40:50 2005
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.continuum.project.MavenTwoProject;
import org.apache.maven.project.MavenProject;
+
+import java.io.File;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java Sat Jul 23 11:40:50 2005
@@ -16,16 +16,15 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.continuum.execution.AbstractBuildExecutor;
import org.apache.maven.continuum.execution.ContinuumBuildExecutionResult;
import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
import org.apache.maven.continuum.execution.ContinuumBuildExecutorException;
import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.project.MavenTwoProject;
-
import org.codehaus.plexus.util.StringUtils;
+
+import java.io.File;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java Sat Jul 23 11:40:50 2005
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.continuum.execution.AbstractBuildExecutor;
import org.apache.maven.continuum.execution.ContinuumBuildExecutionResult;
import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
import org.apache.maven.continuum.execution.ContinuumBuildExecutorException;
import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.project.ShellProject;
+
+import java.io.File;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/ContinuumInitializer.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/ContinuumInitializer.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/ContinuumInitializer.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/ContinuumInitializer.java Sat Jul 23 11:40:50 2005
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.initialization;
-import org.apache.maven.continuum.project.ContinuumProjectGroup;
import org.apache.maven.continuum.project.ContinuumBuildSettings;
+import org.apache.maven.continuum.project.ContinuumProjectGroup;
/*
* Copyright 2004-2005 The Apache Software Foundation.
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java Sat Jul 23 11:40:50 2005
@@ -1,10 +1,10 @@
package org.apache.maven.continuum.initialization;
-import org.apache.maven.continuum.project.ContinuumProjectGroup;
+import org.apache.maven.continuum.build.settings.BuildSettingsConstants;
import org.apache.maven.continuum.project.ContinuumBuildSettings;
+import org.apache.maven.continuum.project.ContinuumProjectGroup;
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.apache.maven.continuum.build.settings.BuildSettingsConstants;
import org.codehaus.plexus.logging.AbstractLogEnabled;
/*
@@ -48,7 +48,8 @@
public static final String DEFAULT_BUILD_SETTINGS_NAME = "DEFAULT_BUILD_SETTINGS";
// Cron expression for execution every hour.
- public static final String DEFAULT_BUILD_SETTINGS_CRON_EXPRESSION = "0 0 * * * ?";
+ //public static final String DEFAULT_BUILD_SETTINGS_CRON_EXPRESSION = "0 0 * * * ?";
+ public static final String DEFAULT_BUILD_SETTINGS_CRON_EXPRESSION = "0 * * * * ?";
// ----------------------------------------------------------------------
// Default project group and build settings
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/ContinuumRecipientSource.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/ContinuumRecipientSource.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/ContinuumRecipientSource.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/ContinuumRecipientSource.java Sat Jul 23 11:40:50 2005
@@ -16,19 +16,18 @@
* limitations under the License.
*/
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.maven.continuum.project.ContinuumNotifier;
import org.apache.maven.continuum.project.ContinuumProject;
-
import org.codehaus.plexus.notification.AbstractRecipientSource;
import org.codehaus.plexus.notification.NotificationException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.util.StringUtils;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java Sat Jul 23 11:40:50 2005
@@ -16,23 +16,21 @@
* limitations under the License.
*/
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.maven.continuum.project.ContinuumBuild;
import org.apache.maven.continuum.project.ContinuumNotifier;
import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
-
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.notification.NotificationException;
import org.codehaus.plexus.notification.RecipientSource;
import org.codehaus.plexus.notification.notifier.Notifier;
import org.codehaus.plexus.notification.notifier.manager.NotifierManager;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java Sat Jul 23 11:40:50 2005
@@ -16,17 +16,16 @@
* limitations under the License.
*/
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
import org.apache.maven.continuum.project.ContinuumBuild;
import org.apache.maven.continuum.project.ContinuumProject;
-
import org.codehaus.plexus.notification.NotificationException;
import org.codehaus.plexus.notification.notifier.AbstractNotifier;
import org.codehaus.plexus.util.StringUtils;
+
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java Sat Jul 23 11:40:50 2005
@@ -16,10 +16,10 @@
* limitations under the License.
*/
+import org.apache.maven.continuum.project.ContinuumProjectState;
+
import java.text.SimpleDateFormat;
import java.util.Date;
-
-import org.apache.maven.continuum.project.ContinuumProjectState;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java Sat Jul 23 11:40:50 2005
@@ -16,15 +16,6 @@
* limitations under the License.
*/
-import java.io.StringWriter;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
@@ -36,7 +27,6 @@
import org.apache.maven.continuum.store.ContinuumStoreException;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.exception.ResourceNotFoundException;
-
import org.codehaus.plexus.mailsender.MailMessage;
import org.codehaus.plexus.mailsender.MailSender;
import org.codehaus.plexus.mailsender.MailSenderException;
@@ -45,6 +35,15 @@
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.velocity.VelocityComponent;
+
+import java.io.StringWriter;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java Sat Jul 23 11:40:50 2005
@@ -16,11 +16,10 @@
* limitations under the License.
*/
-import java.util.Map;
-
import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
-
import org.codehaus.plexus.logging.AbstractLogEnabled;
+
+import java.util.Map;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
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=224502&r1=224501&r2=224502&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 Sat Jul 23 11:40:50 2005
@@ -16,10 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
import org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor;
import org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelper;
import org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelperException;
@@ -27,7 +23,10 @@
import org.apache.maven.continuum.project.builder.AbstractContinuumProjectBuilder;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
-import org.apache.maven.continuum.utils.ContinuumUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Sat Jul 23 11:40:50 2005
@@ -28,7 +28,6 @@
import org.apache.maven.continuum.utils.ContinuumUtils;
import org.apache.maven.model.IssueManagement;
import org.apache.maven.project.MavenProject;
-
import org.codehaus.plexus.util.StringUtils;
import java.io.IOException;
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumBuildJob.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumBuildJob.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumBuildJob.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumBuildJob.java Sat Jul 23 11:40:50 2005
@@ -1,19 +1,16 @@
package org.apache.maven.continuum.scheduler;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobDetail;
-import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.project.ContinuumSchedule;
+import org.apache.maven.continuum.Continuum;
+import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.project.ContinuumBuildSettings;
import org.apache.maven.continuum.project.ContinuumProjectGroup;
-import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.Continuum;
import org.codehaus.plexus.logging.Logger;
+import org.quartz.Job;
+import org.quartz.JobDetail;
+import org.quartz.JobExecutionContext;
import java.util.Iterator;
import java.util.Set;
-import java.util.Collection;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -36,6 +33,12 @@
Logger logger = (Logger) jobDetail.getJobDataMap().get( ContinuumSchedulerConstants.LOGGER );
+ logger.info( ">>>>>>>>>>>>>>>>>>>>> Executing build job ..." );
+
+ return;
+
+ /*
+
Continuum continuum = (Continuum) jobDetail.getJobDataMap().get( ContinuumSchedulerConstants.CONTINUUM );
ContinuumBuildSettings buildSettings = (ContinuumBuildSettings) jobDetail.getJobDataMap().get( ContinuumSchedulerConstants.BUILD_SETTINGS );
@@ -50,21 +53,16 @@
{
ContinuumProjectGroup projectGroup = (ContinuumProjectGroup) iterator.next();
- Set projects = projectGroup.getProjects();
-
- for ( Iterator j = projects.iterator(); j.hasNext(); )
+ try
{
- ContinuumProject project = (ContinuumProject) j.next();
-
- try
- {
- continuum.buildProject( project.getId(), false );
- }
- catch ( ContinuumException ex )
- {
- logger.error( "Could not enqueue project: " + project.getId() + " ('" + project.getName() + "').", ex );
- }
+ continuum.buildProjectGroup( projectGroup, buildSettings );
+ }
+ catch ( ContinuumException e )
+ {
+ logger.error( "Error building project group.", e );
}
}
+
+ */
}
}
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumScheduler.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumScheduler.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumScheduler.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/ContinuumScheduler.java Sat Jul 23 11:40:50 2005
@@ -1,9 +1,8 @@
package org.apache.maven.continuum.scheduler;
import org.quartz.JobDetail;
-import org.quartz.Trigger;
-import org.quartz.SchedulerException;
import org.quartz.JobListener;
+import org.quartz.Trigger;
import org.quartz.TriggerListener;
public interface ContinuumScheduler
@@ -15,5 +14,8 @@
void addGlobalJobListener( JobListener listener );
- void addGlobalTriggerListener( TriggerListener listener );
+ void addGlobalTriggerListener( TriggerListener listener );
+
+ boolean jobExists( String jobGroup, String jobName )
+ throws ContinuumSchedulerException;
}
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scheduler/DefaultContinuumScheduler.java Sat Jul 23 11:40:50 2005
@@ -1,34 +1,35 @@
package org.apache.maven.continuum.scheduler;
+import org.apache.maven.continuum.Continuum;
+import org.apache.maven.continuum.project.ContinuumSchedule;
+import org.codehaus.plexus.PlexusConstants;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.context.Context;
+import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
-import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.context.Context;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.quartz.CronTrigger;
+import org.quartz.JobDataMap;
import org.quartz.JobDetail;
+import org.quartz.JobListener;
+import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.SchedulerFactory;
import org.quartz.Trigger;
-import org.quartz.JobListener;
import org.quartz.TriggerListener;
-import org.quartz.JobDataMap;
-import org.quartz.CronTrigger;
-import org.quartz.Scheduler;
+import org.quartz.Job;
import org.quartz.impl.StdScheduler;
import org.quartz.impl.StdSchedulerFactory;
-import org.apache.maven.continuum.project.ContinuumSchedule;
-import org.apache.maven.continuum.Continuum;
-import java.util.Properties;
-import java.util.Date;
import java.text.ParseException;
+import java.util.Date;
+import java.util.Properties;
public class DefaultContinuumScheduler
extends AbstractLogEnabled
@@ -44,10 +45,30 @@
//
// ----------------------------------------------------------------------
- public void scheduleJob( ContinuumSchedule schedule )
+ public boolean jobExists( String jobName, String jobGroup )
throws ContinuumSchedulerException
{
- scheduleJob( createJobDetail( schedule ), createTrigger( schedule ) );
+ String[] jobNames = null;
+
+ try
+ {
+ jobNames = scheduler.getJobNames( jobGroup );
+ }
+ catch ( SchedulerException e )
+ {
+ throw new ContinuumSchedulerException( "Error getting job.", e );
+ }
+
+ for ( int i = 0; i < jobNames.length; i++ )
+ {
+ String name = jobNames[i];
+
+ if ( jobName.equals( name ) );
+
+ return true;
+ }
+
+ return false;
}
/**
@@ -123,6 +144,13 @@
public void scheduleJob( JobDetail jobDetail, Trigger trigger )
throws ContinuumSchedulerException
{
+ if ( jobExists( jobDetail.getName(), jobDetail.getGroup()) )
+ {
+ getLogger().warn( "Will not schedule this job as a job {" + jobDetail.getName() + ":" + jobDetail.getGroup() + "} already exists." );
+
+ return;
+ }
+
try
{
scheduler.scheduleJob( jobDetail, trigger );
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScm.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScm.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScm.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/ContinuumScm.java Sat Jul 23 11:40:50 2005
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.apache.maven.continuum.project.ContinuumProject;
+
+import java.io.File;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java Sat Jul 23 11:40:50 2005
@@ -16,10 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-
import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -30,6 +26,10 @@
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.scm.ScmManager;
import org.codehaus.plexus.util.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTask.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTask.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTask.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTask.java Sat Jul 23 11:40:50 2005
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.codehaus.plexus.taskqueue.Task;
+
+import java.io.File;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java Sat Jul 23 11:40:50 2005
@@ -16,16 +16,15 @@
* limitations under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.maven.continuum.core.action.CheckoutProjectContinuumAction;
-
import org.codehaus.plexus.action.ActionManager;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.taskqueue.Task;
import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
+
+import java.util.HashMap;
+import java.util.Map;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/AbstractContinuumStore.java Sat Jul 23 11:40:50 2005
@@ -16,13 +16,12 @@
* limitations under the License.
*/
-import java.io.File;
-import java.io.IOException;
-
import org.apache.maven.continuum.configuration.ConfigurationService;
-
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java Sat Jul 23 11:40:50 2005
@@ -16,32 +16,30 @@
* limitations under the License.
*/
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.jdo.Extent;
-import javax.jdo.JDOObjectNotFoundException;
-import javax.jdo.JDOUserException;
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-import javax.jdo.Query;
-import javax.jdo.Transaction;
-
import org.apache.maven.continuum.project.ContinuumBuild;
-import org.apache.maven.continuum.project.ContinuumProject;
-import org.apache.maven.continuum.project.ContinuumProjectState;
-import org.apache.maven.continuum.project.ContinuumSchedule;
-import org.apache.maven.continuum.project.ContinuumProjectGroup;
import org.apache.maven.continuum.project.ContinuumBuildGroup;
import org.apache.maven.continuum.project.ContinuumBuildSettings;
import org.apache.maven.continuum.project.ContinuumNotifier;
+import org.apache.maven.continuum.project.ContinuumProject;
+import org.apache.maven.continuum.project.ContinuumProjectGroup;
+import org.apache.maven.continuum.project.ContinuumProjectState;
+import org.apache.maven.continuum.project.ContinuumSchedule;
import org.apache.maven.continuum.scm.ScmResult;
-
import org.codehaus.plexus.jdo.JdoFactory;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+
+import javax.jdo.Extent;
+import javax.jdo.JDOObjectNotFoundException;
+import javax.jdo.JDOUserException;
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+import javax.jdo.Query;
+import javax.jdo.Transaction;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/AbstractContinuumTrigger.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/AbstractContinuumTrigger.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/AbstractContinuumTrigger.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/AbstractContinuumTrigger.java Sat Jul 23 11:40:50 2005
@@ -17,7 +17,6 @@
*/
import org.apache.maven.continuum.Continuum;
-
import org.codehaus.plexus.logging.AbstractLogEnabled;
/**
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/alarmclock/AlarmClockTrigger.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/alarmclock/AlarmClockTrigger.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/alarmclock/AlarmClockTrigger.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/alarmclock/AlarmClockTrigger.java Sat Jul 23 11:40:50 2005
@@ -16,17 +16,16 @@
* limitations under the License.
*/
-import java.util.Iterator;
-import java.util.Timer;
-import java.util.TimerTask;
-
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.trigger.AbstractContinuumTrigger;
-
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
+
+import java.util.Iterator;
+import java.util.Timer;
+import java.util.TimerTask;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/quartz/QuartzAlarmClockTrigger.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/quartz/QuartzAlarmClockTrigger.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/quartz/QuartzAlarmClockTrigger.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/trigger/quartz/QuartzAlarmClockTrigger.java Sat Jul 23 11:40:50 2005
@@ -1,19 +1,18 @@
package org.apache.maven.continuum.trigger.quartz;
-import org.apache.maven.continuum.scheduler.ContinuumScheduler;
import org.apache.maven.continuum.scheduler.ContinuumBuildJob;
+import org.apache.maven.continuum.scheduler.ContinuumScheduler;
import org.apache.maven.continuum.trigger.AbstractContinuumTrigger;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException;
+import org.quartz.CronTrigger;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
-import org.quartz.SchedulerException;
-import org.quartz.CronTrigger;
-import java.util.Date;
import java.text.ParseException;
+import java.util.Date;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java?rev=224502&r1=224501&r2=224502&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java Sat Jul 23 11:40:50 2005
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-import java.io.File;
-
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
+
+import java.io.File;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>