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/07/21 20:13:42 UTC
svn commit: r424404 - in /maven/continuum/branches/continuum-acegi: ./
continuum-site/src/site/apt/guides/getting-started/ continuum-webapp/
continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/
continuum-webapp/src/main/java/org/apache...
Author: carlos
Date: Fri Jul 21 11:13:40 2006
New Revision: 424404
URL: http://svn.apache.org/viewvc?rev=424404&view=rev
Log:
Merged rev# 419028-424394 from trunk
Added:
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java
- copied unchanged from r424394, maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/log4j.xml
- copied unchanged from r424394, maven/continuum/trunk/continuum-webapp/src/main/resources/log4j.xml
maven/continuum/branches/continuum-acegi/continuum-webapp/src/test/
- copied from r424394, maven/continuum/trunk/continuum-webapp/src/test/
maven/continuum/branches/continuum-acegi/continuum-webapp/src/test/java/
- copied from r424394, maven/continuum/trunk/continuum-webapp/src/test/java/
maven/continuum/branches/continuum-acegi/continuum-webapp/src/test/java/org/
- copied from r424394, maven/continuum/trunk/continuum-webapp/src/test/java/org/
maven/continuum/branches/continuum-acegi/continuum-webapp/src/test/java/org/apache/
- copied from r424394, maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/
maven/continuum/branches/continuum-acegi/continuum-webapp/src/test/java/org/apache/maven/
- copied from r424394, maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/
maven/continuum/branches/continuum-acegi/continuum-webapp/src/test/java/org/apache/maven/continuum/
- copied from r424394, maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/
maven/continuum/branches/continuum-acegi/continuum-webapp/src/test/java/org/apache/maven/continuum/web/
- copied from r424394, maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/
maven/continuum/branches/continuum-acegi/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/
- copied from r424394, maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/
maven/continuum/branches/continuum-acegi/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java
- copied unchanged from r424394, maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestContinuumActionLogging.java
- copied unchanged from r424394, maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestContinuumActionLogging.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/test/resources/
- copied from r424394, maven/continuum/trunk/continuum-webapp/src/test/resources/
maven/continuum/branches/continuum-acegi/continuum-webapp/src/test/resources/META-INF/
- copied from r424394, maven/continuum/trunk/continuum-webapp/src/test/resources/META-INF/
maven/continuum/branches/continuum-acegi/continuum-webapp/src/test/resources/META-INF/plexus/
- copied from r424394, maven/continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/
maven/continuum/branches/continuum-acegi/continuum-webapp/src/test/resources/META-INF/plexus/components.xml
- copied unchanged from r424394, maven/continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/components.xml
Removed:
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/rememberme/
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-request.xml
Modified:
maven/continuum/branches/continuum-acegi/continuum-site/src/site/apt/guides/getting-started/index.apt
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/AddBuildDefinitionAction.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/AddNotifierAction.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/AddScheduleAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.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/DeleteBuildDefinitionAction.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/EditScheduleAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/IrcNotifierEditAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/JabberNotifierEditAction.java
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/java/org/apache/maven/continuum/web/action/MailNotifierEditAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MsnNotifierEditAction.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/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/view/BuildCell.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/extremecomponents.properties
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/validators.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/continuum.tld
maven/continuum/branches/continuum-acegi/pom.xml
Modified: maven/continuum/branches/continuum-acegi/continuum-site/src/site/apt/guides/getting-started/index.apt
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-site/src/site/apt/guides/getting-started/index.apt?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-site/src/site/apt/guides/getting-started/index.apt (original)
+++ maven/continuum/branches/continuum-acegi/continuum-site/src/site/apt/guides/getting-started/index.apt Fri Jul 21 11:13:40 2006
@@ -100,7 +100,7 @@
<configuration>
<address>dev@maven.apache.org</address>
</configuration>
-<notifier>
+</notifier>
+--+
Example IRC notifier configuration:
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=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml Fri Jul 21 11:13:40 2006
@@ -12,6 +12,13 @@
<name>Continuum Web APP</name>
<version>1.1-SNAPSHOT</version>
<packaging>war</packaging>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>mortbay-repo</id>
+ <name>mortbay-repo</name>
+ <url>http://www.mortbay.org/maven2/snapshot</url>
+ </pluginRepository>
+ </pluginRepositories>
<build>
<filters>
<filter>src/main/filters/filter.properties</filter>
@@ -32,6 +39,31 @@
</excludes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <configuration>
+ <fileName>plexus-request.xml</fileName>
+ <containerDescriptor>true</containerDescriptor>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty6-plugin</artifactId>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <contextPath>/</contextPath>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<dependency>
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -19,17 +19,16 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.ProjectNotifier;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import java.util.Map;
-import com.opensymphony.xwork.ActionSupport;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
public abstract class AbstractNotifierEditAction
- extends ActionSupport
+ extends PlexusActionSupport
{
private Continuum continuum;
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java Fri Jul 21 11:13:40 2006
@@ -20,21 +20,27 @@
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.Schedule;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import com.opensymphony.xwork.ActionSupport;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="addBuildDefinition"
*/
public class AddBuildDefinitionAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private Project project;
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -20,19 +20,25 @@
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import java.io.File;
import java.net.MalformedURLException;
-import com.opensymphony.xwork.ActionSupport;
-
/**
* @author Nick Gonzalez
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="addMavenOneProject"
*/
public class AddMavenOneProjectAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private String m1PomUrl;
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -20,19 +20,25 @@
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import java.io.File;
import java.net.MalformedURLException;
-import com.opensymphony.xwork.ActionSupport;
-
/**
* @author Nick Gonzalez
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="addMavenTwoProject"
*/
public class AddMavenTwoProjectAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private String m2PomUrl;
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java Fri Jul 21 11:13:40 2006
@@ -16,14 +16,16 @@
* limitations under the License.
*/
-import com.opensymphony.xwork.ActionSupport;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addNotifier"
*/
public class AddNotifierAction
- extends ActionSupport
+ extends PlexusActionSupport
{
private int projectId;
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -19,16 +19,22 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.Project;
-
-import com.opensymphony.xwork.ActionSupport;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
/**
* @author Nick Gonzalez
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="addProject"
*/
public class AddProjectAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private String projectName;
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java Fri Jul 21 11:13:40 2006
@@ -19,15 +19,21 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.Schedule;
-
-import com.opensymphony.xwork.ActionSupport;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
/**
* @author Nik Gonzalez
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="addSchedule"
*/
public class AddScheduleAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private boolean active = true;
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java Fri Jul 21 11:13:40 2006
@@ -21,21 +21,27 @@
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.Schedule;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import com.opensymphony.xwork.ActionSupport;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="buildDefinitionEdit"
*/
public class BuildDefinitionEditAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private BuildDefinition bd;
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -18,16 +18,22 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
-
-import com.opensymphony.xwork.ActionSupport;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="buildProject"
*/
public class BuildProjectAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private int projectId;
@@ -66,4 +72,4 @@
{
return projectId;
}
-}
\ No newline at end of file
+}
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -19,18 +19,25 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.BuildResult;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import java.util.List;
-import com.opensymphony.xwork.ActionSupport;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="buildResult"
*/
public class BuildResultAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private BuildResult buildResult;
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -18,18 +18,24 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
-
-import com.opensymphony.xwork.ActionSupport;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import java.util.Collection;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="buildResults"
*/
public class BuildResultsListAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private Collection buildResults;
@@ -80,4 +86,4 @@
{
return buildResults;
}
-}
\ No newline at end of file
+}
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -17,16 +17,22 @@
*/
import org.apache.maven.continuum.Continuum;
-
-import com.opensymphony.xwork.ActionSupport;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="checkConfiguration"
*/
public class CheckConfigurationAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
public String execute()
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -16,22 +16,28 @@
* limitations under the License.
*/
+import com.opensymphony.xwork.Preparable;
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.configuration.ConfigurationStoringException;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import java.io.File;
-import com.opensymphony.xwork.ActionSupport;
-import com.opensymphony.xwork.Preparable;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="configuration"
*/
public class ConfigurationAction
- extends ActionSupport
+ extends PlexusActionSupport
implements Preparable
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private boolean guestAccountEnabled;
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java Fri Jul 21 11:13:40 2006
@@ -18,16 +18,22 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
-
-import com.opensymphony.xwork.ActionSupport;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="deleteBuildDefinition"
*/
public class DeleteBuildDefinitionAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private int projectId;
@@ -76,4 +82,4 @@
{
return buildDefinitionId;
}
-}
\ No newline at end of file
+}
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -18,16 +18,22 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
-
-import com.opensymphony.xwork.ActionSupport;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="deleteNotifier"
*/
public class DeleteNotifierAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private int projectId;
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -18,16 +18,22 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
-
-import com.opensymphony.xwork.ActionSupport;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="deleteProject"
*/
public class DeleteProjectAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private int projectId;
@@ -76,4 +82,4 @@
{
return projectName;
}
-}
\ No newline at end of file
+}
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java Fri Jul 21 11:13:40 2006
@@ -19,16 +19,22 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.Schedule;
-
-import com.opensymphony.xwork.ActionSupport;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
/**
* @author Nik Gonzalez
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="editSchedule"
*/
public class EditScheduleAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private Schedule schedule;
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/IrcNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/IrcNotifierEditAction.java?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/IrcNotifierEditAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/IrcNotifierEditAction.java Fri Jul 21 11:13:40 2006
@@ -24,6 +24,10 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="ircNotifierEdit"
*/
public class IrcNotifierEditAction
extends AbstractNotifierEditAction
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/JabberNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/JabberNotifierEditAction.java?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/JabberNotifierEditAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/JabberNotifierEditAction.java Fri Jul 21 11:13:40 2006
@@ -24,6 +24,10 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="jabberNotifierEdit"
*/
public class JabberNotifierEditAction
extends AbstractNotifierEditAction
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java Fri Jul 21 11:13:40 2006
@@ -1,5 +1,7 @@
package org.apache.maven.continuum.web.action;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+
/*
* Copyright 2004-2005 The Apache Software Foundation.
*
@@ -16,20 +18,16 @@
* limitations under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpSession;
-
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.xwork.ActionSupport;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="login"
*/
public class LoginAction
- extends ActionSupport
+ extends PlexusActionSupport
{
private String username = "";
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MailNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MailNotifierEditAction.java?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MailNotifierEditAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MailNotifierEditAction.java Fri Jul 21 11:13:40 2006
@@ -24,6 +24,10 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="mailNotifierEdit"
*/
public class MailNotifierEditAction
extends AbstractNotifierEditAction
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MsnNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MsnNotifierEditAction.java?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MsnNotifierEditAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MsnNotifierEditAction.java Fri Jul 21 11:13:40 2006
@@ -24,6 +24,10 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="msnNotifierEdit"
*/
public class MsnNotifierEditAction
extends AbstractNotifierEditAction
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -19,16 +19,22 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.Project;
-
-import com.opensymphony.xwork.ActionSupport;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="projectEdit"
*/
public class ProjectEditAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private Project project;
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -19,16 +19,22 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.Project;
-
-import com.opensymphony.xwork.ActionSupport;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="projectView"
*/
public class ProjectViewAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private Project project;
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -16,20 +16,25 @@
* limitations under the License.
*/
-import java.util.Collection;
-
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
-import com.opensymphony.xwork.ActionSupport;
+import java.util.Collection;
/**
* @author Nik Gonzalez
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="schedules"
*/
public class ScheduleAction
- extends ActionSupport
+ extends PlexusActionSupport
{
-
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private Collection schedules;
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -20,8 +20,7 @@
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.web.model.SummaryProjectModel;
-
-import com.opensymphony.xwork.ActionSupport;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import java.util.ArrayList;
import java.util.Collection;
@@ -32,10 +31,17 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="summary"
*/
public class SummaryAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private int nbSuccesses;
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -19,10 +19,10 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.web.util.WorkingCopyContentGenerator;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.webwork.views.util.UrlHelper;
-import com.opensymphony.xwork.ActionSupport;
import java.util.HashMap;
import java.util.List;
@@ -30,12 +30,22 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="workingCopy"
*/
public class WorkingCopyAction
- extends ActionSupport
+ extends PlexusActionSupport
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
+ /**
+ * @plexus.requirement
+ */
private WorkingCopyContentGenerator generator;
private int projectId;
@@ -137,4 +147,4 @@
{
return currentFileContent;
}
-}
\ No newline at end of file
+}
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java Fri Jul 21 11:13:40 2006
@@ -73,7 +73,7 @@
String url = UrlHelper.buildUrl( "/buildResult.action", request, response, params );
- result += "<a href=\"" + url + ">" + project.getBuildNumber() + "</a>";
+ result += "<a href=\"" + url + "\">" + project.getBuildNumber() + "</a>";
}
else
{
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java Fri Jul 21 11:13:40 2006
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import org.apache.commons.lang.time.DateFormatUtils;
import org.codehaus.plexus.util.StringUtils;
import org.extremecomponents.table.bean.Column;
import org.extremecomponents.table.cell.DisplayCell;
@@ -51,7 +52,14 @@
value = cal.getTime();
}
- value = ExtremeUtils.formatDate( column.getParse(), column.getFormat(), value, locale );
+ String format = column.getFormat();
+
+ if ( StringUtils.isEmpty( format ) )
+ {
+ format = DateFormatUtils.SMTP_DATETIME_FORMAT.getPattern();
+ }
+
+ value = ExtremeUtils.formatDate( column.getParse(), format, value, locale );
column.setPropertyValue( value );
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/extremecomponents.properties
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/extremecomponents.properties?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/extremecomponents.properties (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/extremecomponents.properties Fri Jul 21 11:13:40 2006
@@ -1,5 +1,5 @@
table.format_date=MMM dd, yyyy hh:mm:ss aaa z
-table.cell_date=org.apache.maven.continuum.web.view.commons.DateCell
+column.cell.date=org.apache.maven.continuum.web.view.commons.DateCell
table.border=1
table.cellspacing=2
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/validators.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/validators.xml?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/validators.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/validators.xml Fri Jul 21 11:13:40 2006
@@ -1,13 +1,16 @@
<validators>
- <validator name="required" class="com.opensymphony.webwork.validators.JavaScriptRequiredFieldValidator"/>
- <validator name="requiredstring" class="com.opensymphony.webwork.validators.JavaScriptRequiredStringValidator"/>
- <validator name="int" class="com.opensymphony.webwork.validators.JavaScriptIntRangeFieldValidator"/>
- <validator name="date" class="com.opensymphony.webwork.validators.JavaScriptDateRangeFieldValidator"/>
+ <validator name="required" class="com.opensymphony.xwork.validator.validators.RequiredFieldValidator"/>
+ <validator name="requiredstring" class="com.opensymphony.xwork.validator.validators.RequiredStringValidator"/>
+ <validator name="int" class="com.opensymphony.xwork.validator.validators.IntRangeFieldValidator"/>
+ <validator name="double" class="com.opensymphony.xwork.validator.validators.DoubleRangeFieldValidator"/>
+ <validator name="date" class="com.opensymphony.xwork.validator.validators.DateRangeFieldValidator"/>
<validator name="expression" class="com.opensymphony.xwork.validator.validators.ExpressionValidator"/>
<validator name="fieldexpression" class="com.opensymphony.xwork.validator.validators.FieldExpressionValidator"/>
- <validator name="email" class="com.opensymphony.webwork.validators.JavaScriptEmailValidator"/>
- <validator name="url" class="com.opensymphony.webwork.validators.JavaScriptURLValidator"/>
- <validator name="visitor" class="com.opensymphony.webwork.validators.JavaScriptVisitorFieldValidator"/>
+ <validator name="email" class="com.opensymphony.xwork.validator.validators.EmailValidator"/>
+ <validator name="url" class="com.opensymphony.xwork.validator.validators.URLValidator"/>
+ <validator name="visitor" class="com.opensymphony.xwork.validator.validators.VisitorFieldValidator"/>
<validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
<validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/>
-</validators>
\ No newline at end of file
+ <validator name="regex" class="com.opensymphony.xwork.validator.validators.RegexFieldValidator"/>
+</validators>
+
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=424404&r1=424403&r2=424404&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 Jul 21 11:13:40 2006
@@ -26,25 +26,25 @@
<result name="error">error.jsp</result>
</global-results>
- <action name="checkConfiguration" class="checkConfigurationAction">
+ <action name="checkConfiguration" class="checkConfiguration">
<result name="input">/redirectToContinuumInitialization.jsp</result>
</action>
- <action name="configuration" class="configurationAction">
+ <action name="configuration" class="configuration">
<result name="input">configurationEdit.jsp</result>
<result name="success">configuration.jsp</result>
</action>
- <action name="companyInfo" class="configurationAction">
+ <action name="companyInfo" class="configuration">
<result name="success">/components/companyLogo.jsp</result>
</action>
- <action name="login" class="loginAction">
+ <action name="login" class="login">
<result name="input">login.jsp</result>
<result name="success" type="redirect">summary.action</result>
</action>
- <action name="summary" class="summaryAction">
+ <action name="summary" class="summary">
<result name="success">summary.jsp</result>
</action>
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld Fri Jul 21 11:13:40 2006
@@ -7,6 +7,28 @@
<uri>continuum</uri>
<tag>
+ <name>date</name>
+ <tagclass>org.apache.maven.continuum.web.view.jsp.ui.DateTag</tagclass>
+ <bodycontent>JSP</bodycontent>
+ <info>date tag</info>
+ <attribute>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>format</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>nice</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
<name>data</name>
<tagclass>org.apache.maven.continuum.web.view.jsp.ui.DataTag</tagclass>
<bodycontent>JSP</bodycontent>
Modified: maven/continuum/branches/continuum-acegi/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/pom.xml?rev=424404&r1=424403&r2=424404&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/pom.xml Fri Jul 21 11:13:40 2006
@@ -51,7 +51,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>1.3-SNAPSHOT</version>
<extensions>true</extensions>
</plugin>
</plugins>