You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2006/07/14 22:24:51 UTC
svn commit: r422021 - in /maven/continuum/trunk: ./ continuum-webapp/
continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/
continuum-webapp/src/main/resources/ continuum-webapp/src/test/
continuum-webapp/src/test/java/ continuum-webapp...
Author: evenisse
Date: Fri Jul 14 13:24:49 2006
New Revision: 422021
URL: http://svn.apache.org/viewvc?rev=422021&view=rev
Log:
[CONTINUUM-759] Generate plexus-request.xml with plexus-cdc
Submitted by: Jesse McConnell
Added:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java (with props)
maven/continuum/trunk/continuum-webapp/src/test/
maven/continuum/trunk/continuum-webapp/src/test/java/
maven/continuum/trunk/continuum-webapp/src/test/java/org/
maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/
maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/
maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/
maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/
maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/
maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java (with props)
maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestContinuumActionLogging.java (with props)
maven/continuum/trunk/continuum-webapp/src/test/resources/
maven/continuum/trunk/continuum-webapp/src/test/resources/META-INF/
maven/continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/
maven/continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/components.xml (with props)
Removed:
maven/continuum/trunk/continuum-webapp/src/main/resources/plexus-request.xml
Modified:
maven/continuum/trunk/continuum-webapp/pom.xml
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/IrcNotifierEditAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/JabberNotifierEditAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MailNotifierEditAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MsnNotifierEditAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
maven/continuum/trunk/pom.xml
Modified: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/pom.xml?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Fri Jul 14 13:24:49 2006
@@ -9,6 +9,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>
@@ -29,6 +36,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>
Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java?rev=422021&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java Fri Jul 14 13:24:49 2006
@@ -0,0 +1,71 @@
+package org.apache.maven.continuum.web.action;
+
+/*
+ * Copyright 2001-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.codehaus.plexus.logging.LogEnabled;
+import org.codehaus.plexus.logging.Logger;
+import com.opensymphony.xwork.ActionSupport;
+
+/**
+ * AbstractContinuumAction:
+ *
+ * @author: jesse
+ * @date: Jul 13, 2006
+ * @version: $ID:$
+ */
+public abstract class AbstractContinuumAction
+ extends ActionSupport
+ implements LogEnabled
+{
+ private Logger logger;
+
+ public void enableLogging( Logger logger )
+ {
+ this.logger = logger;
+ }
+
+ protected Logger getLogger()
+ {
+ return logger;
+ }
+
+ protected void setupLogger( Object component )
+ {
+ setupLogger( component, logger );
+ }
+
+ protected void setupLogger( Object component, String subCategory )
+ {
+ if ( subCategory == null )
+ {
+ throw new IllegalStateException( "Logging category must be defined." );
+ }
+
+ Logger logger = this.logger.getChildLogger( subCategory );
+
+ setupLogger( component, logger );
+ }
+
+ protected void setupLogger( Object component, Logger logger )
+ {
+ if ( component instanceof LogEnabled )
+ {
+ ( (LogEnabled) component ).enableLogging( logger );
+ }
+ }
+
+}
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java Fri Jul 14 13:24:49 2006
@@ -22,14 +22,12 @@
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 AbstractContinuumAction
{
private Continuum continuum;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java Fri Jul 14 13:24:49 2006
@@ -26,15 +26,20 @@
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 AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private Project project;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java Fri Jul 14 13:24:49 2006
@@ -24,15 +24,20 @@
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 AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private String m1PomUrl;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Fri Jul 14 13:24:49 2006
@@ -24,15 +24,20 @@
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 AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private String m2PomUrl;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java Fri Jul 14 13:24:49 2006
@@ -21,9 +21,11 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ *
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addNotifierAction"
*/
public class AddNotifierAction
- extends ActionSupport
+ extends AbstractContinuumAction
{
private int projectId;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Fri Jul 14 13:24:49 2006
@@ -20,15 +20,20 @@
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.Project;
-import com.opensymphony.xwork.ActionSupport;
-
/**
* @author Nick Gonzalez
* @version $Id$
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="addProject"
*/
public class AddProjectAction
- extends ActionSupport
+ extends AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private String projectName;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java Fri Jul 14 13:24:49 2006
@@ -20,14 +20,19 @@
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.Schedule;
-import com.opensymphony.xwork.ActionSupport;
-
/**
* @author Nik Gonzalez
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="addSchedule"
*/
public class AddScheduleAction
- extends ActionSupport
+ extends AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private boolean active = true;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java Fri Jul 14 13:24:49 2006
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import com.opensymphony.xwork.ActionSupport;
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.BuildDefinition;
@@ -27,15 +28,20 @@
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 AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private BuildDefinition bd;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java Fri Jul 14 13:24:49 2006
@@ -19,15 +19,20 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
-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="buildProject"
*/
public class BuildProjectAction
- extends ActionSupport
+ extends AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private int projectId;
@@ -66,4 +71,4 @@
{
return projectId;
}
-}
\ No newline at end of file
+}
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java Fri Jul 14 13:24:49 2006
@@ -16,21 +16,28 @@
* limitations under the License.
*/
+import com.opensymphony.xwork.ActionSupport;
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.BuildResult;
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
{
+
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private BuildResult buildResult;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java Fri Jul 14 13:24:49 2006
@@ -19,17 +19,22 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
-import com.opensymphony.xwork.ActionSupport;
-
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="buildResultsList"
*/
public class BuildResultsListAction
- extends ActionSupport
+ extends AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private Collection buildResults;
@@ -80,4 +85,4 @@
{
return buildResults;
}
-}
\ No newline at end of file
+}
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java Fri Jul 14 13:24:49 2006
@@ -18,15 +18,20 @@
import org.apache.maven.continuum.Continuum;
-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="checkConfiguration"
*/
public class CheckConfigurationAction
- extends ActionSupport
+ extends AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
public String execute()
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java Fri Jul 14 13:24:49 2006
@@ -16,22 +16,27 @@
* limitations under the License.
*/
+import com.opensymphony.xwork.Preparable;
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.configuration.ConfigurationStoringException;
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 AbstractContinuumAction
implements Preparable
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private boolean guestAccountEnabled;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java Fri Jul 14 13:24:49 2006
@@ -19,15 +19,20 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
-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="deleteBuildDefinition"
*/
public class DeleteBuildDefinitionAction
- extends ActionSupport
+ extends AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private int projectId;
@@ -76,4 +81,4 @@
{
return buildDefinitionId;
}
-}
\ No newline at end of file
+}
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java Fri Jul 14 13:24:49 2006
@@ -19,15 +19,20 @@
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
-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="deleteNotification"
*/
public class DeleteNotifierAction
- extends ActionSupport
+ extends AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private int projectId;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java Fri Jul 14 13:24:49 2006
@@ -24,10 +24,17 @@
/**
* @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
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private int projectId;
@@ -76,4 +83,4 @@
{
return projectName;
}
-}
\ No newline at end of file
+}
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java Fri Jul 14 13:24:49 2006
@@ -20,15 +20,20 @@
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.Schedule;
-import com.opensymphony.xwork.ActionSupport;
-
/**
* @author Nik Gonzalez
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="editSchedule"
*/
public class EditScheduleAction
- extends ActionSupport
+ extends AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private Schedule schedule;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/IrcNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/IrcNotifierEditAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/IrcNotifierEditAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/IrcNotifierEditAction.java Fri Jul 14 13:24:49 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/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/JabberNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/JabberNotifierEditAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/JabberNotifierEditAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/JabberNotifierEditAction.java Fri Jul 14 13:24:49 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/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java Fri Jul 14 13:24:49 2006
@@ -16,20 +16,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 AbstractContinuumAction
{
private String username = "";
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MailNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MailNotifierEditAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MailNotifierEditAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MailNotifierEditAction.java Fri Jul 14 13:24:49 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/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MsnNotifierEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MsnNotifierEditAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MsnNotifierEditAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/MsnNotifierEditAction.java Fri Jul 14 13:24:49 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/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java Fri Jul 14 13:24:49 2006
@@ -20,15 +20,20 @@
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.Project;
-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="projectEdit"
*/
public class ProjectEditAction
- extends ActionSupport
+ extends AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private Project project;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java Fri Jul 14 13:24:49 2006
@@ -20,15 +20,20 @@
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.Project;
-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="projectView"
*/
public class ProjectViewAction
- extends ActionSupport
+ extends AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private Project project;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Fri Jul 14 13:24:49 2006
@@ -16,20 +16,24 @@
* limitations under the License.
*/
-import java.util.Collection;
-
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
-import com.opensymphony.xwork.ActionSupport;
+import java.util.Collection;
/**
* @author Nik Gonzalez
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action"
+ * role-hint="schedule"
*/
public class ScheduleAction
- extends ActionSupport
+ extends AbstractContinuumAction
{
-
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private Collection schedules;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java Fri Jul 14 13:24:49 2006
@@ -21,8 +21,6 @@
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.web.model.SummaryProjectModel;
-import com.opensymphony.xwork.ActionSupport;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -32,10 +30,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 AbstractContinuumAction
{
+ /**
+ * @plexus.requirement
+ */
private Continuum continuum;
private int nbSuccesses;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java Fri Jul 14 13:24:49 2006
@@ -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 AbstractContinuumAction
{
+ /**
+ * @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/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Fri Jul 14 13:24:49 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>
Added: maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java?rev=422021&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java Fri Jul 14 13:24:49 2006
@@ -0,0 +1,48 @@
+package org.apache.maven.continuum.web.action;
+
+/*
+ * Copyright 2001-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.
+ */
+
+/**
+ * TestAction:
+ *
+ * @author: jesse
+ * @date: Jul 13, 2006
+ * @version: $ID:$
+ */
+public class TestAction
+ extends AbstractContinuumAction
+{
+ private String testString;
+
+ public String execute()
+ throws Exception
+ {
+ getLogger().info( testString );
+
+ return INPUT;
+ }
+
+ public String getTestString()
+ {
+ return testString;
+ }
+
+ public void setTestString( String testString )
+ {
+ this.testString = testString;
+ }
+}
Propchange: maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestContinuumActionLogging.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestContinuumActionLogging.java?rev=422021&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestContinuumActionLogging.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestContinuumActionLogging.java Fri Jul 14 13:24:49 2006
@@ -0,0 +1,102 @@
+package org.apache.maven.continuum.web.action;
+
+/*
+ * Copyright 2001-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.codehaus.plexus.PlexusTestCase;
+
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+
+/**
+ * TestContinuumActionLogging:
+ *
+ * @author: jesse
+ * @date: Jul 13, 2006
+ * @version: $ID:$
+ */
+public class TestContinuumActionLogging
+ extends PlexusTestCase
+{
+
+ StringBuffer testOutput = new StringBuffer();
+
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ PrintStream systemPrintStream = new PrintStream( new FilteredStream( System.out ), true );
+ System.setOut( systemPrintStream );
+ }
+
+
+ public void tearDown()
+ {
+ System.setOut( new PrintStream(
+ new BufferedOutputStream( new FileOutputStream( java.io.FileDescriptor.out ), 128 ), true ) );
+ }
+
+
+ public void testActionLogging()
+ {
+ try
+ {
+ TestAction testAction = (TestAction) lookup( "com.opensymphony.xwork.Action", "testAction" );
+ String testString = "action test string";
+ testAction.setTestString( testString );
+
+ testAction.execute();
+
+ assertTrue( testOutput.toString().indexOf( testString ) != -1 );
+ }
+ catch ( Exception e )
+ {
+ fail( e.getMessage() );
+ }
+ }
+
+
+ class FilteredStream
+ extends FilterOutputStream
+ {
+ OutputStream stream;
+
+ public FilteredStream( OutputStream stream )
+ {
+ super( stream );
+ this.stream = stream;
+ }
+
+ public void write( byte byteArray[] )
+ throws IOException
+ {
+ testOutput.append( new String ( byteArray ) );
+ stream.write( byteArray );
+ }
+
+ public void write( byte byteArray[], int offset, int length )
+ throws IOException
+ {
+ testOutput.append( new String( byteArray, offset, length ) );
+ stream.write( byteArray, offset, length );
+ }
+ }
+}
Propchange: maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestContinuumActionLogging.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestContinuumActionLogging.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/components.xml?rev=422021&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/components.xml (added)
+++ maven/continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/components.xml Fri Jul 14 13:24:49 2006
@@ -0,0 +1,9 @@
+<component-set>
+ <components>
+ <component>
+ <role>com.opensymphony.xwork.Action</role>
+ <role-hint>testAction</role-hint>
+ <implementation>org.apache.maven.continuum.web.action.TestAction</implementation>
+ </component>
+ </components>
+</component-set>
Propchange: maven/continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?rev=422021&r1=422020&r2=422021&view=diff
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Fri Jul 14 13:24:49 2006
@@ -49,7 +49,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>
Re: svn commit: r422021 - in /maven/continuum/trunk: ./ continuum-webapp/
continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ continuum-webapp/src/main/resources/
continuum-webapp/src/test/ continuum-webapp/src/test/java/ continuum-webapp...
Posted by Trygve Laugstøl <tr...@apache.org>.
evenisse@apache.org wrote:
> Author: evenisse
> Date: Fri Jul 14 13:24:49 2006
> New Revision: 422021
>
> URL: http://svn.apache.org/viewvc?rev=422021&view=rev
> Log:
> [CONTINUUM-759] Generate plexus-request.xml with plexus-cdc
> Submitted by: Jesse McConnell
>
> Added:
> maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java (with props)
Why is this in Continuum and not in plexus-xwork?
[snip]
> Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java
> URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java?rev=422021&view=auto
> ==============================================================================
> --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java (added)
> +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java Fri Jul 14 13:24:49 2006
> @@ -0,0 +1,71 @@
> +package org.apache.maven.continuum.web.action;
> +
> +/*
> + * Copyright 2001-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.codehaus.plexus.logging.LogEnabled;
> +import org.codehaus.plexus.logging.Logger;
> +import com.opensymphony.xwork.ActionSupport;
> +
> +/**
> + * AbstractContinuumAction:
> + *
> + * @author: jesse
> + * @date: Jul 13, 2006
> + * @version: $ID:$
> + */
> +public abstract class AbstractContinuumAction
> + extends ActionSupport
> + implements LogEnabled
> +{
> + private Logger logger;
> +
> + public void enableLogging( Logger logger )
> + {
> + this.logger = logger;
> + }
> +
> + protected Logger getLogger()
> + {
> + return logger;
> + }
> +
vvv
> + protected void setupLogger( Object component )
> + {
> + setupLogger( component, logger );
> + }
> +
> + protected void setupLogger( Object component, String subCategory )
> + {
> + if ( subCategory == null )
> + {
> + throw new IllegalStateException( "Logging category must be defined." );
> + }
> +
> + Logger logger = this.logger.getChildLogger( subCategory );
> +
> + setupLogger( component, logger );
> + }
> +
> + protected void setupLogger( Object component, Logger logger )
> + {
> + if ( component instanceof LogEnabled )
> + {
> + ( (LogEnabled) component ).enableLogging( logger );
> + }
> + }
^^^ what is this stuff used for? The container is handling the logging
configuration of the components.
[snip]
--
Trygve