From commits-return-4512-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org Tue Nov 04 14:18:29 2008 Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 97794 invoked from network); 4 Nov 2008 14:18:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Nov 2008 14:18:27 -0000 Received: (qmail 68673 invoked by uid 500); 4 Nov 2008 14:18:32 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 68652 invoked by uid 500); 4 Nov 2008 14:18:32 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 68637 invoked by uid 99); 4 Nov 2008 14:18:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2008 06:18:32 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2008 14:17:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B36462388AC4; Tue, 4 Nov 2008 06:16:57 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r711259 [7/7] - in /continuum/trunk: ./ continuum-core/ continuum-core/src/test/resources/ continuum-data-management/data-management-cli/ continuum-webapp/ continuum-webapp/src/main/java/org/apache/continuum/web/action/ continuum-webapp/src... Date: Tue, 04 Nov 2008 14:16:45 -0000 To: commits@continuum.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081104141657.B36462388AC4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp Tue Nov 4 06:16:37 2008 @@ -17,16 +17,16 @@ ~ under the License. --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-tags" prefix="s" %> <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %> <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> <%@ taglib uri="continuum" prefix="c1" %> <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %> - + - <ww:text name="projectView.page.title"/> + <s:text name="projectView.page.title"/>
@@ -35,7 +35,7 @@ -

+

@@ -43,9 +43,9 @@ - - - + + ${project.projectGroup.id} +
@@ -57,15 +57,15 @@
- "/> - "/> + "/> + "/>
- "/> + "/> - "/> + "/>
@@ -75,26 +75,26 @@
-

+

- - - - + + ${project.id} + ${project.projectGroup.id} +
- - "/> - "/> - - + + "/> + "/> + +
-

- - +

+ + - - - - - ${notifier.type} - - - " alt="" title="" border="0"> - + + ${notifier.id} + + ${project.projectGroup.id} + ${notifier.type} + + + " alt="" title="" border="0"> + - " alt="" title="" border="0" /> + " alt="" title="" border="0" /> - " alt="" title="" border="0" /> + " alt="" title="" border="0" /> - - - - ${notifier.type} - - - - " alt="" title="" border="0"> - + + + ${project.projectGroup.id} + ${notifier.type} + ${notifier.id} + + + " alt="" title="" border="0"> + - " alt="" title="" border="0" /> + " alt="" title="" border="0" /> - " alt="" title="" border="0" /> + " alt="" title="" border="0" /> - +
- - "/> - "/> - - + + "/> + "/> + +
-

- +

+ -

- +

+ - + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp Tue Nov 4 06:16:37 2008 @@ -17,71 +17,71 @@ ~ under the License. --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-tags" prefix="s" %> - + - <ww:text name="releaseProject.page.title"/> + <s:text name="releaseProject.page.title"/> -

-

+

+

- - + + - + - + - +
- - " + + " alt="Done" title="Done" border="0"> - - - - " + + + + " alt="In Progress" title="In Progress" border="0"> - - - " + + + " alt="Error" title="Error" border="0"> - - + +

- - - - + + + +

- - - - - - + + + + + + - - - - - + + + + +
- + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp Tue Nov 4 06:16:37 2008 @@ -17,56 +17,56 @@ ~ under the License. --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-tags" prefix="s" %> - + - <ww:text name="releaseProject.page.title"/> - "/> + <s:text name="releaseProject.page.title"/> + "/> -

-

+

+

- - + + - + - + - +
- - " + + " alt="Done" title="Done" border="0"> - - - - " + + + + " alt="In Progress" title="In Progress" border="0"> - - - " + + + " alt="Error" title="Error" border="0"> - - - - " + + + + " alt="Queued" title="Queued" border="0"> - +
- - - - - - + + + + + + - + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInitialized.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInitialized.jsp?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInitialized.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInitialized.jsp Tue Nov 4 06:16:37 2008 @@ -17,28 +17,28 @@ ~ under the License. --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-tags" prefix="s" %> - + - <ww:text name="releaseProject.page.title"/> - "/> + <s:text name="releaseProject.page.title"/> + "/> -

-

+

+

The release goal is currently initializing...

Please wait while the server prepares your project for release.

- - - - - - + + + + + + - + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp Tue Nov 4 06:16:37 2008 @@ -17,26 +17,26 @@ ~ under the License. --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-tags" prefix="s" %> - + - <ww:text name="releaseProject.page.title"/> + <s:text name="releaseProject.page.title"/> -

- -

- - +

+ +

+ +
- - + +
- - + + - + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp Tue Nov 4 06:16:37 2008 @@ -17,35 +17,35 @@ ~ under the License. --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-tags" prefix="s" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - + - <ww:text name="releaseProject.page.title"/> + <s:text name="releaseProject.page.title"/>

