Author: husted
Date: Sun Feb 18 15:26:15 2007
New Revision: 509029
URL: http://svn.apache.org/viewvc?view=rev&rev=509029
Log:
WW-1548 Remove continuation support from 2.0.x, which had been classified
"sandbox" code.
Removed:
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts-continuations.xml
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/continuations/
Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts.xml
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/showcase.jsp
struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml?view=diff&rev=509029&r1=509028&r2=509029
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml Sun Feb 18
15:26:15 2007
@@ -17,7 +17,7 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/showcase/</url>
</scm>
-
+
<profiles>
<profile>
@@ -31,7 +31,7 @@
</profile>
</profiles>
<dependencies>
-
+
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-struts1-plugin</artifactId>
@@ -55,16 +55,10 @@
<artifactId>struts2-sitemesh-plugin</artifactId>
<version>${pom.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-tiles-plugin</artifactId>
- <version>${pom.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-continuations-plugin</artifactId>
+ <artifactId>struts2-tiles-plugin</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -79,14 +73,14 @@
<artifactId>struts2-spring-plugin</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
-
+
<!-- Velocity -->
<dependency>
<groupId>velocity</groupId>
@@ -137,9 +131,9 @@
<version>1.1.1</version>
</dependency>
-
+
</dependencies>
-
+
<build>
<plugins>
<plugin>
Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts.xml?view=diff&rev=509029&r1=509028&r2=509029
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts.xml
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts.xml
Sun Feb 18 15:26:15 2007
@@ -8,15 +8,13 @@
<struts>
<include file="struts-chat.xml" />
-
+
<include file="struts-hangman.xml" />
-
- <include file="struts-continuations.xml"/>
<include file="struts-tags.xml"/>
-
+
<include file="struts-validation.xml" />
-
+
<include file="struts-actionchaining.xml" />
<include file="struts-ajax.xml" />
@@ -26,19 +24,19 @@
<include file="struts-person.xml" />
<include file="struts-wait.xml" />
-
+
<include file="struts-jsf.xml" />
<include file="struts-token.xml" />
-
+
<include file="struts-model-driven.xml" />
-
+
<include file="struts-integration.xml" />
-
+
<include file="struts-filedownload.xml" />
-
+
<include file="struts-conversion.xml" />
-
+
<include file="struts-freemarker.xml" />
<include file="struts-tiles.xml" />
@@ -48,17 +46,17 @@
<package name="default" extends="struts-default">
<interceptors>
<interceptor-stack name="crudStack">
- <interceptor-ref name="checkbox" />
+ <interceptor-ref name="checkbox" />
<interceptor-ref name="params" />
- <interceptor-ref name="static-params" />
+ <interceptor-ref name="static-params" />
<interceptor-ref name="defaultStack" />
</interceptor-stack>
</interceptors>
-
+
<action name="showcase">
<result>showcase.jsp</result>
</action>
-
+
<action name="viewSource"
class="org.apache.struts2.showcase.source.ViewSourceAction">
<result>viewSource.jsp</result>
</action>
@@ -99,7 +97,7 @@
<interceptor-ref name="basicStack"/>
</action>
<action name="edit-*"
class="org.apache.struts2.showcase.action.EmployeeAction">
- <param name="empId">{1}</param>
+ <param name="empId">{1}</param>
<result>/empmanager/editEmployee.jsp</result>
<interceptor-ref name="crudStack"><param
name="validation.excludeMethods">execute</param></interceptor-ref>
</action>
Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/showcase.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/showcase.jsp?view=diff&rev=509029&r1=509028&r2=509029
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/showcase.jsp
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/showcase.jsp
Sun Feb 18 15:26:15 2007
@@ -1,6 +1,6 @@
-<%--
+<%--
showcase.jsp
-
+
@version $Date$ $Id$
--%>
@@ -32,7 +32,7 @@
<p>
<%-- THIS LIST IS MAINTAINED IN WEB-INF/decorators/main.jsp TO CREATE THE
MENU BAR -- EDIT THERE AND COPY HERE --%>
<ul>
- <li><a href="<s:url value="/showcase.jsp"/>">Home</a></li>
+ <li><a href="<s:url value="/showcase.jsp"/>">Home</a></li>
<li><a href="<s:url value="/ajax/index.jsp" />">Ajax Theme for Struts
Tags</a></li>
<li><a href="<s:url value="/chat/index.jsp"/>">Ajax Chat</a>
<li><a href="<s:url action="actionChain1!input"
namespace="/actionchaining" includeParams="none" />">Action Chaining</a></li>
@@ -52,14 +52,6 @@
<li><a href="<s:url
value="/validation/index.jsp"/>">Validation</a></li>
<li class="last"><a href="<s:url value="/help.jsp"/>">Help</a></li>
</ul>
-
- <h2>Sandbox</h2>
- <p>
- These examples are under development and may not be fully operational.
- </p>
- <ul>
- <li><a href="<s:url action="guess" namespace="/continuations"
/>">Continuations</a></li>
- </ul>
</p>
Modified: struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml?view=diff&rev=509029&r1=509028&r2=509029
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml Sun Feb 18 15:26:15
2007
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
<!--
-/*
+/*
* Copyright 2005-2006 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -193,43 +193,43 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts2-pell-multipart-plugin</artifactId>
<version>${version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plexus-plugin</artifactId>
<version>${version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
<version>${version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-sitegraph-plugin</artifactId>
<version>${version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-sitemesh-plugin</artifactId>
<version>${version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-struts1-plugin</artifactId>
<version>${version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-tiles-plugin</artifactId>
<version>${version}</version>
- </dependency>
+ </dependency>
<!-- Include optional dependencies -->
@@ -423,7 +423,7 @@
<version>1.2.8</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>myfaces</groupId>
@@ -432,13 +432,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.rifers</groupId>
- <artifactId>rife-continuations</artifactId>
- <version>0.0.2</version>
- <scope>provided</scope>
- </dependency>
-
<!-- Exclude transitive dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
