You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2007/02/12 01:57:45 UTC
svn commit: r506198 - in /struts/struts2/branches/STRUTS_2_0_X: ./ api/
assembly/ core/ core/src/main/java/org/apache/struts2/impl/
core/src/main/resources/META-INF/
core/src/test/java/org/apache/struts2/impl/ plugins/ plugins/continuations/
Author: husted
Date: Sun Feb 11 16:57:44 2007
New Revision: 506198
URL: http://svn.apache.org/viewvc?view=rev&rev=506198
Log:
[WW-1731] Fix assembly/pom to include codebehind and spring plugins (Good catch Tom!).
[WW-1548] Remove continuations from the 2.0.x branch.
[WW-1700] Remove "new API" from 2.0.x branch (see also r505490 as to the HEAD/2.1.x).
[WW-1731] Remove TLD as it is generated.
Removed:
struts/struts2/branches/STRUTS_2_0_X/api/
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/ActionContextImpl.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/InterceptorAdapter.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/MessagesImpl.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/RequestContextImpl.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/ResultAdapter.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/ValueStackAdapter.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/META-INF/struts-tags.tld
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/impl/MessagesTest.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/impl/RequestContextTest.java
struts/struts2/branches/STRUTS_2_0_X/plugins/continuations/
Modified:
struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml
struts/struts2/branches/STRUTS_2_0_X/pom.xml
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=506198&r1=506197&r2=506198
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml Sun Feb 11 16:57:44 2007
@@ -155,12 +155,13 @@
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-api</artifactId>
+ <artifactId>struts2-core</artifactId>
<version>${version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-core</artifactId>
+ <artifactId>struts2-codebehind-plugin</artifactId>
<version>${version}</version>
</dependency>
@@ -197,6 +198,12 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plexus-plugin</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-spring-plugin</artifactId>
<version>${version}</version>
</dependency>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/pom.xml?view=diff&rev=506198&r1=506197&r2=506198
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/pom.xml Sun Feb 11 16:57:44 2007
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.0.5</version>
+ <version>2.0.6-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
@@ -20,7 +20,7 @@
<build>
<plugins>
- <plugin>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0-alpha-1-SNAPSHOT</version>
<executions>
@@ -31,18 +31,18 @@
<goal>unpack</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>opensymphony</groupId>
- <artifactId>xwork</artifactId>
- <version>2.0.0</version>
- <classifier>sources</classifier>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/xwork-sources</outputDirectory>
- </configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>opensymphony</groupId>
+ <artifactId>xwork</artifactId>
+ <version>2.0.0</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/xwork-sources</outputDirectory>
+ </configuration>
</execution>
- </executions>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.myfaces.tobago</groupId>
@@ -75,14 +75,14 @@
<goal>execute</goal>
</goals>
</execution>
- </executions>
+ </executions>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
- <plugin>
+ <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.2</version>
<configuration>
@@ -111,68 +111,68 @@
</reporting>
<profiles>
- <profile>
- <!--
- Run the translator for Java 1.4 compatiblity
-
- Sample:
- $ cd struts/struts2/
- $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.jar
-
- -->
- <id>j4</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>retrotranslator-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>retrotranslate</id>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>create-j4-jar</id>
- <goals><goal>jar</goal></goals>
- <configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
- <classifier>j4</classifier>
- <archive>
- <manifestEntries>
- <Extension-Name>${project.artifactId}-j4</Extension-Name>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Title>${project.description}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Revision>${scm.revision}</Revision>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>rt</artifactId>
- <version>1.4.0</version>
- <scope>system</scope>
- <!-- path to rt.jar (on OSX, it's classes.jar) -->
- <systemPath>${java14.jar}</systemPath>
- </dependency>
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-runtime</artifactId>
- <version>1.0.8</version>
- </dependency>
- </dependencies>
- </profile>
+ <profile>
+ <!--
+ Run the translator for Java 1.4 compatiblity
+
+ Sample:
+ $ cd struts/struts2/
+ $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.jar
+
+ -->
+ <id>j4</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>retrotranslator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>retrotranslate</id>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-j4-jar</id>
+ <goals><goal>jar</goal></goals>
+ <configuration>
+ <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
+ <classifier>j4</classifier>
+ <archive>
+ <manifestEntries>
+ <Extension-Name>${project.artifactId}-j4</Extension-Name>
+ <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ <Implementation-Title>${project.description}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Revision>${scm.revision}</Revision>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>sun.jdk</groupId>
+ <artifactId>rt</artifactId>
+ <version>1.4.0</version>
+ <scope>system</scope>
+ <!-- path to rt.jar (on OSX, it's classes.jar) -->
+ <systemPath>${java14.jar}</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.retrotranslator</groupId>
+ <artifactId>retrotranslator-runtime</artifactId>
+ <version>1.0.8</version>
+ </dependency>
+ </dependencies>
+ </profile>
<profile>
<id>alljars</id>
@@ -256,12 +256,6 @@
</dependency>
<dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-api</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
<groupId>freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.8</version>
@@ -471,6 +465,6 @@
<optional>true</optional>
</dependency>
-
+
</dependencies>
</project>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java?view=diff&rev=506198&r1=506197&r2=506198
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java Sun Feb 11 16:57:44 2007
@@ -22,12 +22,11 @@
package org.apache.struts2.impl;
-import java.util.Map;
-import java.util.concurrent.Callable;
-
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.DefaultActionProxy;
+import java.util.Map;
+
public class StrutsActionProxy extends DefaultActionProxy {
private static final long serialVersionUID = -2434901249671934080L;
@@ -41,11 +40,14 @@
ActionContext previous = ActionContext.getContext();
ActionContext.setContext(invocation.getInvocationContext());
try {
- return RequestContextImpl.callInContext(invocation, new Callable<String>() {
- public String call() throws Exception {
- return invocation.invoke();
- }
- });
+// This is for the new API:
+// return RequestContextImpl.callInContext(invocation, new Callable<String>() {
+// public String call() throws Exception {
+// return invocation.invoke();
+// }
+// });
+
+ return invocation.invoke();
} finally {
if (cleanupContext)
ActionContext.setContext(previous);
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java?view=diff&rev=506198&r1=506197&r2=506198
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java Sun Feb 11 16:57:44 2007
@@ -22,9 +22,6 @@
package org.apache.struts2.impl;
-import java.util.HashMap;
-import java.util.Map;
-
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.config.ConfigurationException;
@@ -33,6 +30,9 @@
import com.opensymphony.xwork2.interceptor.Interceptor;
import com.opensymphony.xwork2.util.OgnlUtil;
+import java.util.HashMap;
+import java.util.Map;
+
public class StrutsObjectFactory extends ObjectFactory {
public Interceptor buildInterceptor(InterceptorConfig interceptorConfig, Map refParams)
@@ -59,8 +59,9 @@
return interceptor;
}
- if (o instanceof org.apache.struts2.spi.Interceptor)
- return new InterceptorAdapter((org.apache.struts2.spi.Interceptor) o);
+// This is for the new API:
+// if (o instanceof org.apache.struts2.spi.Interceptor)
+// return new InterceptorAdapter((org.apache.struts2.spi.Interceptor) o);
throw new ConfigurationException(
"Class [" + className + "] does not implement Interceptor", interceptorConfig);
@@ -96,8 +97,9 @@
if (result instanceof Result)
return (Result) result;
- if (result instanceof org.apache.struts2.spi.Result)
- return new ResultAdapter((org.apache.struts2.spi.Result) result);
+// This is for the new API:
+// if (result instanceof org.apache.struts2.spi.Result)
+// return new ResultAdapter((org.apache.struts2.spi.Result) result);
throw new ConfigurationException(result.getClass().getName() + " does not implement Result.");
}
Modified: struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml?view=diff&rev=506198&r1=506197&r2=506198
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml Sun Feb 11 16:57:44 2007
@@ -21,7 +21,6 @@
<modules>
<module>codebehind</module>
<module>config-browser</module>
- <module>continuations</module>
<module>jasperreports</module>
<module>jfreechart</module>
<module>jsf</module>
Modified: struts/struts2/branches/STRUTS_2_0_X/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/pom.xml?view=diff&rev=506198&r1=506197&r2=506198
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/pom.xml Sun Feb 11 16:57:44 2007
@@ -32,7 +32,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
- <version>2.0.5</version>
+ <version>2.0.6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>http://struts.apache.org/struts2</url>
@@ -78,7 +78,7 @@
<modules>
<module>core</module>
<!--<module>assembly</module>-->
- <module>api</module>
+ <!-- <module>api</module> -->
</modules>
<licenses>