Perform Project Release

- +

Release Perform Parameters

- +
- - - - + + + + - + - - - + +
- - + + - + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp Tue Nov 4 06:16:37 2008 @@ -17,58 +17,58 @@ ~ under the License. --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-tags" prefix="s" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - + - <ww:text name="releaseProject.page.title"/> - + <s:text name="releaseProject.page.title"/> + -

- -

- "/> +

+ +

+ "/>
- - - + + + - + - - +
- -

- "> + +

+ ">
- + - +
" size="100"> + value="" size="100">
" size="100"> + value="" size="100">
- + - - + + - + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseProject.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseProject.jsp?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseProject.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseProject.jsp Tue Nov 4 06:16:37 2008 @@ -17,38 +17,38 @@ ~ under the License. --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-tags" prefix="s" %> - + - <ww:text name="releaseProject.page.title"/> + <s:text name="releaseProject.page.title"/>

- - - + + +

- +

- +
- +
   

- "/> - - + "/> + + - + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp Tue Nov 4 06:16:37 2008 @@ -17,38 +17,38 @@ ~ under the License. --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-tags" prefix="s" %> - + - <ww:text name="releaseProject.page.title"/> + <s:text name="releaseProject.page.title"/>

- - - + + +

This will revert all changes made by the previous release?

- - - - - + + + + + - - - - - - + + + + + +
- + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp Tue Nov 4 06:16:37 2008 @@ -17,57 +17,57 @@ ~ under the License. --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-tags" prefix="s" %> <%@ taglib uri="continuum" prefix="c1" %> - + - <ww:text name="releaseProject.page.title"/> + <s:text name="releaseProject.page.title"/> -

+

-

+

- + - + - + - + - - - - - - - - + + + + + + + +
-

+

- - - - + + + +

-
+
- +

- + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp Tue Nov 4 06:16:37 2008 @@ -17,18 +17,18 @@ ~ under the License. --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-tags" prefix="s" %> <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %> <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> - + - <ww:text name="schedules.page.title"/> + <s:text name="schedules.page.title"/>
-

- +

+ - - - - " alt="" title="" border="0" /> + + ${pageScope.schedule.id} + + " alt="" title="" border="0" /> - - - - - " alt="" title="" border="0"> + + ${pageScope.schedule.id} + ${pageScope.schedule.name} + + " alt="" title="" border="0">
- - - + + +
- + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp Tue Nov 4 06:16:37 2008 @@ -16,17 +16,17 @@ ~ specific language governing permissions and limitations ~ under the License. --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-tags" prefix="s" %> <%@ taglib prefix="c1" uri="continuum" %> - + <ww:text name="scmResult.page.title"/>
- +

@@ -52,5 +52,5 @@

- - \ No newline at end of file + + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp Tue Nov 4 06:16:37 2008 @@ -17,14 +17,14 @@ ~ under the License. --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-tags" prefix="s" %> <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %> <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> <%@ taglib prefix="c1" uri="continuum" %> - + - <ww:text name="surefireReport.page.title"/> + <s:text name="surefireReport.page.title"/>
@@ -34,13 +34,13 @@

- - - - + + + +

-

+

-

+

- -
">
+ +
">
- + - " alt="" title=""/> + " alt="" title=""/> - - + + - " alt="" title=""/> + " alt="" title=""/> - + "> @@ -108,12 +108,12 @@ - + -

- - -
">
+

+ + +
">
- + - " alt="" title=""/> + " alt="" title=""/>

