You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ca...@apache.org on 2006/08/26 05:47:43 UTC
svn commit: r437067 [1/2] - in /maven/continuum/branches/continuum-acegi:
continuum-api/src/main/java/org/apache/maven/continuum/build/settings/
continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/
continuum-core/src/main/java/org/a...
Author: carlos
Date: Fri Aug 25 20:47:41 2006
New Revision: 437067
URL: http://svn.apache.org/viewvc?rev=437067&view=rev
Log:
Merged rev# 433444-437057 from trunk
Added:
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/mdo/session-models.mdo
- copied unchanged from r437057, maven/continuum/trunk/continuum-webapp/src/main/mdo/session-models.mdo
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/mdo/view-models.mdo
- copied unchanged from r437057, maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/index.jsp
- copied unchanged from r437057, maven/continuum/trunk/continuum-webapp/src/main/webapp/index.jsp
Removed:
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/mdo/view-models.xml
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/index.html
Modified:
maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsConstants.java
maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivationException.java
maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivator.java
maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildContext.java
maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumUnitTest.java
maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/FormatterToolTest.java
maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml
maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-model/pom.xml
maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-irc/pom.xml
maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-jabber/pom.xml
maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/pom.xml
maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-plexus-application/pom.xml
maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-web/pom.xml
maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-xmlrpc/pom.xml
maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/pom.xml
maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configurationEdit.jsp
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp
Modified: maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsConstants.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsConstants.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsConstants.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsConstants.java Fri Aug 25 20:47:41 2006
@@ -18,7 +18,7 @@
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id:$
+ * @version $Id$
*/
public class BuildSettingsConstants
{
Modified: maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivationException.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivationException.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivationException.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivationException.java Fri Aug 25 20:47:41 2006
@@ -2,7 +2,7 @@
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id:$
+ * @version $Id$
*/
public class SchedulesActivationException
extends Exception
Modified: maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivator.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivator.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivator.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivator.java Fri Aug 25 20:47:41 2006
@@ -21,7 +21,7 @@
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id:$
+ * @version $Id$
*/
public interface SchedulesActivator
{
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildContext.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildContext.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildContext.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildContext.java Fri Aug 25 20:47:41 2006
@@ -1,5 +1,21 @@
package org.apache.maven.continuum.buildcontroller;
+/*
+ * Copyright 2004-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import org.apache.maven.continuum.core.action.AbstractContinuumAction;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.BuildResult;
@@ -18,7 +34,6 @@
*/
public class BuildContext
{
-
private long startTime;
private Project project;
@@ -125,5 +140,4 @@
{
this.trigger = trigger;
}
-
}
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Fri Aug 25 20:47:41 2006
@@ -93,15 +93,16 @@
{
MavenProject mavenProject;
- try {
+ try
+ {
mavenProject = builderHelper.getMavenProject( result, createMetadataFile( url, username, password ) );
-
- if( (result != null) && result.hasErrors())
+
+ if ( result.hasErrors() )
{
return;
}
}
- catch (MalformedURLException e)
+ catch ( MalformedURLException e )
{
getLogger().debug( "Error adding project: Malformed URL " + url, e );
result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL );
@@ -118,7 +119,8 @@
{
ProjectGroup projectGroup = buildProjectGroup( mavenProject, result );
- // project groups have the top lvl build definition which is the default build defintion for the sub projects
+ // project groups have the top lvl build definition which is the default build defintion for the sub
+ // projects
if ( projectGroup != null )
{
BuildDefinition bd = new BuildDefinition();
@@ -145,7 +147,7 @@
// jdo complains that Collections.singletonList(bd) is a second class object and fails.
ArrayList arrayList = new ArrayList();
- arrayList.add(bd);
+ arrayList.add( bd );
projectGroup.setBuildDefinitions( arrayList );
@@ -155,14 +157,7 @@
if ( !excludedPackagingTypes.contains( mavenProject.getPackaging() ) )
{
- String defaultGoal = "clean install";
-
- if ( mavenProject.getBuild() != null && mavenProject.getBuild().getDefaultGoal() != null )
- {
- defaultGoal = mavenProject.getBuild().getDefaultGoal();
- }
-
- Project continuumProject = new Project();
+ Project continuumProject = new Project();
builderHelper.mapMavenProjectToContinuumProject( result, mavenProject, continuumProject );
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumUnitTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumUnitTest.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumUnitTest.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumUnitTest.java Fri Aug 25 20:47:41 2006
@@ -25,7 +25,7 @@
/**
* Test for {@link DefaultContinuum}.
- *
+ *
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
* @version $Id$
*/
@@ -42,7 +42,7 @@
Mock actionManagerMock = new Mock( ActionManager.class );
- actionManagerMock.expects( once() ).will( returnValue( (Action) actionMock.proxy() ) );
+ actionManagerMock.expects( once() ).will( returnValue( actionMock.proxy() ) );
continuum.setActionManager( (ActionManager) actionManagerMock.proxy() );
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/FormatterToolTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/FormatterToolTest.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/FormatterToolTest.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/FormatterToolTest.java Fri Aug 25 20:47:41 2006
@@ -1,6 +1,3 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
- */
package org.apache.maven.continuum.notification.mail;
import junit.framework.TestCase;
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java Fri Aug 25 20:47:41 2006
@@ -18,6 +18,7 @@
import org.apache.maven.continuum.AbstractContinuumTest;
import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.project.ProjectDependency;
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.model.project.ProjectNotifier;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
@@ -42,8 +43,8 @@
public void testGetEmailAddressWhenTypeIsSetToEmail()
throws Exception
{
- ContinuumProjectBuilder projectBuilder =
- (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, MavenTwoContinuumProjectBuilder.ID );
+ ContinuumProjectBuilder projectBuilder = (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE,
+ MavenTwoContinuumProjectBuilder.ID );
File pom = getTestFile( "src/test/repository/maven-builder-helper-1.xml" );
@@ -73,8 +74,8 @@
public void testGetEmailAddressWhenTypeIsntSet()
throws Exception
{
- ContinuumProjectBuilder projectBuilder =
- (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, MavenTwoContinuumProjectBuilder.ID );
+ ContinuumProjectBuilder projectBuilder = (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE,
+ MavenTwoContinuumProjectBuilder.ID );
File pom = getTestFile( "src/test/repository/maven-builder-helper-2.xml" );
@@ -104,8 +105,8 @@
public void testGetScmUrlWithParams()
throws Exception
{
- ContinuumProjectBuilder projectBuilder =
- (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, MavenTwoContinuumProjectBuilder.ID );
+ ContinuumProjectBuilder projectBuilder = (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE,
+ MavenTwoContinuumProjectBuilder.ID );
File pom = getTestFile( "src/test/repository/maven-builder-helper-3.xml" );
@@ -143,19 +144,26 @@
public void testCreateProjectsWithModules()
throws Exception
{
- ContinuumProjectBuilder projectBuilder =
- (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE, MavenTwoContinuumProjectBuilder.ID );
+ ContinuumProjectBuilder projectBuilder = (ContinuumProjectBuilder) lookup( ContinuumProjectBuilder.ROLE,
+ MavenTwoContinuumProjectBuilder.ID );
- String url = getTestFile( "src/test/resources/projects/continuum/pom.xml" ).toURL().toExternalForm();
+ URL url = getClass().getClassLoader().getResource( "projects/continuum/pom.xml" );
// Eat System.out
PrintStream ps = System.out;
- System.setOut( new PrintStream( new ByteArrayOutputStream() ) );
+ ContinuumProjectBuildingResult result;
- ContinuumProjectBuildingResult result = projectBuilder.buildProjectsFromMetadata( new URL( url ), null, null );
+ try
+ {
+ System.setOut( new PrintStream( new ByteArrayOutputStream() ) );
- System.setOut( ps );
+ result = projectBuilder.buildProjectsFromMetadata( url, null, null );
+ }
+ finally
+ {
+ System.setOut( ps );
+ }
assertNotNull( result );
@@ -185,7 +193,7 @@
assertEquals( "projectGroup.description", "Continuum Project Description", projectGroup.getDescription() );
-// assertEquals( "projectGroup.url", "http://cvs.continuum.codehaus.org/", projectGroup.getUrl() );
+ // assertEquals( "projectGroup.url", "http://cvs.continuum.codehaus.org/", projectGroup.getUrl() );
// ----------------------------------------------------------------------
// Assert the projects built
@@ -193,7 +201,7 @@
assertNotNull( result.getProjects() );
- assertEquals( 6, result.getProjects().size() );
+ assertEquals( 9, result.getProjects().size() );
Map projects = new HashMap();
@@ -211,6 +219,45 @@
assertMavenTwoProject( "Continuum Plexus Application", projects );
assertMavenTwoProject( "Continuum Web", projects );
assertMavenTwoProject( "Continuum XMLRPC Interface", projects );
+ assertMavenTwoProject( "Continuum Notifiers", projects );
+ assertMavenTwoProject( "Continuum IRC Notifier", projects );
+ assertMavenTwoProject( "Continuum Jabber Notifier", projects );
+
+ assertEquals( "continuum-parent-notifiers",
+ ( (Project) projects.get( "Continuum IRC Notifier" ) ).getParent().getArtifactId() );
+
+ assertEquals( "continuum-parent-notifiers",
+ ( (Project) projects.get( "Continuum Jabber Notifier" ) ).getParent().getArtifactId() );
+
+ assertDependency( "Continuum Model", "Continuum Web", projects );
+
+ }
+
+ private void assertDependency( String dep, String proj, Map projects )
+ {
+ Project p = (Project) projects.get( proj );
+
+ Project dependency = (Project) projects.get( dep );
+
+ assertNotNull( p );
+
+ assertNotNull( dependency );
+
+ assertNotNull( p.getDependencies() );
+
+ for ( Iterator i = p.getDependencies().iterator(); i.hasNext(); )
+ {
+ ProjectDependency pd = (ProjectDependency) i.next();
+
+ if ( pd.getArtifactId().equals( dependency.getArtifactId() )
+ && pd.getGroupId().equals( dependency.getGroupId() )
+ && pd.getVersion().equals( dependency.getVersion() ) )
+ {
+ return;
+ }
+ }
+
+ assertFalse( true );
}
// ----------------------------------------------------------------------
@@ -225,7 +272,7 @@
assertEquals( name, project.getName() );
- String scmUrl = "scm:svn:http://svn.apache.org/repos/asf/maven/continuum/trunk";
+ String scmUrl = "scm:svn:http://svn.apache.org/repos/asf/maven/continuum/tags";
assertTrue( project.getScmUrl().startsWith( scmUrl ) );
}
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml Fri Aug 25 20:47:41 2006
@@ -3,7 +3,7 @@
<parent>
<artifactId>continuum-parent</artifactId>
<groupId>org.apache.maven.continuum</groupId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0.3</version>
</parent>
<artifactId>continuum-core</artifactId>
<name>Continuum Core</name>
@@ -11,7 +11,7 @@
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-model</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0.3</version>
</dependency>
<!--
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-model/pom.xml?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-model/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-model/pom.xml Fri Aug 25 20:47:41 2006
@@ -2,7 +2,7 @@
<parent>
<artifactId>continuum-parent</artifactId>
<groupId>org.apache.maven.continuum</groupId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>continuum-model</artifactId>
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-irc/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-irc/pom.xml?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-irc/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-irc/pom.xml Fri Aug 25 20:47:41 2006
@@ -12,6 +12,7 @@
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-notifier-api</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-jabber/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-jabber/pom.xml?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-jabber/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/continuum-notifier-jabber/pom.xml Fri Aug 25 20:47:41 2006
@@ -12,6 +12,7 @@
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-notifier-api</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/pom.xml?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-notifiers/pom.xml Fri Aug 25 20:47:41 2006
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-parent</artifactId>
- <version>1.0-alpha-4</version>
+ <version>1.0.3</version>
</parent>
<artifactId>continuum-parent-notifiers</artifactId>
<version>1.0-alpha-4</version>
@@ -13,10 +13,12 @@
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-api</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-notification</artifactId>
+ <version>1.0-alpha-5</version>
</dependency>
</dependencies>
<modules>
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-plexus-application/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-plexus-application/pom.xml?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-plexus-application/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-plexus-application/pom.xml Fri Aug 25 20:47:41 2006
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-parent</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0.3</version>
</parent>
<artifactId>continuum-plexus-application</artifactId>
<name>Continuum Plexus Application</name>
@@ -11,12 +11,12 @@
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-web</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-xmlrpc</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0.3</version>
</dependency>
<!-- Version overrides -->
<dependency>
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-web/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-web/pom.xml?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-web/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-web/pom.xml Fri Aug 25 20:47:41 2006
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-parent</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0.3</version>
</parent>
<artifactId>continuum-web</artifactId>
<name>Continuum Web</name>
@@ -11,12 +11,12 @@
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-model</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-core</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0.3</version>
</dependency>
<!--
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-xmlrpc/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-xmlrpc/pom.xml?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-xmlrpc/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/continuum-xmlrpc/pom.xml Fri Aug 25 20:47:41 2006
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-parent</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0.3</version>
</parent>
<artifactId>continuum-xmlrpc</artifactId>
<name>Continuum XMLRPC Interface</name>
@@ -11,12 +11,12 @@
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-model</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-core</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0.3</version>
</dependency>
</dependencies>
</project>
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/pom.xml?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/test/resources/projects/continuum/pom.xml Fri Aug 25 20:47:41 2006
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-parent</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0.3</version>
<packaging>pom</packaging>
<name>Continuum Parent Project</name>
<description>Continuum Project Description</description>
@@ -73,8 +73,8 @@
</dependency>
</dependencies>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/continuum/trunk</connection>
- <url>http://svn.apache.org/viewcvs.cgi/maven/continuum/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/continuum/tags/continuum-1.0.3</connection>
+ <url>http://svn.apache.org/viewcvs.cgi/maven/continuum/tags/continuum-1.0.3</url>
</scm>
<organization>
<name>Apache</name>
@@ -93,6 +93,7 @@
<module>continuum-plexus-application</module>
<module>continuum-web</module>
<module>continuum-xmlrpc</module>
+ <module>continuum-notifiers</module>
<module>I'm-not-here-project</module>
</modules>
</project>
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml Fri Aug 25 20:47:41 2006
@@ -59,13 +59,23 @@
<version>1.0-alpha-8</version>
<executions>
<execution>
- <id>project summary model</id>
+ <id>web summary model classes</id>
<configuration>
- <model>src/main/mdo/view-models.xml</model>
+ <model>src/main/mdo/view-models.mdo</model>
<version>1.0.0</version>
</configuration>
<goals>
<goal>java</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>session model classes</id>
+ <configuration>
+ <model>src/main/mdo/session-models.mdo</model>
+ <version>1.0.0</version>
+ </configuration>
+ <goals>
+ <goal>java</goal>
</goals>
</execution>
</executions>
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java Fri Aug 25 20:47:41 2006
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.web.action;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.continuum.Continuum;
+import java.util.Map;
+
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.ProjectNotifier;
-import org.apache.maven.continuum.web.action.ContinuumActionSupport;
-
-import java.util.Map;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -30,8 +28,6 @@
public abstract class AbstractNotifierEditAction
extends ContinuumActionSupport
{
- private Continuum continuum;
-
private ProjectNotifier notifier;
private int projectId;
@@ -76,11 +72,11 @@
if ( !isNew )
{
- continuum.updateNotifier( projectId, notifier );
+ getContinuum().updateNotifier( projectId, notifier );
}
else
{
- continuum.addNotifier( projectId, notifier );
+ getContinuum().addNotifier( projectId, notifier );
}
return SUCCESS;
@@ -118,7 +114,7 @@
private ProjectNotifier getNotifier()
throws ContinuumException
{
- return continuum.getNotifier( projectId, notifierId );
+ return getContinuum().getNotifier( projectId, notifierId );
}
public int getProjectId()
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java Fri Aug 25 20:47:41 2006
@@ -22,7 +22,7 @@
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
/**
- * Add a Maven 1 project to continuum.
+ * Add a Maven 1 project to Continuum.
*
* @author Nick Gonzalez
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
@@ -39,7 +39,7 @@
protected ContinuumProjectBuildingResult doExecute( String pomUrl )
throws ContinuumException
{
- return continuum.addMavenOneProject( pomUrl );
+ return getContinuum().addMavenOneProject( pomUrl );
}
/**
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Fri Aug 25 20:47:41 2006
@@ -22,7 +22,7 @@
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
/**
- * Add a Maven 2 project to continuum.
+ * Add a Maven 2 project to Continuum.
*
* @author Nick Gonzalez
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
@@ -39,7 +39,7 @@
protected ContinuumProjectBuildingResult doExecute( String pomUrl )
throws ContinuumException
{
- return continuum.addMavenTwoProject( pomUrl );
+ return getContinuum().addMavenTwoProject( pomUrl );
}
public String doDefault()
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Fri Aug 25 20:47:41 2006
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.web.action;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@
project.setScmTag( projectScmTag );
- continuum.addProject( project, projectType );
+ getContinuum().addProject( project, projectType );
return SUCCESS;
}
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java Fri Aug 25 20:47:41 2006
@@ -1,17 +1,7 @@
package org.apache.maven.continuum.web.action;
-import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.model.project.BuildDefinition;
-import org.apache.maven.continuum.model.project.Schedule;
-import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.web.exception.ContinuumActionException;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,6 +16,17 @@
* limitations under the License.
*/
+import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.model.project.BuildDefinition;
+import org.apache.maven.continuum.model.project.Schedule;
+import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.web.exception.ContinuumActionException;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
/**
* BuildDefinitionAction:
*
@@ -72,7 +73,7 @@
{
schedules = new HashMap();
- Collection allSchedules = continuum.getSchedules();
+ Collection allSchedules = getContinuum().getSchedules();
for ( Iterator i = allSchedules.iterator(); i.hasNext(); )
{
@@ -94,7 +95,7 @@
/**
* if there is a build definition id set, then retrieve it..either way set us to up to work with build definition
*
- * @return
+ * @return action result
*/
public String input()
{
@@ -104,11 +105,11 @@
{
if ( projectId != 0 )
{
- executor = continuum.getProject( projectId ).getExecutorId();
+ executor = getContinuum().getProject( projectId ).getExecutorId();
}
else
{
- Project project = (Project)continuum.getProjectGroup( projectGroupId ).getProjects().get( 0 );
+ Project project = (Project) getContinuum().getProjectGroup( projectGroupId ).getProjects().get( 0 );
executor = project.getExecutorId();
}
@@ -125,7 +126,7 @@
{
try
{
- BuildDefinition buildDefinition = continuum.getBuildDefinition( buildDefinitionId );
+ BuildDefinition buildDefinition = getContinuum().getBuildDefinition( buildDefinitionId );
goals = buildDefinition.getGoals();
arguments = buildDefinition.getArguments();
buildFile = buildDefinition.getBuildFile();
@@ -149,11 +150,11 @@
{
if ( buildDefinitionId == 0 )
{
- continuum.addBuildDefinitionToProject( projectId, getBuildDefinitionFromInput() );
+ getContinuum().addBuildDefinitionToProject( projectId, getBuildDefinitionFromInput() );
}
else
{
- continuum.updateBuildDefinitionForProject( projectId, getBuildDefinitionFromInput() );
+ getContinuum().updateBuildDefinitionForProject( projectId, getBuildDefinitionFromInput() );
}
}
catch ( ContinuumActionException cae )
@@ -177,11 +178,11 @@
{
if ( buildDefinitionId == 0 )
{
- continuum.addBuildDefinitionToProjectGroup( projectGroupId, getBuildDefinitionFromInput() );
+ getContinuum().addBuildDefinitionToProjectGroup( projectGroupId, getBuildDefinitionFromInput() );
}
else
{
- continuum.updateBuildDefinitionForProjectGroup( projectGroupId, getBuildDefinitionFromInput() );
+ getContinuum().updateBuildDefinitionForProjectGroup( projectGroupId, getBuildDefinitionFromInput() );
}
}
catch ( ContinuumActionException cae )
@@ -205,7 +206,7 @@
{
try
{
- continuum.removeBuildDefinitionFromProject( projectId, buildDefinitionId );
+ getContinuum().removeBuildDefinitionFromProject( projectId, buildDefinitionId );
return SUCCESS;
}
@@ -228,7 +229,7 @@
{
try
{
- continuum.removeBuildDefinitionFromProject( projectGroupId, buildDefinitionId );
+ getContinuum().removeBuildDefinitionFromProject( projectGroupId, buildDefinitionId );
return SUCCESS;
}
@@ -253,7 +254,7 @@
try
{
- schedule = continuum.getSchedule( scheduleId );
+ schedule = getContinuum().getSchedule( scheduleId );
}
catch ( ContinuumException e )
{
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java Fri Aug 25 20:47:41 2006
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.web.action;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,11 +37,11 @@
{
if ( projectId > 0 )
{
- continuum.buildProject( projectId );
+ getContinuum().buildProject( projectId );
}
else
{
- continuum.buildProjects();
+ getContinuum().buildProjects();
}
return SUCCESS;
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java Fri Aug 25 20:47:41 2006
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.web.action;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -47,9 +47,9 @@
public String execute()
throws ContinuumException
{
- buildResult = continuum.getBuildResult( buildId );
+ buildResult = getContinuum().getBuildResult( buildId );
- changeSet = continuum.getChangesSinceLastSuccess( projectId, buildId );
+ changeSet = getContinuum().getChangesSinceLastSuccess( projectId, buildId );
return SUCCESS;
}
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java Fri Aug 25 20:47:41 2006
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.web.action;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
public String execute()
throws ContinuumException
{
- buildResults = continuum.getBuildResultsForProject( projectId );
+ buildResults = getContinuum().getBuildResultsForProject( projectId );
return SUCCESS;
}
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java Fri Aug 25 20:47:41 2006
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.web.action;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+import org.apache.maven.continuum.configuration.ConfigurationService;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -30,7 +32,9 @@
public String execute()
{
- if ( !continuum.getConfiguration().isInitialized() )
+ ConfigurationService configuration = getContinuum().getConfiguration();
+
+ if ( ! configuration.isInitialized() )
{
return INPUT;
}
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java Fri Aug 25 20:47:41 2006
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.web.action;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,13 +16,18 @@
* limitations under the License.
*/
-import com.opensymphony.xwork.Preparable;
-import org.apache.maven.continuum.Continuum;
-import org.apache.maven.continuum.ContinuumException;
+import java.io.File;
+import java.util.Collections;
+
+import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.configuration.ConfigurationStoringException;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+import org.apache.maven.continuum.model.system.ContinuumUser;
+import org.apache.maven.continuum.model.system.UserGroup;
+import org.apache.maven.continuum.security.ContinuumSecurity;
+import org.apache.maven.continuum.store.ContinuumStore;
+import org.apache.maven.continuum.store.ContinuumStoreException;
-import java.io.File;
+import com.opensymphony.xwork.Preparable;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -33,16 +38,27 @@
* role-hint="configuration"
*/
public class ConfigurationAction
- extends PlexusActionSupport
+ extends ContinuumActionSupport
implements Preparable
{
+
/**
* @plexus.requirement
*/
- private Continuum continuum;
+ private ContinuumStore store;
private boolean guestAccountEnabled;
+ private String username;
+
+ private String password;
+
+ private String passwordTwo;
+
+ private String fullName;
+
+ private String email;
+
private String workingDirectory;
private String buildOutputDirectory;
@@ -57,40 +73,72 @@
public void prepare()
{
- guestAccountEnabled = continuum.getConfiguration().isGuestAccountEnabled();
+ ConfigurationService configuration = getContinuum().getConfiguration();
+
+ guestAccountEnabled = configuration.isGuestAccountEnabled();
- workingDirectory = continuum.getConfiguration().getWorkingDirectory().getAbsolutePath();
+ workingDirectory = configuration.getWorkingDirectory().getAbsolutePath();
- buildOutputDirectory = continuum.getConfiguration().getBuildOutputDirectory().getAbsolutePath();
+ buildOutputDirectory = configuration.getBuildOutputDirectory().getAbsolutePath();
- baseUrl = continuum.getConfiguration().getUrl();
+ baseUrl = configuration.getUrl();
- companyLogo = continuum.getConfiguration().getCompanyLogo();
+ companyLogo = configuration.getCompanyLogo();
- companyName = continuum.getConfiguration().getCompanyName();
+ companyName = configuration.getCompanyName();
- companyUrl = continuum.getConfiguration().getCompanyUrl();
+ companyUrl = configuration.getCompanyUrl();
}
public String execute()
- throws ConfigurationStoringException
+ throws ConfigurationStoringException, ContinuumStoreException
{
- continuum.getConfiguration().setGuestAccountEnabled( guestAccountEnabled );
+ //todo switch this to validation
+
+ ContinuumUser adminUser = new ContinuumUser();
- continuum.getConfiguration().setWorkingDirectory( new File( workingDirectory ) );
+ adminUser.setUsername( username );
+ adminUser.setPassword( password );
+ adminUser.setEmail( email );
+ adminUser.setFullName( fullName );
+ adminUser.setGroup( store.getUserGroup( ContinuumSecurity.ADMIN_GROUP_NAME ) );
- continuum.getConfiguration().setBuildOutputDirectory( new File( buildOutputDirectory ) );
+ store.addUser( adminUser );
+
+ ConfigurationService configuration = getContinuum().getConfiguration();
- continuum.getConfiguration().setUrl( baseUrl );
+ if ( guestAccountEnabled )
+ {
+ configuration.setGuestAccountEnabled( guestAccountEnabled );
+ }
+ else
+ {
+ configuration.setGuestAccountEnabled( false );
- continuum.getConfiguration().setCompanyLogo( companyLogo );
+ UserGroup guestGroup = store.getUserGroup( ContinuumSecurity.GUEST_GROUP_NAME );
- continuum.getConfiguration().setCompanyName( companyName );
+ guestGroup.setPermissions( Collections.EMPTY_LIST );
- continuum.getConfiguration().setCompanyUrl( companyUrl );
+ store.updateUserGroup( guestGroup );
+ }
- continuum.getConfiguration().setInitialized( true );
- continuum.getConfiguration().store();
+ configuration.setWorkingDirectory( new File( workingDirectory ) );
+
+ configuration.setWorkingDirectory( new File( workingDirectory ) );
+
+ configuration.setBuildOutputDirectory( new File( buildOutputDirectory ) );
+
+ configuration.setUrl( baseUrl );
+
+ configuration.setCompanyLogo( companyLogo );
+
+ configuration.setCompanyName( companyName );
+
+ configuration.setInitialized( true );
+ configuration.store();
+
+ configuration.setInitialized( true );
+ configuration.store();
return SUCCESS;
}
@@ -115,6 +163,56 @@
public void setGuestAccountEnabled( boolean guestAccountEnabled )
{
this.guestAccountEnabled = guestAccountEnabled;
+ }
+
+ public String getUsername()
+ {
+ return username;
+ }
+
+ public void setUsername( String username )
+ {
+ this.username = username;
+ }
+
+ public String getPassword()
+ {
+ return password;
+ }
+
+ public void setPassword( String password )
+ {
+ this.password = password;
+ }
+
+ public String getPasswordTwo()
+ {
+ return passwordTwo;
+ }
+
+ public void setPasswordTwo( String passwordTwo )
+ {
+ this.passwordTwo = passwordTwo;
+ }
+
+ public String getFullName()
+ {
+ return fullName;
+ }
+
+ public void setFullName( String fullName )
+ {
+ this.fullName = fullName;
+ }
+
+ public String getEmail()
+ {
+ return email;
+ }
+
+ public void setEmail( String email )
+ {
+ this.email = email;
}
public String getWorkingDirectory()
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java Fri Aug 25 20:47:41 2006
@@ -17,11 +17,10 @@
*
*/
+import com.opensymphony.xwork.Preparable;
import org.apache.maven.continuum.Continuum;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
-import com.opensymphony.xwork.Preparable;
-
/**
* ContinuumActionSupport
*
@@ -32,11 +31,10 @@
extends PlexusActionSupport
implements Preparable
{
-
/**
* @plexus.requirement
*/
- protected Continuum continuum;
+ private Continuum continuum;
public void prepare()
throws Exception
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java Fri Aug 25 20:47:41 2006
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.web.action;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
* limitations under the License.
*/
-import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.web.action.ContinuumActionSupport;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -41,7 +39,7 @@
public String execute()
throws ContinuumException
{
- continuum.removeNotifier( projectId, notifierId );
+ getContinuum().removeNotifier( projectId, notifierId );
return SUCCESS;
}
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java Fri Aug 25 20:47:41 2006
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.web.action;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
public String execute()
throws ContinuumException
{
- continuum.removeProject( projectId );
+ getContinuum().removeProject( projectId );
return SUCCESS;
}
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java Fri Aug 25 20:47:41 2006
@@ -1,17 +1,20 @@
package org.apache.maven.continuum.web.action;
-import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.model.project.BuildResult;
-import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.apache.maven.continuum.web.model.GroupSummary;
-import org.apache.maven.continuum.web.model.ProjectSummary;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
/*
* Copyright 2005 The Codehaus.
*
@@ -28,6 +31,19 @@
* limitations under the License.
*/
+import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.model.project.BuildResult;
+import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.project.ProjectGroup;
+import org.apache.maven.continuum.web.model.GroupSummary;
+import org.apache.maven.continuum.web.model.ProjectSummary;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -45,7 +61,7 @@
{
groups = new ArrayList();
- Collection projectGroups = continuum.getAllProjectGroupsWithProjects();
+ Collection projectGroups = getContinuum().getAllProjectGroupsWithProjects();
for ( Iterator j = projectGroups.iterator(); j.hasNext(); )
{
@@ -64,9 +80,9 @@
groupModel.setNumProjects( projects.size() );
- Map buildResults = continuum.getLatestBuildResults();
+ Map buildResults = getContinuum().getLatestBuildResults();
- Map buildResultsInSuccess = continuum.getBuildResultsInSuccess();
+ Map buildResultsInSuccess = getContinuum().getBuildResultsInSuccess();
List projectModels = new ArrayList();
int numSuccesses = 0;
@@ -94,7 +110,7 @@
model.setProjectGroupName( project.getProjectGroup().getName() );
- if ( continuum.isInBuildingQueue( project.getId() ) || continuum.isInCheckoutQueue( project.getId() ) )
+ if ( getContinuum().isInBuildingQueue( project.getId() ) || getContinuum().isInCheckoutQueue( project.getId() ) )
{
model.setInQueue( true );
}
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java Fri Aug 25 20:47:41 2006
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.web.action;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -64,7 +64,7 @@
project.setScmTag( scmTag );
- continuum.updateProject( project );
+ getContinuum().updateProject( project );
return SUCCESS;
}
@@ -92,7 +92,7 @@
private Project getProject( int projectId )
throws ContinuumException
{
- return continuum.getProject( projectId );
+ return getContinuum().getProject( projectId );
}
public int getProjectId()
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Fri Aug 25 20:47:41 2006
@@ -1,9 +1,7 @@
package org.apache.maven.continuum.web.action;
-import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.apache.maven.continuum.ContinuumException;
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,6 +16,9 @@
* limitations under the License.
*/
+import org.apache.maven.continuum.model.project.ProjectGroup;
+import org.apache.maven.continuum.ContinuumException;
+
/**
* ProjectGroupAction:
*
@@ -41,7 +42,7 @@
{
try
{
- projectGroup = continuum.getProjectGroup( projectGroupId );
+ projectGroup = getContinuum().getProjectGroup( projectGroupId );
}
catch ( ContinuumException e)
{
@@ -72,7 +73,7 @@
//todo add confirm page like removing build definition
try
{
- continuum.removeProjectGroup( projectGroupId );
+ getContinuum().removeProjectGroup( projectGroupId );
}
catch ( ContinuumException e )
{
@@ -87,7 +88,7 @@
{
try
{
- continuum.buildProjectGroup( projectGroupId );
+ getContinuum().buildProjectGroup( projectGroupId );
}
catch ( ContinuumException e )
{
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java Fri Aug 25 20:47:41 2006
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.web.action;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
public String execute()
throws ContinuumException
{
- project = continuum.getProjectWithAllDetails( projectId );
+ project = getContinuum().getProjectWithAllDetails( projectId );
return SUCCESS;
}
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Fri Aug 25 20:47:41 2006
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.web.action;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@
public String summary()
throws ContinuumException
{
- schedules = continuum.getSchedules();
+ schedules = getContinuum().getSchedules();
return SUCCESS;
}
@@ -59,7 +59,7 @@
{
try
{
- schedule = continuum.getSchedule( id );
+ schedule = getContinuum().getSchedule( id );
active = schedule.isActive();
cronExpression= schedule.getCronExpression();
description = schedule.getDescription();
@@ -88,7 +88,7 @@
schedule.setDescription( description );
schedule.setName( name );
- continuum.addSchedule( schedule );
+ getContinuum().addSchedule( schedule );
}
catch ( ContinuumException e )
{
@@ -102,7 +102,7 @@
try
{
- schedule = continuum.getSchedule( id );
+ schedule = getContinuum().getSchedule( id );
schedule.setActive( active );
schedule.setCronExpression( cronExpression );
@@ -110,7 +110,7 @@
schedule.setDescription( description );
schedule.setName( name );
- continuum.updateSchedule( schedule );
+ getContinuum().updateSchedule( schedule );
}
catch ( ContinuumException e )
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java Fri Aug 25 20:47:41 2006
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.web.action;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -52,11 +52,11 @@
Collection projects;
//TODO: Create a summary jpox request so code will be more simple and performance will be better
- projects = continuum.getProjectsInGroup( projectGroupId );
+ projects = getContinuum().getProjectsInGroup( projectGroupId );
- Map buildResults = continuum.getLatestBuildResults();
+ Map buildResults = getContinuum().getLatestBuildResults();
- Map buildResultsInSuccess = continuum.getBuildResultsInSuccess();
+ Map buildResultsInSuccess = getContinuum().getBuildResultsInSuccess();
summary = new ArrayList();
@@ -74,7 +74,7 @@
model.setProjectGroupName( project.getProjectGroup().getName() );
- if ( continuum.isInBuildingQueue( project.getId() ) || continuum.isInCheckoutQueue( project.getId() ) )
+ if ( getContinuum().isInBuildingQueue( project.getId() ) || getContinuum().isInCheckoutQueue( project.getId() ) )
{
model.setInQueue( true );
}
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java Fri Aug 25 20:47:41 2006
@@ -1,7 +1,7 @@
package org.apache.maven.continuum.web.action;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -58,9 +58,9 @@
public String execute()
throws ContinuumException
{
- files = continuum.getFiles( projectId, userDirectory );
+ files = getContinuum().getFiles( projectId, userDirectory );
- projectName = continuum.getProject( projectId ).getName();
+ projectName = getContinuum().getProject( projectId ).getName();
HashMap params = new HashMap();
@@ -70,11 +70,11 @@
String baseUrl = UrlHelper.buildUrl( "/workingCopy.action", ServletActionContext.getRequest(), ServletActionContext.getResponse(), params );
- output = generator.generate( files, baseUrl, continuum.getWorkingDirectory( projectId ) );
+ output = generator.generate( files, baseUrl, getContinuum().getWorkingDirectory( projectId ) );
if ( currentFile != null && currentFile != "" )
{
- currentFileContent = continuum.getFileContent( projectId, userDirectory, currentFile );
+ currentFileContent = getContinuum().getFileContent( projectId, userDirectory, currentFile );
}
else
{
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java Fri Aug 25 20:47:41 2006
@@ -1,17 +1,7 @@
package org.apache.maven.continuum.web.action.component;
-import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.model.project.BuildDefinition;
-import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.apache.maven.continuum.web.action.ContinuumActionSupport;
-import org.apache.maven.continuum.web.model.BuildDefinitionSummary;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,6 +16,17 @@
* limitations under the License.
*/
+import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.model.project.BuildDefinition;
+import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.project.ProjectGroup;
+import org.apache.maven.continuum.web.action.ContinuumActionSupport;
+import org.apache.maven.continuum.web.model.BuildDefinitionSummary;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
/**
* BuildDefinitionSummaryAction:
*
@@ -51,7 +52,7 @@
{
try
{
- projectGroupId = continuum.getProjectGroupByProjectId( projectId ).getId();
+ projectGroupId = getContinuum().getProjectGroupByProjectId( projectId ).getId();
groupBuildDefinitionSummaries = gatherGroupBuildDefinitionSummaries( projectGroupId );
projectBuildDefinitionSummaries = gatherProjectBuildDefinitionSummaries( projectId );
@@ -73,7 +74,7 @@
{
groupBuildDefinitionSummaries = gatherGroupBuildDefinitionSummaries( projectGroupId );
- ProjectGroup projectGroup = continuum.getProjectGroup( projectGroupId );
+ ProjectGroup projectGroup = getContinuum().getProjectGroup( projectGroupId );
for (Iterator i = projectGroup.getProjects().iterator(); i.hasNext(); )
{
@@ -99,7 +100,7 @@
{
List summaryList = new ArrayList();
- Project project = continuum.getProjectWithAllDetails( projectId );
+ Project project = getContinuum().getProjectWithAllDetails( projectId );
for ( Iterator i = project.getBuildDefinitions().iterator(); i.hasNext(); )
{
BuildDefinitionSummary bds = generateBuildDefinitionSummary( (BuildDefinition) i.next() );
@@ -119,7 +120,7 @@
{
List summaryList = new ArrayList();
- ProjectGroup projectGroup = continuum.getProjectGroup( projectGroupId );
+ ProjectGroup projectGroup = getContinuum().getProjectGroup( projectGroupId );
for ( Iterator i = projectGroup.getBuildDefinitions().iterator(); i.hasNext(); )
{
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Fri Aug 25 20:47:41 2006
@@ -403,7 +403,7 @@
</requirement>
</requirements>
<configuration>
- <authenticationFailureUrl>/login!default.action?login_error=1</authenticationFailureUrl>
+ <authenticationFailureUrl>/login.jsp?login_error=1</authenticationFailureUrl>
<defaultTargetUrl>/summary.action</defaultTargetUrl>
<filterProcessesUrl>/j_acegi_security_check</filterProcessesUrl>
</configuration>
@@ -413,7 +413,7 @@
<role>org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint</role>
<implementation>org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint</implementation>
<configuration>
- <loginFormUrl>/login!default.action</loginFormUrl>
+ <loginFormUrl>/login.jsp</loginFormUrl>
<forceHttps>false</forceHttps>
</configuration>
</component>
@@ -777,7 +777,7 @@
</level>
<level>
<hierarchy>com.opensymphony.webwork</hierarchy>
- <level>INFO</level>
+ <level>DEBUG</level>
</level>
<level>
<hierarchy>org.extremecomponents</hierarchy>
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml?rev=437067&r1=437066&r2=437067&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml Fri Aug 25 20:47:41 2006
@@ -65,26 +65,26 @@
<action name="addMavenTwoProject" class="addMavenTwoProject">
<result name="input">addMavenTwoProject.jsp</result>
- <result name="success" type="redirect">summary.action</result>
+ <result name="success" type="chain">groupSummary</result>
</action>
<action name="addMavenOneProject" class="addMavenOneProject">
<result name="input">addMavenOneProject.jsp</result>
- <result name="success" type="redirect">summary.action</result>
+ <result name="success" type="chain">groupSummary</result>
</action>
<action name="addProject" class="addProject">
<result name="input">addProject.jsp</result>
- <result name="success" type="redirect">summary.action</result>
+ <result name="success" type="chain">groupSummary</result>
</action>
<action name="deleteProject" class="deleteProject">
<result name="delete">deleteProject.jsp</result>
- <result name="success" type="redirect">summary.action</result>
+ <result name="success" type="chain">groupSummary</result>
</action>
<action name="buildProject" class="buildProject">
- <result name="success" type="redirect">summary.action</result>
+ <result name="success" type="chain">groupSummary</result>
</action>
<action name="projectView" class="projectView">