@@ -133,19 +133,19 @@ - - + + - " alt="" title=""/> + " alt="" title=""/> - + - - + +
- + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/workingCopy.jsp URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/workingCopy.jsp?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/workingCopy.jsp (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/workingCopy.jsp Tue Nov 4 06:16:37 2008 @@ -17,11 +17,11 @@ ~ under the License. --%> -<%@ taglib uri="/webwork" prefix="ww" %> +<%@ taglib uri="/struts-tags" prefix="s" %> - + - <ww:text name="workingCopy.page.title"/> + <s:text name="workingCopy.page.title"/>
@@ -31,29 +31,29 @@

- - - + + +

- + <% if ( request.getParameter( "file" ) != null ) { %>

- - - - - - - + + + + + + +

- +
<% } @@ -61,5 +61,5 @@
- + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml Tue Nov 4 06:16:37 2008 @@ -35,33 +35,30 @@ localization/Continuum + - webwork-cleanup - com.opensymphony.webwork.dispatcher.ActionContextCleanUp + struts-cleanup + org.apache.struts2.dispatcher.ActionContextCleanUp - sitemesh com.opensymphony.module.sitemesh.filter.PageFilter - - webwork - com.opensymphony.webwork.dispatcher.FilterDispatcher + struts + org.apache.struts2.dispatcher.FilterDispatcher - webwork-cleanup + struts-cleanup /* - sitemesh /* - - webwork + struts /* Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java (original) +++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java Tue Nov 4 06:16:37 2008 @@ -61,7 +61,7 @@ public void testActionLogging() throws Exception { - TestAction testAction = (TestAction) lookup( "com.opensymphony.xwork.Action", "testAction" ); + TestAction testAction = (TestAction) lookup( "com.opensymphony.xwork2.Action", "testAction" ); String testString = "action test string"; testAction.setTestString( testString ); Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java (original) +++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java Tue Nov 4 06:16:37 2008 @@ -19,8 +19,6 @@ * under the License. */ -import org.codehaus.plexus.xwork.action.PlexusActionSupport; - /** * TestAction: * Modified: continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/components.xml?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/components.xml (original) +++ continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/components.xml Tue Nov 4 06:16:37 2008 @@ -20,7 +20,7 @@ - com.opensymphony.xwork.Action + com.opensymphony.xwork2.Action testAction org.apache.maven.continuum.web.action.TestAction Modified: continuum/trunk/continuum-webapp/src/test/resources/log4j.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/resources/log4j.xml?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/test/resources/log4j.xml (original) +++ continuum/trunk/continuum-webapp/src/test/resources/log4j.xml Tue Nov 4 06:16:37 2008 @@ -56,19 +56,19 @@ - + + + + + - + - - - - Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml Tue Nov 4 06:16:37 2008 @@ -54,10 +54,6 @@ 1.0-alpha-20 - org.codehaus.plexus - plexus-xwork-integration - - org.apache.xmlrpc xmlrpc-server 3.0 Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java (original) +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java Tue Nov 4 06:16:37 2008 @@ -38,7 +38,6 @@ import org.codehaus.plexus.redback.system.DefaultSecuritySession; import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.users.UserNotFoundException; -import org.codehaus.plexus.xwork.PlexusLifecycleListener; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; @@ -200,16 +199,6 @@ ServletContext context = sc.getServletContext(); - // Attempt to find it already loaded by xwork. - PlexusContainer xworkContainer = (PlexusContainer) context.getAttribute( PlexusLifecycleListener.KEY ); - - if ( xworkContainer != null ) - { - context.setAttribute( PlexusConstants.PLEXUS_KEY, xworkContainer ); - - return; - } - // Container not found. if ( context.getAttribute( PlexusConstants.PLEXUS_KEY ) != null ) Modified: continuum/trunk/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/pom.xml (original) +++ continuum/trunk/pom.xml Tue Nov 4 06:16:37 2008 @@ -703,26 +703,6 @@ org.codehaus.plexus - plexus-mail-sender-api - ${mail-sender.version} - - - org.codehaus.plexus - plexus-mail-sender-simple - ${mail-sender.version} - - - org.codehaus.plexus - plexus-mail-sender-test - ${mail-sender.version} - - - org.codehaus.plexus - plexus-mail-sender-javamail - ${mail-sender.version} - - - org.codehaus.plexus plexus-slf4j-logging 1.1-alpha-1 @@ -767,21 +747,6 @@ 1.0-alpha-4 - org.codehaus.plexus - plexus-xwork-integration - 1.0-alpha-7 - - - velocity - velocity-dep - - - org.codehaus.plexus - plexus-container-default - - - - commons-configuration commons-configuration 1.5 @@ -801,6 +766,33 @@ commons-io 1.4 + + org.apache.struts + struts2-core + 2.0.12 + + + commons-logging + commons-logging + + + + + org.apache.struts + struts2-spring-plugin + 2.0.12 + + + commons-logging + commons-logging + + + + + com.opensymphony + xwork + 2.0.6 + @@ -867,30 +859,48 @@ org.codehaus.redback - redback-taglib + redback-common-integrations ${redback.version} - org.codehaus.plexus - plexus-container-default + commons-logging + commons-logging org.codehaus.redback - redback-xwork-content + redback-struts2-content ${redback.version} war + + + classworlds + classworlds + + + commons-logging + commons-logging + + org.codehaus.redback - redback-xwork-integration + redback-struts2-integration ${redback.version} - org.codehaus.plexus - plexus-container-default + classworlds + classworlds + + + velocity + velocity-dep + + commons-logging + commons-logging + @@ -906,7 +916,7 @@ org.codehaus.plexus plexus-spring - 1.0.1 + 1.2 @@ -948,7 +958,7 @@ org.apache.archiva - archiva-common + archiva-common ${archiva.version} @@ -1032,8 +1042,7 @@ 2.5.4 1.0-beta-2 1.1 - 1.1.2-SNAPSHOT - 1.0-alpha-7 + 1.2-SNAPSHOT 1.1