diff --git a/api/pom.xml b/api/pom.xml deleted file mode 100644 index 5a4507407..000000000 --- a/api/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - 4.0.0 - - org.apache.struts - struts2-parent - 2.1.0-SNAPSHOT - - org.apache.struts - struts2-api - jar - Struts 2 API - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/api/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/api/ - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/api/ - - - - - javax.servlet - servlet-api - 2.4 - provided - - - junit - junit - 3.8.1 - test - - true - - - org.easymock - easymock - test - 2.0 - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - false - - - - - diff --git a/api/src/main/java/org/apache/struts2/Action.java b/api/src/main/java/org/apache/struts2/Action.java deleted file mode 100644 index ae46570f2..000000000 --- a/api/src/main/java/org/apache/struts2/Action.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2; - -/** - * Default action interface. Provided purely for user convenience. Struts does not require actions to implement any - * interfaces. Actions need only implement a public, no argument method which returns {@code String}. If a user does - * not specify a method name, Struts defaults to {@code execute()}. - * - *

For example: - * - * 

- *   static import ResultNames.*;
- *
- *   public class MyAction implements Action {
- *
- *     public String execute() {
- *       return SUCCESS;
- *     }
- *   }
- *
- * - *

is equivalent to: - * - * 

- *   static import ResultNames.*;
- *
- *   public class MyAction {
- *
- *     public String execute() {
- *       return SUCCESS;
- *     }
- *   }
- *
- * - * @author crazybob@google.com (Bob Lee) - */ -public interface Action { - - /** - * Executes this action. - * - * @return result name which matches a result name from the action mapping in the configuration file. See {@link - * ResultNames} for common suggestions. - */ - String execute(); -} diff --git a/api/src/main/java/org/apache/struts2/MessageAware.java b/api/src/main/java/org/apache/struts2/MessageAware.java deleted file mode 100644 index 6dd380b53..000000000 --- a/api/src/main/java/org/apache/struts2/MessageAware.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2; - -/** - * Implemented by actions which may need to record errors or messages. - * - * 
- *   static import ResultNames.*;
- *
- *   public class SetName implements MessageAware {
- *
- *     Messages messages;
- *     String name;
- *
- *     public String execute() {
- *       return SUCCESS;
- *     }
- *
- *     public void setName(String name) {
- *       if ("".equals(name))
- *         messages.forField("name").addError("name.required");
- *
- *       this.name = name;
- *     }
- *
- *     public void setMessages(Messages messages) {
- *       this.messages = messages;
- *     }
- *   }
- *
- * - * @author crazybob@google.com (Bob Lee) - */ -public interface MessageAware { - - /** - * Sets messages. - * - * @param messages messages - */ - void setMessages(Messages messages); -} diff --git a/api/src/main/java/org/apache/struts2/Messages.java b/api/src/main/java/org/apache/struts2/Messages.java deleted file mode 100644 index bce30de5a..000000000 --- a/api/src/main/java/org/apache/struts2/Messages.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2; - -import java.util.List; -import java.util.Set; -import java.util.Map; - -/** - * Collection of messages. Supports nesting messages by field name. - * - *

Uses keys when adding instead of actual messages to decouple code from messages. - * - * @author crazybob@google.com (Bob Lee) - */ -public interface Messages { - - // TODO: Use Object[] for args instead of String[]. - - /** - * Message severity. - */ - public enum Severity { - - /** - * Informational messages. - */ - INFO, - - /** - * Warning messages. - */ - WARN, - - /** - * Error messages. - */ - ERROR, - } - - /** - * Gets nested messages for the given field. - * - *

Supports dot notation to represent nesting. For example: - * - * 

-     * messages.forField("foo").forField("bar") == messages.forField("foo.bar")
-     *
- * - * @param fieldName name of the field - * @return nested {@code Messages} for given field name - */ - Messages forField(String fieldName); - - /** - * Gets map of field name to messages for that field. - * - * @return map of field name to {@code Messages} - */ - Map forFields(); - - /** - * Adds informational message. - * - * @param key message key - * @see Severity.INFO - */ - void addInformation(String key); - - /** - * Adds informational message. - * - * @param key message key - * @param arguments message arguments - * @see Severity.INFO - */ - void addInformation(String key, String... arguments); - - /** - * Adds warning message. - * - * @param key message key - * @see Severity.WARN - */ - void addWarning(String key); - - /** - * Adds warning message. - * - * @param key message key - * @param arguments message arguments - * @see Severity.WARN - */ - void addWarning(String key, String... arguments); - - /** - * Adds error message. - * - * @param key message key - * @see Severity.ERROR - */ - void addError(String key); - - /** - * Adds error message. - * - * @param key message key - * @param arguments message arguments - * @see Severity.ERROR - */ - void addError(String key, String... arguments); - - /** - * Adds message. - * - * @param severity message severity - * @param key message key - */ - void add(Severity severity, String key); - - /** - * Adds request-scoped message. - * - * @param severity message severity - * @param key message key - * @param arguments message arguments - */ - void add(Severity severity, String key, String... arguments); - - /** - * Gets set of severities for which this {@code Messages} instance has messages. Not recursive. - * - * @return unmodifiable set of {@link Severity} sorted from least to most severe - */ - Set getSeverities(); - - /** - * Gets message strings for the given severity. Not recursive. - * - * @param severity message severity - * @return unmodifiable list of messages - */ - List forSeverity(Severity severity); - - /** - * Gets error message strings for this {@code Messages} instance. Not recursive. - * - * @return unmodifiable list of messages - */ - List getErrors(); - - /** - * Gets error message strings for this {@code Messages} instance. Not recursive. - * - * @return unmodifiable list of messages - */ - List getWarnings(); - - /** - * Gets informational message strings for this {@code Messages} instance. Not recursive. - * - * @return unmodifiable list of messages - */ - List getInformation(); - - /** - * Returns true if this or a nested {@code Messages} instance has error messages. - * - * @see Severity.ERROR - */ - boolean hasErrors(); - - /** - * Returns true if this or a nested {@code Messages} instance has warning messages. - * - * @see Severity.WARN - */ - boolean hasWarnings(); - - /** - * Returns true if this or a nested {@code Messages} instance has informational messages. - * - * @see Severity.INFO - */ - boolean hasInformation(); - - /** - * Returns true if this and all nested {@code Messages} instances have no messages. - */ - boolean isEmpty(); - - /** - * Returns true if this and all nested {@code Messages} instances have no messages for the given severity. - * - * @param severity message severity - */ - boolean isEmpty(Severity severity); -} \ No newline at end of file diff --git a/api/src/main/java/org/apache/struts2/ResultNames.java b/api/src/main/java/org/apache/struts2/ResultNames.java deleted file mode 100644 index fd5955ce0..000000000 --- a/api/src/main/java/org/apache/struts2/ResultNames.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2; - -/** - * Commonly used result names returned by action methods. - * - * @author crazybob@google.com (Bob Lee) - */ -public final class ResultNames { - - private ResultNames() {} - - /** - * The action executed successfully. - */ - public static final String SUCCESS = "success"; - - /** - * The action requires more input, i.e. a validation error occurred. - */ - public static final String INPUT = "input"; - - /** - * The action requires the user to log in before executing. - */ - public static final String LOGIN = "login"; - - /** - * The action execution failed irrecoverably. - */ - public static final String ERROR = "error"; - - /** - * The action executed successfully, but do not execute a result. - */ - public static final String NONE = "none"; -} diff --git a/api/src/main/java/org/apache/struts2/Validatable.java b/api/src/main/java/org/apache/struts2/Validatable.java deleted file mode 100644 index 1d59dddee..000000000 --- a/api/src/main/java/org/apache/struts2/Validatable.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2; - -import org.apache.struts2.MessageAware; - -/** - * Implemented by actions which wish to execute some validation logic before their action method. Useful for - * cross-field validations. - * - * @author crazybob@google.com (Bob Lee) - */ -public interface Validatable extends MessageAware { - - /** - * Validates input. Executes before action method. - */ - public void validate(); -} diff --git a/api/src/main/java/org/apache/struts2/servlet/ParameterAware.java b/api/src/main/java/org/apache/struts2/servlet/ParameterAware.java deleted file mode 100644 index df705fbe6..000000000 --- a/api/src/main/java/org/apache/struts2/servlet/ParameterAware.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.servlet; - -import java.util.Map; - -/** - * Implemented by actions which need direct access to the request parameters. - * - * @author crazybob@google.com (Bob Lee) - */ -public interface ParameterAware { - - /** - * Sets parameters. - * - * @param parameters map of parameter name to parameter values - */ - void setParameters(Map parameters); -} diff --git a/api/src/main/java/org/apache/struts2/servlet/ServletRequestAware.java b/api/src/main/java/org/apache/struts2/servlet/ServletRequestAware.java deleted file mode 100644 index cf1a44c6b..000000000 --- a/api/src/main/java/org/apache/struts2/servlet/ServletRequestAware.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.servlet; - -import javax.servlet.http.HttpServletRequest; - -/** - * Implemented by actions which need direct access to the servlet request. - * - * @author crazybob@google.com (Bob Lee) - */ -public interface ServletRequestAware { - - /** - * Sets the servlet request. - * - * @param request servlet request. - */ - void setServletRequest(HttpServletRequest request); -} diff --git a/api/src/main/java/org/apache/struts2/servlet/ServletResponseAware.java b/api/src/main/java/org/apache/struts2/servlet/ServletResponseAware.java deleted file mode 100644 index c36726fa2..000000000 --- a/api/src/main/java/org/apache/struts2/servlet/ServletResponseAware.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.servlet; - -import javax.servlet.http.HttpServletResponse; - -/** - * Implemented by actions which need direct access to the servlet response. - * - * @author crazybob@google.com (Bob Lee) - */ -public interface ServletResponseAware { - - /** - * Sets the servlet response. - * - * @param response servlet response - */ - void setServletResponse(HttpServletResponse response); -} diff --git a/api/src/main/java/org/apache/struts2/spi/ActionContext.java b/api/src/main/java/org/apache/struts2/spi/ActionContext.java deleted file mode 100644 index 5546fa444..000000000 --- a/api/src/main/java/org/apache/struts2/spi/ActionContext.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.spi; - -import java.lang.reflect.Method; - -/** - * Context of an action execution. - * - * @author crazybob@google.com (Bob Lee) - */ -public interface ActionContext { - - /** - * Gets action instance. - */ - Object getAction(); - - /** - * Gets action method. - */ - Method getMethod(); - - /** - * Gets action name. - */ - String getActionName(); - - /** - * Gets the path for the action's namespace. - */ - String getNamespacePath(); - - /** - * Gets the {@link Result} instance for the action. - * - * @return {@link Result} instance or {@code null} if we don't have a result yet. - */ - Result getResult(); - - /** - * Adds a result interceptor for the action. Enables executing code before and after a result, executing an - * alternate result, etc. - */ - void addResultInterceptor(Result interceptor); - - /** - * Gets context of action which chained to us. - * - * @return context of previous action or {@code null} if this is the first action in the chain - */ - ActionContext getPrevious(); - - /** - * Gets context of action which this action chained to. - * - * @return context of next action or {@code null} if we haven't chained to another action yet or this is the last - * action in the chain. - */ - ActionContext getNext(); -} diff --git a/api/src/main/java/org/apache/struts2/spi/Interceptor.java b/api/src/main/java/org/apache/struts2/spi/Interceptor.java deleted file mode 100644 index 33cd84751..000000000 --- a/api/src/main/java/org/apache/struts2/spi/Interceptor.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.spi; - -/** - * Intercepts an action request. - * - * @author crazybob@google.com (Bob Lee) - */ -public interface Interceptor { - - /** - * Intercepts an action request. - * - * @param requestContext current request context - */ - String intercept(RequestContext requestContext) throws Exception; -} diff --git a/api/src/main/java/org/apache/struts2/spi/RequestContext.java b/api/src/main/java/org/apache/struts2/spi/RequestContext.java deleted file mode 100644 index c08b08a6f..000000000 --- a/api/src/main/java/org/apache/struts2/spi/RequestContext.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.spi; - -import org.apache.struts2.Messages; - -import javax.servlet.ServletContext; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -/** - * Request context. A single request may span multiple actions with action chaining. - * - * @author crazybob@google.com (Bob Lee) - */ -public interface RequestContext { - - /** - * Gets context of the currently executing action. - * - * @return current action context - */ - ActionContext getActionContext(); - - /** - * Convenience method. Equivalent to {@code getActionContext().getAction()}. - * - * @return currently executing action - */ - Object getAction(); - - /** - * Gets map of request parameters. - */ - Map getParameterMap(); - - /** - * Gets map of request attributes. - */ - Map getAttributeMap(); - - /** - * Gets map of session attributes. - */ - Map getSessionMap(); - - /** - * Gets map of application (servlet context) attributes. - */ - Map getApplicationMap(); - - /** - * Finds cookies with the given name, - */ - List findCookiesForName(String name); - - /** - * Gets locale. - */ - Locale getLocale(); - - /** - * Sets locale. Stores the locale in the session for future requests. - */ - void setLocale(Locale locale); - - /** - * Gets messages. - */ - Messages getMessages(); - - /** - * Gets the servlet request. - */ - HttpServletRequest getServletRequest(); - - /** - * Gets the servlet response. - */ - HttpServletResponse getServletResponse(); - - /** - * Gets the servlet context. - */ - ServletContext getServletContext(); - - /** - * Gets the value stack. - */ - ValueStack getValueStack(); - - /** - * Invokes the next interceptor or the action method if no more interceptors remain. - * - * @return result name - * @throws IllegalStateException if already invoked or called from the action - */ - String proceed() throws Exception; -} diff --git a/api/src/main/java/org/apache/struts2/spi/RequestContextAware.java b/api/src/main/java/org/apache/struts2/spi/RequestContextAware.java deleted file mode 100644 index 342599b9e..000000000 --- a/api/src/main/java/org/apache/struts2/spi/RequestContextAware.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.spi; - -import org.apache.struts2.spi.RequestContext; - -/** - * Implemented by actions that need access to the current {@link org.apache.struts2.spi.RequestContext}. Use - * judiciously. - * - * @author crazybob@google.com (Bob Lee) - */ -public interface RequestContextAware { - - /** - * Sets {@link org.apache.struts2.spi.RequestContext}. - * - * @param requestContext - */ - void setRequestContext(RequestContext requestContext); -} diff --git a/api/src/main/java/org/apache/struts2/spi/Result.java b/api/src/main/java/org/apache/struts2/spi/Result.java deleted file mode 100644 index 07913ccd3..000000000 --- a/api/src/main/java/org/apache/struts2/spi/Result.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.spi; - -import org.apache.struts2.spi.RequestContext; - -/** - * The result of an action request. Struts creates a new {@code Result} instance for each request. - * - * @author crazybob@google.com (Bob Lee) - */ -public interface Result { - - /** - * Executes result. - * - * @param requestContext - */ - void execute(RequestContext requestContext) throws Exception; -} diff --git a/api/src/main/java/org/apache/struts2/spi/ValueStack.java b/api/src/main/java/org/apache/struts2/spi/ValueStack.java deleted file mode 100644 index bd6192206..000000000 --- a/api/src/main/java/org/apache/struts2/spi/ValueStack.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.spi; - -/** - * A central fixture of the Struts framework, the {@code ValueStack} is a stack which contains the actions - * which have executed in addition to other objects. Users can get and set values on the stack using expressions. The - * {@code ValueStack} will search down the stack starting with the most recent objects until it finds an object to - * which the expression can apply. - * - * @author crazybob@google.com (Bob Lee) - */ -public interface ValueStack extends Iterable { - - /** - * Gets the top, most recent object from the stack without changing the stack. - * - * @return the top object - */ - Object peek(); - - /** - * Removes the top, most recent object from the stack. - * - * @return the top object - */ - Object pop(); - - /** - * Pushes an object onto the stack. - * - * @param o - */ - void push(Object o); - - /** - * Creates a shallow copy of this stack. - * - * @return a new stack which contains the same objects as this one - */ - ValueStack clone(); - - /** - * Queries the stack. Starts with the top, most recent object. If the expression can apply to the object, this - * method returns the result of evaluating the expression. If the expression does not apply, this method moves - * down the stack to the next object and repeats. Returns {@code null} if the expression doesn't apply to any - * objects. - * - * @param expression - * @return the evaluation of the expression against the first applicable object in the stack - */ - Object get(String expression); - - /** - * Queries the stack and converts the result to the specified type. Starts with the top, most recent object. If - * the expression can apply to the object, this method returns the result of evaluating the expression converted - * to the specified type. If the expression does not apply, this method moves down the stack to the next object - * and repeats. Returns {@code null} if the expression doesn't apply to any objects. - * - * @param expression - * @param asType the type to convert the result to - * @return the evaluation of the expression against the first applicable object in the stack converted to the - * specified type - */ - T get(String expression, Class asType); - - /** - * Queries the stack and converts the result to a {@code String}. Starts with the top, most recent object. If the - * expression can apply to the object, this method returns the result of evaluating the expression converted to a - * {@code String}. If the expression does not apply, this method moves down the stack to the next object and - * repeats. Returns {@code null} if the expression doesn't apply to any objects. - * - * @param expression - * @return the evaluation of the expression against the first applicable object in the stack converted to a {@code - * String} - */ - String getString(String expression); - - /** - * Sets a value on an object from the stack. This method starts at the top, most recent object. If the expression - * applies to that object, this methods sets the given value on that object using the expression and converting - * the type as necessary. If the expression does not apply, this method moves to the next object and repeats. - * - * @param expression - * @param value - */ - void set(String expression, Object value); - - /** - * Returns the number of object on the stack. - * - * @return size of stack - */ - int size(); -} diff --git a/api/src/main/resources/LICENSE.txt b/api/src/main/resources/LICENSE.txt deleted file mode 100644 index dd5b3a58a..000000000 --- a/api/src/main/resources/LICENSE.txt +++ /dev/null @@ -1,174 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. diff --git a/api/src/main/resources/NOTICE.txt b/api/src/main/resources/NOTICE.txt deleted file mode 100644 index cd13ec449..000000000 --- a/api/src/main/resources/NOTICE.txt +++ /dev/null @@ -1,5 +0,0 @@ -Apache Struts -Copyright 2000-2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 6e1168210..b330b2502 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-apps - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-blank diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index b50513d92..05be337ab 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-apps - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-mailreader diff --git a/apps/pom.xml b/apps/pom.xml index 526dabeb1..c09d04fa3 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-parent - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-apps diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index 48cb69d5b..57a5a0814 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-apps - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-portlet diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index c994d62bb..49918704e 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-apps - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-showcase @@ -62,12 +62,6 @@ ${pom.version} - - org.apache.struts - struts2-continuations-plugin - ${pom.version} - - org.apache.struts struts2-codebehind-plugin diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java deleted file mode 100644 index c5b6e48a9..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.showcase; - -import java.util.Random; - -import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.Preparable; -import com.uwyn.rife.continuations.ContinuableObject; - -// START SNIPPET: example -public class Guess extends ActionSupport implements Preparable, ContinuableObject { - int guess; - - public void prepare() throws Exception { - // We clear the error message state before the action. - // That is because with continuations, the original (or cloned) action is being - // executed, which will still have the old errors and potentially cause problems, - // such as with the workflow interceptor - clearErrorsAndMessages(); - } - - public String execute() throws Exception { - int answer = new Random().nextInt(100) + 1; - int tries = 5; - - while (answer != guess && tries > 0) { - pause(Action.SUCCESS); - - if (guess > answer) { - addFieldError("guess", "Too high!"); - } else if (guess < answer) { - addFieldError("guess", "Too low!"); - } - - tries--; - } - - if (answer == guess) { - addActionMessage("You got it!"); - } else { - addActionMessage("You ran out of tries, the answer was " + answer); - } - - return Action.SUCCESS; - } - - public void setGuess(int guess) { - this.guess = guess; - } -} -// END SNIPPET: example diff --git a/apps/showcase/src/main/resources/struts-continuations.xml b/apps/showcase/src/main/resources/struts-continuations.xml deleted file mode 100644 index dc806e3f8..000000000 --- a/apps/showcase/src/main/resources/struts-continuations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - guess.ftl - - - diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml index b2db05c12..62bcea395 100644 --- a/apps/showcase/src/main/resources/struts.xml +++ b/apps/showcase/src/main/resources/struts.xml @@ -8,15 +8,13 @@ - + - - - + - + @@ -26,19 +24,19 @@ - + - + - + - + - + - + @@ -48,17 +46,17 @@ - + - + - + showcase.jsp - + viewSource.jsp @@ -99,7 +97,7 @@ - {1} + {1} /empmanager/editEmployee.jsp execute diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp index 0e15e48f1..ca47952ea 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -5,7 +5,7 @@ response.setHeader("Pragma", "no-cache"); response.setHeader("Cache-Control", "no-cache"); response.setDateHeader("Expires", 0); - + // Calculate the view sources url String sourceUrl = request.getContextPath()+"/viewSource.action"; com.opensymphony.xwork2.ActionInvocation inv = com.opensymphony.xwork2.ActionContext.getContext().getActionInvocation(); @@ -14,9 +14,9 @@ com.opensymphony.xwork2.util.location.Location loc = inv.getProxy().getConfig().getLocation(); sourceUrl += "?config="+(loc != null ? loc.getURI()+":"+loc.getLineNumber() : ""); sourceUrl += "&className="+inv.getProxy().getConfig().getClassName(); - + if (inv.getResult() != null && inv.getResult() instanceof org.apache.struts2.dispatcher.StrutsResultSupport) { - sourceUrl += "&page="+mapping.getNamespace()+"/"+((org.apache.struts2.dispatcher.StrutsResultSupport)inv.getResult()).getLastFinalLocation(); + sourceUrl += "&page="+mapping.getNamespace()+"/"+((org.apache.struts2.dispatcher.StrutsResultSupport)inv.getResult()).getLastFinalLocation(); } } else { sourceUrl += "?page="+request.getServletPath(); @@ -104,11 +104,11 @@ -
-

- View Sources -

-
+
+

+ View Sources +

+
diff --git a/apps/showcase/src/main/webapp/ajax/index.jsp b/apps/showcase/src/main/webapp/ajax/index.jsp index 037ce21d9..4434c4b11 100644 --- a/apps/showcase/src/main/webapp/ajax/index.jsp +++ b/apps/showcase/src/main/webapp/ajax/index.jsp @@ -15,9 +15,9 @@ Note: The Ajax tags are experimental. These examples have only been tested under
  • Remote div tag
  • Remote link tag
  • Tabbed panel
    • -
  • Widgets (may not work in all browsers!) +
  • Widgets (may not work in all browsers!) see the dojo website for more information
    • -
  • (broken) Remote forms
    • +
  • Remote forms
    • diff --git a/apps/showcase/src/main/webapp/continuations/guess.ftl b/apps/showcase/src/main/webapp/continuations/guess.ftl deleted file mode 100644 index 453b0b9a5..000000000 --- a/apps/showcase/src/main/webapp/continuations/guess.ftl +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - -<#list actionMessages as msg> - ${msg} - - -<@s.form action="guess" method="post"> - <@s.textfield label="Guess" name="guess"/> - <@s.submit value="Guess"/> - - - - diff --git a/apps/showcase/src/main/webapp/hangman/hangmanMenu.ftl b/apps/showcase/src/main/webapp/hangman/hangmanMenu.ftl index 717339e57..c9b58ed0e 100644 --- a/apps/showcase/src/main/webapp/hangman/hangmanMenu.ftl +++ b/apps/showcase/src/main/webapp/hangman/hangmanMenu.ftl @@ -11,7 +11,7 @@
  • <@s.url id="url" action="hangmanAjax" namespace="/hangman" /> - <@s.a href="%{#url}">Hangman (Ajax - Experimental) + (broken) <@s.a href="%{#url}">Hangman (Ajax - Experimental)
    • diff --git a/apps/showcase/src/main/webapp/showcase.jsp b/apps/showcase/src/main/webapp/showcase.jsp index cb029ab37..459792648 100644 --- a/apps/showcase/src/main/webapp/showcase.jsp +++ b/apps/showcase/src/main/webapp/showcase.jsp @@ -1,6 +1,6 @@ -<%-- +<%-- showcase.jsp - + @version $Date$ $Id$ --%> @@ -32,7 +32,7 @@

    <%-- THIS LIST IS MAINTAINED IN WEB-INF/decorators/main.jsp TO CREATE THE MENU BAR -- EDIT THERE AND COPY HERE --%>

    - -

    Sandbox

    -

    - These examples are under development and may not be fully operational. -

    - -

    diff --git a/apps/showcase/src/main/webapp/tiles/layout.jsp b/apps/showcase/src/main/webapp/tiles/layout.jsp index 3162ffbc3..c3724018a 100644 --- a/apps/showcase/src/main/webapp/tiles/layout.jsp +++ b/apps/showcase/src/main/webapp/tiles/layout.jsp @@ -1,4 +1,4 @@ -<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %> +<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%-- Show usage; Used in Header --%> @@ -6,10 +6,10 @@ <tiles:getAsString name="title"/> - +

    - +

    diff --git a/assembly/pom.xml b/assembly/pom.xml index 34e43b5cd..8524f8d7b 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -33,7 +33,7 @@ org.apache.struts struts2-parent - 2.1.0-SNAPSHOT + 2.0.6 @@ -155,12 +155,13 @@ org.apache.struts - struts2-api + struts2-core ${version} + org.apache.struts - struts2-core + struts2-codebehind-plugin ${version} @@ -200,6 +201,12 @@ ${version}     + + org.apache.struts + struts2-spring-plugin + ${version} + + org.apache.struts struts2-sitegraph-plugin @@ -425,13 +432,6 @@ provided - - org.rifers - rife-continuations - 0.0.2 - provided - - javax.servlet diff --git a/core/pom.xml b/core/pom.xml index c8f97fa5f..352f01743 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-parent - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-core @@ -255,12 +255,6 @@ 2.0.1 - - - - - - freemarker freemarker diff --git a/core/src/main/resources/META-INF/struts-tags.tld b/core/src/main/resources/META-INF/struts-tags.tld deleted file mode 100644 index 1892e1977..000000000 --- a/core/src/main/resources/META-INF/struts-tags.tld +++ /dev/null @@ -1,9182 +0,0 @@ - - - - 2.2.3 - 1.2 - s - /struts-tags - "Struts Tags" - - - action - org.apache.struts2.views.jsp.ActionTag - JSP - - - executeResult - false - true - - - - flush - false - true - - - - id - false - true - - - - ignoreContextParams - false - true - - - - name - true - true - - - - namespace - false - true - - - - - actionerror - org.apache.struts2.views.jsp.ui.ActionErrorTag - empty - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - actionmessage - org.apache.struts2.views.jsp.ui.ActionMessageTag - empty - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - a - org.apache.struts2.views.jsp.ui.AnchorTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - errorText - false - true - - - - executeScripts - false - true - - - - formFilter - false - true - - - - formId - false - true - - - - handler - false - true - - - - href - false - true - - - - id - false - true - - - - indicator - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - listenTopics - false - true - - - - loadingText - false - true - - - - name - false - true - - - - notifyTopics - false - true - - - - onLoadJS - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - openTemplate - false - true - - - - preInvokeJS - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - showErrorTransportText - false - true - - - - showLoadingText - false - true - - - - tabindex - false - true - - - - targets - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - append - org.apache.struts2.views.jsp.iterator.AppendIteratorTag - JSP - - - id - false - true - - - - - autocompleter - org.apache.struts2.views.jsp.ui.AutocompleterTag - JSP - - - accesskey - false - true - - - - autoComplete - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - delay - false - true - - - - disabled - false - true - - - - dropdownHeight - false - true - - - - dropdownWidth - false - true - - - - emptyOption - false - true - - - - forceValidOption - false - true - - - - formFilter - false - true - - - - formId - false - true - - - - headerKey - false - true - - - - headerValue - false - true - - - - href - false - true - - - - id - false - true - - - - indicator - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - list - false - true - - - - listKey - false - true - - - - listValue - false - true - - - - listenTopics - false - true - - - - loadMinimumCount - false - true - - - - loadOnTextChange - false - true - - - - maxLength - false - true - - - - maxlength - false - true - - - - name - false - true - - - - notifyTopics - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - readonly - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - searchType - false - true - - - - showDownArrow - false - true - - - - size - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - bean - org.apache.struts2.views.jsp.BeanTag - JSP - - - id - false - true - - - - name - true - true - - - - - checkbox - org.apache.struts2.views.jsp.ui.CheckboxTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - fieldValue - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - checkboxlist - org.apache.struts2.views.jsp.ui.CheckboxListTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - list - true - true - - - - listKey - false - true - - - - listValue - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - combobox - org.apache.struts2.views.jsp.ui.ComboBoxTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - emptyOption - false - true - - - - headerKey - false - true - - - - headerValue - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - list - true - true - - - - listKey - false - true - - - - listValue - false - true - - - - maxLength - false - true - - - - maxlength - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - readonly - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - size - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - date - org.apache.struts2.views.jsp.DateTag - empty - - - format - false - false - - - - id - false - true - - - - name - true - true - - - - nice - false - true - - - - - datetimepicker - org.apache.struts2.views.jsp.ui.DateTimePickerTag - JSP - - - accesskey - false - true - - - - adjustWeeks - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - dayWidth - false - true - - - - disabled - false - true - - - - displayFormat - false - true - - - - displayWeeks - false - true - - - - endDate - false - true - - - - formatLength - false - true - - - - iconPath - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - language - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - startDate - false - true - - - - staticDisplay - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - toggleDuration - false - true - - - - toggleType - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - type - false - true - - - - value - false - true - - - - weekStartsOn - false - true - - - - - debug - org.apache.struts2.views.jsp.ui.DebugTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - div - org.apache.struts2.views.jsp.ui.DivTag - JSP - - - accesskey - false - true - - - - afterLoading - false - true - - - - autoStart - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - delay - false - true - - - - disabled - false - true - - - - errorText - false - true - - - - executeScripts - false - true - - - - formFilter - false - true - - - - formId - false - true - - - - handler - false - true - - - - href - false - true - - - - id - false - true - - - - indicator - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - listenTopics - false - true - - - - loadingText - false - true - - - - name - false - true - - - - notifyTopics - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - openTemplate - false - true - - - - refreshOnShow - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - showErrorTransportText - false - true - - - - showLoadingText - false - true - - - - startTimerListenTopics - false - true - - - - stopTimerListenTopics - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - updateFreq - false - true - - - - value - false - true - - - - - doubleselect - org.apache.struts2.views.jsp.ui.DoubleSelectTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - doubleAccesskey - false - true - - - - doubleCssClass - false - true - - - - doubleCssStyle - false - true - - - - doubleDisabled - false - true - - - - doubleEmptyOption - false - true - - - - doubleHeaderKey - false - true - - - - doubleHeaderValue - false - true - - - - doubleId - false - true - - - - doubleList - true - true - - - - doubleListKey - false - true - - - - doubleListValue - false - true - - - - doubleMultiple - false - true - - - - doubleName - true - true - - - - doubleOnblur - false - true - - - - doubleOnchange - false - true - - - - doubleOnclick - false - true - - - - doubleOndblclick - false - true - - - - doubleOnfocus - false - true - - - - doubleOnkeydown - false - true - - - - doubleOnkeypress - false - true - - - - doubleOnkeyup - false - true - - - - doubleOnmousedown - false - true - - - - doubleOnmousemove - false - true - - - - doubleOnmouseout - false - true - - - - doubleOnmouseover - false - true - - - - doubleOnmouseup - false - true - - - - doubleOnselect - false - true - - - - doubleSize - false - true - - - - doubleValue - false - true - - - - emptyOption - false - true - - - - formName - false - true - - - - headerKey - false - true - - - - headerValue - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - list - true - true - - - - listKey - false - true - - - - listValue - false - true - - - - multiple - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - size - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - else - org.apache.struts2.views.jsp.ElseTag - JSP - - - id - false - true - - - - - elseif - org.apache.struts2.views.jsp.ElseIfTag - JSP - - - id - false - true - - - - test - true - true - - - - - fielderror - org.apache.struts2.views.jsp.ui.FieldErrorTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - file - org.apache.struts2.views.jsp.ui.FileTag - JSP - - - accept - false - true - - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - size - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - form - org.apache.struts2.views.jsp.ui.FormTag - JSP - - - acceptcharset - false - true - - - - accesskey - false - true - - - - action - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - enctype - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - method - false - true - - - - name - false - true - - - - namespace - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - onsubmit - false - true - - - - openTemplate - false - true - - - - portletMode - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - target - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - validate - false - true - - - - value - false - true - - - - windowState - false - true - - - - - component - org.apache.struts2.views.jsp.ui.ComponentTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - head - org.apache.struts2.views.jsp.ui.HeadTag - empty - - - accesskey - false - true - - - - calendarcss - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - debug - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - hidden - org.apache.struts2.views.jsp.ui.HiddenTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - i18n - org.apache.struts2.views.jsp.I18nTag - JSP - - - id - false - true - - - - name - true - true - - - - - if - org.apache.struts2.views.jsp.IfTag - JSP - - - id - false - true - - - - test - true - true - - - - - include - org.apache.struts2.views.jsp.IncludeTag - JSP - - - id - false - true - - - - value - true - true - - - - - inputtransferselect - org.apache.struts2.views.jsp.ui.InputTransferSelectTag - JSP - - - accesskey - false - true - - - - addLabel - false - true - - - - allowRemoveAll - false - true - - - - allowUpDown - false - true - - - - buttonCssClass - false - true - - - - buttonCssStyle - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - downLabel - false - true - - - - headerKey - false - true - - - - headerValue - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - leftTitle - false - true - - - - list - true - true - - - - listKey - false - true - - - - listValue - false - true - - - - multiple - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - removeAllLabel - false - true - - - - removeLabel - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - rightTitle - false - true - - - - size - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - upLabel - false - true - - - - value - false - true - - - - - iterator - org.apache.struts2.views.jsp.IteratorTag - JSP - - - id - false - true - - - - status - false - true - - - - value - false - true - - - - - label - org.apache.struts2.views.jsp.ui.LabelTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - for - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - merge - org.apache.struts2.views.jsp.iterator.MergeIteratorTag - JSP - - - id - false - true - - - - - optgroup - org.apache.struts2.views.jsp.ui.OptGroupTag - JSP - - - disabled - false - true - - - - id - false - true - - - - label - false - true - - - - list - false - true - - - - listKey - false - true - - - - listValue - false - true - - - - - optiontransferselect - org.apache.struts2.views.jsp.ui.OptionTransferSelectTag - JSP - - - accesskey - false - true - - - - addAllToLeftLabel - false - true - - - - addAllToRightLabel - false - true - - - - addToLeftLabel - false - true - - - - addToRightLabel - false - true - - - - allowAddAllToLeft - false - true - - - - allowAddAllToRight - false - true - - - - allowAddToLeft - false - true - - - - allowAddToRight - false - true - - - - allowSelectAll - false - true - - - - allowUpDownOnLeft - false - true - - - - allowUpDownOnRight - false - true - - - - buttonCssClass - false - true - - - - buttonCssStyle - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - doubleAccesskey - false - true - - - - doubleCssClass - false - true - - - - doubleCssStyle - false - true - - - - doubleDisabled - false - true - - - - doubleEmptyOption - false - true - - - - doubleHeaderKey - false - true - - - - doubleHeaderValue - false - true - - - - doubleId - false - true - - - - doubleList - true - true - - - - doubleListKey - false - true - - - - doubleListValue - false - true - - - - doubleMultiple - false - true - - - - doubleName - true - true - - - - doubleOnblur - false - true - - - - doubleOnchange - false - true - - - - doubleOnclick - false - true - - - - doubleOndblclick - false - true - - - - doubleOnfocus - false - true - - - - doubleOnkeydown - false - true - - - - doubleOnkeypress - false - true - - - - doubleOnkeyup - false - true - - - - doubleOnmousedown - false - true - - - - doubleOnmousemove - false - true - - - - doubleOnmouseout - false - true - - - - doubleOnmouseover - false - true - - - - doubleOnmouseup - false - true - - - - doubleOnselect - false - true - - - - doubleSize - false - true - - - - doubleValue - false - true - - - - emptyOption - false - true - - - - formName - false - true - - - - headerKey - false - true - - - - headerValue - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - leftDownLabel - false - true - - - - leftTitle - false - true - - - - leftUpLabel - false - true - - - - list - true - true - - - - listKey - false - true - - - - listValue - false - true - - - - multiple - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - rightDownLabel - false - true - - - - rightTitle - false - true - - - - rightUpLabel - false - true - - - - selectAllLabel - false - true - - - - size - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - param - org.apache.struts2.views.jsp.ParamTag - JSP - - - id - false - true - - - - name - false - true - - - - value - false - true - - - - - password - org.apache.struts2.views.jsp.ui.PasswordTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - maxLength - false - true - - - - maxlength - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - readonly - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - showPassword - false - true - - - - size - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - property - org.apache.struts2.views.jsp.PropertyTag - empty - - - default - false - true - value attribute is null]]> - - - escape - false - true - - - - id - false - true - - - - value - false - true - - - - - push - org.apache.struts2.views.jsp.PushTag - JSP - - - id - false - true - - - - value - true - true - - - - - radio - org.apache.struts2.views.jsp.ui.RadioTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - list - true - true - - - - listKey - false - true - - - - listValue - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - reset - org.apache.struts2.views.jsp.ui.ResetTag - JSP - - - accesskey - false - true - - - - action - false - true - - - - align - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - input type reset, since button text will always be the value parameter.]]> - - - labelposition - false - true - - - - method - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - type - false - true - input, button and image.]]> - - - value - false - true - - - - - select - org.apache.struts2.views.jsp.ui.SelectTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - emptyOption - false - true - - - - headerKey - false - true - - - - headerValue - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - list - true - true - - - - listKey - false - true - - - - listValue - false - true - - - - multiple - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - size - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - set - org.apache.struts2.views.jsp.SetTag - empty - - - id - false - true - - - - name - true - true - value]]> - - - scope - false - true - application, session, request, page, or action.]]> - - - value - false - true - name]]> - - - - submit - org.apache.struts2.views.jsp.ui.SubmitTag - JSP - - - accesskey - false - true - - - - action - false - true - - - - align - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - errorText - false - true - - - - executeScripts - false - true - - - - formFilter - false - true - - - - formId - false - true - - - - handler - false - true - - - - href - false - true - - - - id - false - true - - - - indicator - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - listenTopics - false - true - - - - loadingText - false - true - - - - method - false - true - - - - name - false - true - - - - notifyTopics - false - true - - - - onLoadJS - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - preInvokeJS - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - showErrorTransportText - false - true - - - - showLoadingText - false - true - - - - src - false - true - image type submit button. Will have no effect for types input and button.]]> - - - tabindex - false - true - - - - targets - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - This tag will usually use the ajax theme.]]> - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - type - false - true - input, button and image.]]> - - - value - false - true - - - - - tabbedPanel - org.apache.struts2.views.jsp.ui.TabbedPanelTag - JSP - - - accesskey - false - true - - - - closeButton - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - doLayout - false - true - - - - id - true - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - openTemplate - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - selectedTab - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateCssPath - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - text - org.apache.struts2.views.jsp.TextTag - JSP - - - id - false - true - - - - name - true - true - - - - - textarea - org.apache.struts2.views.jsp.ui.TextareaTag - JSP - - - accesskey - false - true - - - - cols - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - readonly - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - rows - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - wrap - false - true - - - - - textfield - org.apache.struts2.views.jsp.ui.TextFieldTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - maxLength - false - true - - - - maxlength - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - readonly - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - size - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - token - org.apache.struts2.views.jsp.ui.TokenTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - tree - org.apache.struts2.views.jsp.ui.TreeTag - JSP - - - accesskey - false - true - - - - blankIconSrc - false - true - - - - childCollectionProperty - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - expandIconSrcMinus - false - true - - - - expandIconSrcPlus - false - true - - - - gridIconSrcC - false - true - - - - gridIconSrcL - false - true - - - - gridIconSrcP - false - true - - - - gridIconSrcV - false - true - - - - gridIconSrcX - false - true - - - - gridIconSrcY - false - true - - - - iconHeight - false - true - - - - iconWidth - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - nodeIdProperty - false - true - - - - nodeTitleProperty - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - openTemplate - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - rootNode - false - true - - - - showGrid - false - true - - - - showRootGrid - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateCssPath - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - toggle - false - true - - - - toggleDuration - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - treeCollapsedTopic - false - true - - - - treeExpandedTopic - false - true - - - - treeSelectedTopic - false - true - - - - value - false - true - - - - - treenode - org.apache.struts2.views.jsp.ui.TreeNodeTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - true - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - openTemplate - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - url - org.apache.struts2.views.jsp.URLTag - JSP - - - action - false - true - - - - anchor - false - true - - - - encode - false - true - - - - id - false - true - - - - includeContext - false - true - - - - includeParams - false - true - - - - method - false - true - - - - namespace - false - true - - - - portletMode - false - true - - - - portletUrlType - false - true - - - - scheme - false - true - - - - value - false - true - - - - windowState - false - true - - - - - updownselect - org.apache.struts2.views.jsp.ui.UpDownSelectTag - JSP - - - accesskey - false - true - - - - allowMoveDown - false - true - - - - allowMoveUp - false - true - - - - allowSelectAll - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - emptyOption - false - true - - - - headerKey - false - true - - - - headerValue - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - list - true - true - - - - listKey - false - true - - - - listValue - false - true - - - - moveDownLabel - false - true - - - - moveUpLabel - false - true - - - - multiple - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - selectAllLabel - false - true - - - - size - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - table - org.apache.struts2.views.jsp.ui.table.WebTableTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - onblur - false - true - - - - onchange - false - true - - - - onclick - false - true - - - - ondblclick - false - true - - - - onfocus - false - true - - - - onkeydown - false - true - - - - onkeypress - false - true - - - - onkeyup - false - true - - - - onmousedown - false - true - - - - onmousemove - false - true - - - - onmouseout - false - true - - - - onmouseover - false - true - - - - onmouseup - false - true - - - - onselect - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - sortColumn - false - true - - - - sortOrder - false - true - - - - sortable - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - generator - org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag - JSP - - - converter - false - true - val into an object]]> - - - count - false - true - - - - id - false - true - - - - separator - true - true - val into entries of the iterator]]> - - - val - true - true - - - - - sort - org.apache.struts2.views.jsp.iterator.SortIteratorTag - JSP - - - comparator - true - true - - - - source - false - true - - - - - subset - org.apache.struts2.views.jsp.iterator.SubsetIteratorTag - JSP - - - count - false - true - - - - decider - false - true - - - - source - false - true - - - - start - false - true - - - - diff --git a/core/src/site/confluence/ww-template-autoexport.html b/core/src/site/confluence/ww-template-autoexport.html deleted file mode 100644 index 18cdb5d48..000000000 --- a/core/src/site/confluence/ww-template-autoexport.html +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - $page.title - - - - - - - -
    -  $autoexport.breadcrumbs($page) - -
    - - - - - - -
    -
    - -
    -
    - - -
    $page.space.name
    -
    $page.title
    - -
    - - - Edit Page -   - - - Browse Space -   - - - Add Page -   - - - Add News -
    -
    -
    - #editReport() -
    - -
    -
    - $body -
    - - #if ($page.hasChildren()) -
    - Children - - Show Children - -
    - - #end - -
    -
    -
    - Generated by - $autoexport.confluenceInfo - $autoexport.autoexportInfo -
    - - diff --git a/core/src/test/java/org/apache/struts2/TestAction.java b/core/src/test/java/org/apache/struts2/TestAction.java index a0a1c8754..3bc050ba6 100644 --- a/core/src/test/java/org/apache/struts2/TestAction.java +++ b/core/src/test/java/org/apache/struts2/TestAction.java @@ -40,7 +40,7 @@ public class TestAction extends ActionSupport { private Collection collection2; private Map map; private String foo; - private Integer fooInt; + private String result; private User user; private String[] array; @@ -62,7 +62,7 @@ public class TestAction extends ActionSupport { public void setMap(Map map) { this.map = map; - } + }private Integer fooInt; public String getFoo() { return foo; @@ -135,7 +135,7 @@ public class TestAction extends ActionSupport { public void setFooInt(Integer fooInt) { this.fooInt = fooInt; } - + public String execute() throws Exception { if (result == null) { result = Action.SUCCESS; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java index 2ffbac16f..d11e1b195 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java @@ -379,7 +379,6 @@ public class SelectTest extends AbstractUITagTest { verify(SelectTag.class.getResource("Select-6.txt")); } - public void testSimpleInteger() throws Exception { TestAction testAction = (TestAction) action; @@ -466,7 +465,7 @@ public class SelectTest extends AbstractUITagTest { return id; } } - + private void prepareTagGeneric(SelectTag tag) { TestAction testAction = (TestAction) action; ArrayList collection = new ArrayList(); diff --git a/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java b/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java index 6d0007a94..82c0aaf94 100644 --- a/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java +++ b/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java @@ -74,22 +74,6 @@ public class UrlHelperTest extends StrutsTestCase { assertEquals(expectedUrl, result); } - - public void testBuildParametersStringWithUrlHavingSomeExistingParameters() throws Exception { - String expectedUrl = "http://localhost:8080/myContext/myPage.jsp?initParam=initValue&param1=value1&param2=value2"; - - Map parameters = new LinkedHashMap(); - parameters.put("param1", "value1"); - parameters.put("param2", "value2"); - - StringBuffer url = new StringBuffer("http://localhost:8080/myContext/myPage.jsp?initParam=initValue"); - - UrlHelper.buildParametersString(parameters, url); - - assertEquals( - expectedUrl, url.toString()); - } - public void testForceAddNullSchemeHostAndPort() throws Exception { String expectedUrl = "http://localhost/contextPath/path1/path2/myAction.action"; @@ -109,8 +93,25 @@ public class UrlHelperTest extends StrutsTestCase { null, true, true, true); assertEquals(expectedUrl, result); mockHttpServletRequest.verify(); + } + + public void testBuildParametersStringWithUrlHavingSomeExistingParameters() throws Exception { + String expectedUrl = "http://localhost:8080/myContext/myPage.jsp?initParam=initValue&param1=value1&param2=value2"; + + Map parameters = new LinkedHashMap(); + parameters.put("param1", "value1"); + parameters.put("param2", "value2"); + + StringBuffer url = new StringBuffer("http://localhost:8080/myContext/myPage.jsp?initParam=initValue"); + + UrlHelper.buildParametersString(parameters, url); + + assertEquals( + expectedUrl, url.toString()); } + + public void testBuildWithRootContext() { String expectedUrl = "/MyAction.action"; diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml index 79027a449..409e9fd95 100644 --- a/plugins/codebehind/pom.xml +++ b/plugins/codebehind/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-codebehind-plugin diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index cdcb15adb..2bd24127f 100644 --- a/plugins/config-browser/pom.xml +++ b/plugins/config-browser/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-config-browser-plugin diff --git a/plugins/continuations/pom.xml b/plugins/continuations/pom.xml deleted file mode 100644 index b5dd014ce..000000000 --- a/plugins/continuations/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - 4.0.0 - - org.apache.struts - struts2-plugins - 2.1.0-SNAPSHOT - - org.apache.struts - struts2-continuations-plugin - jar - Struts 2 Continuations Plugin - - - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/continuations/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/continuations/ - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/continuations/ - - - - - org.rifers - rife-continuations - 0.0.2 - - - junit - junit - test - 3.8.1 - - - - - diff --git a/plugins/continuations/src/main/java/org/apache/struts2/continuations/ContinuationsActionEventListener.java b/plugins/continuations/src/main/java/org/apache/struts2/continuations/ContinuationsActionEventListener.java deleted file mode 100644 index c511bfea7..000000000 --- a/plugins/continuations/src/main/java/org/apache/struts2/continuations/ContinuationsActionEventListener.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * $Id: Dispatcher.java 484733 2006-12-08 20:16:16Z mrdon $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.continuations; - -import java.util.Map; - -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionEventListener; -import com.opensymphony.xwork2.util.ValueStack; -import com.uwyn.rife.continuations.ContinuableObject; -import com.uwyn.rife.continuations.ContinuationConfig; -import com.uwyn.rife.continuations.ContinuationContext; -import com.uwyn.rife.continuations.ContinuationManager; -import com.uwyn.rife.continuations.exceptions.PauseException; - -/** - * Hooks Rife continuations into key events in the Action instance lifecycle - */ -public class ContinuationsActionEventListener implements ActionEventListener { - ContinuationManager cm; - - public ContinuationsActionEventListener() { - if (ContinuationConfig.getInstance() != null) { - cm = new ContinuationManager(); - } - } - - /** - * Sets the continuation context and loads the proper continuation action - */ - public Object prepare(Object action, ValueStack stack) { - Map params = ActionContext.getContext().getParameters(); - String contId = (String) params.get(StrutsContinuationConfig.CONTINUE_PARAM); - if (contId != null) { - // remove the continue key from the params - we don't want to bother setting - // on the value stack since we know it won't work. Besides, this breaks devMode! - params.remove(StrutsContinuationConfig.CONTINUE_PARAM); - } - - - if (action instanceof ContinuableObject) { - ContinuationContext ctx = ContinuationContext.createInstance((ContinuableObject) action); - if (action instanceof NonCloningContinuableObject) { - ctx.setShouldClone(false); - } - } - - try { - if (contId != null) { - ContinuationContext context = cm.getContext(contId); - if (context != null) { - ContinuationContext.setContext(context); - // use the original action instead - Object original = context.getContinuable(); - action = original; - } - } - } catch (CloneNotSupportedException e) { - e.printStackTrace(); - } - return action; - } - - /** - * Handles the normal continuation exception - */ - public String handleException(Throwable t, ValueStack stack) { - if (t instanceof PauseException) { - // continuations in effect! - PauseException pe = ((PauseException) t); - ContinuationContext context = pe.getContext(); - String result = (String) pe.getParameters(); - stack.getContext().put(StrutsContinuationConfig.CONTINUE_KEY, context.getId()); - cm.addContext(context); - - return result; - } - return null; - } -} diff --git a/plugins/continuations/src/main/java/org/apache/struts2/continuations/ContinuationsClassLoader.java b/plugins/continuations/src/main/java/org/apache/struts2/continuations/ContinuationsClassLoader.java deleted file mode 100644 index cd096a345..000000000 --- a/plugins/continuations/src/main/java/org/apache/struts2/continuations/ContinuationsClassLoader.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * $Id: Dispatcher.java 484733 2006-12-08 20:16:16Z mrdon $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.continuations; - -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.StrutsConstants; - -import com.opensymphony.xwork2.XWorkException; -import com.opensymphony.xwork2.inject.Inject; - -/** - * Uses the Rife continuations classloader to bytecode enhance actions. Only - * enhances actions in the configured package. - */ -public class ContinuationsClassLoader extends ClassLoader { - - private String base; - private ClassLoader parent; - - private static final Log LOG = LogFactory.getLog(ContinuationsClassLoader.class); - - @Inject(value=StrutsConstants.STRUTS_CONTINUATIONS_PACKAGE, required=false) - public void setContinuationPackage(String continuationPackage) { - - // This reflection silliness is to ensure Rife is optional - Class contConfig = null; - try { - contConfig = Class.forName("com.uwyn.rife.continuations.ContinuationConfig"); - } catch (ClassNotFoundException ex) { - throw new XWorkException("Unable to use continuations package, as the Rife " + - "continuations jar is missing", ex); - } - try { - Method m = contConfig.getMethod("setInstance", contConfig); - m.invoke(contConfig, new StrutsContinuationConfig()); - } catch (NoSuchMethodException ex) { - throw new XWorkException("Incorrect version of the Rife continuation library", ex); - } catch (IllegalAccessException ex) { - throw new XWorkException("Incorrect version of the Rife continuation library", ex); - } catch (InvocationTargetException ex) { - throw new XWorkException("Unable to initialize the Rife continuation library", ex); - } - this.base = continuationPackage; - this.parent = Thread.currentThread().getContextClassLoader(); - } - - public Class loadClass(String name) throws ClassNotFoundException { - if (validName(name)) { - Class clazz = findLoadedClass(name); - if (clazz == null) { - try { - byte[] bytes = com.uwyn.rife.continuations.util.ClassByteUtil.getBytes(name, parent); - if (bytes == null) { - throw new ClassNotFoundException(name); - } - - byte[] resume_bytes = null; - try { - resume_bytes = com.uwyn.rife.continuations.ContinuationInstrumentor.instrument(bytes, name, false); - } catch (ClassNotFoundException e) { - // this can happen when the Rife Continuations code gets broken (there are bugs in it still, ya know!) - // rather than making a big deal, we'll quietly log this and move on - // when more people are using continuations, perhaps we'll raise the log level - LOG.debug("Error instrumenting with RIFE/Continuations, " + - "loading class normally without continuation support", e); - } - - if (resume_bytes == null) { - return parent.loadClass(name); - } else { - return defineClass(name, resume_bytes, 0, resume_bytes.length); - } - } catch (IOException e) { - throw new XWorkException("Continuation error", e); - } - } else { - return clazz; - } - } else { - return parent.loadClass(name); - } - } - - private boolean validName(String name) { - return name.startsWith(base + "."); - } -} diff --git a/plugins/continuations/src/main/java/org/apache/struts2/continuations/ContinuationsExtraParameterProvider.java b/plugins/continuations/src/main/java/org/apache/struts2/continuations/ContinuationsExtraParameterProvider.java deleted file mode 100644 index 9065e78a9..000000000 --- a/plugins/continuations/src/main/java/org/apache/struts2/continuations/ContinuationsExtraParameterProvider.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * $Id: URL.java 474191 2006-11-13 08:30:40Z mrdon $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.continuations; - -import java.util.Collections; -import java.util.Map; - -import org.apache.struts2.components.URL.ExtraParameterProvider; - -import com.opensymphony.xwork2.ActionContext; - -/** - * Injects the continuation id into the url parameters - */ -public class ContinuationsExtraParameterProvider implements ExtraParameterProvider { - - public Map getExtraParameters() { - // tie in the continuation parameter - String continueId = (String) ActionContext.getContext().get(StrutsContinuationConfig.CONTINUE_KEY); - if (continueId != null) { - return Collections.singletonMap(StrutsContinuationConfig.CONTINUE_PARAM, continueId); - } - return Collections.EMPTY_MAP; - } - -} diff --git a/plugins/continuations/src/main/java/org/apache/struts2/continuations/NonCloningContinuableObject.java b/plugins/continuations/src/main/java/org/apache/struts2/continuations/NonCloningContinuableObject.java deleted file mode 100644 index f84e21c8a..000000000 --- a/plugins/continuations/src/main/java/org/apache/struts2/continuations/NonCloningContinuableObject.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * $Id: URL.java 474191 2006-11-13 08:30:40Z mrdon $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.continuations; - -import com.uwyn.rife.continuations.ContinuableObject; - -/** - * Implementing this interface indicates that the action should not be cloned, but instead should be re-used. This is - * needed when you are using objects, fields, and method variables that cannot be cloned. The downside to using this is - * that the advanced forward/backward historical support that normally automatically comes with continuations is no - * longer available. - */ -public interface NonCloningContinuableObject extends ContinuableObject { -} diff --git a/plugins/continuations/src/main/java/org/apache/struts2/continuations/StrutsContinuationConfig.java b/plugins/continuations/src/main/java/org/apache/struts2/continuations/StrutsContinuationConfig.java deleted file mode 100644 index 47c84f2ed..000000000 --- a/plugins/continuations/src/main/java/org/apache/struts2/continuations/StrutsContinuationConfig.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * $Id: URL.java 474191 2006-11-13 08:30:40Z mrdon $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ -package org.apache.struts2.continuations; - -import com.uwyn.rife.continuations.ContinuationConfig; - -/** - * RIFE Continuation configuration. - */ -public class StrutsContinuationConfig extends ContinuationConfig { - public static final String CONTINUE_PARAM = "__continue"; - public static final String CONTINUE_KEY = "__continue"; - - public String getContinuableClassInternalName() { - return "com.opensymphony.xwork2.ActionSupport"; - } - - public String getContinuableInterfaceInternalName() { - return "com.opensymphony.xwork2.Action"; - } - - public String getEntryMethod() { - return "execute()Ljava/lang/String;"; - } - - public String getContinuableClassOrInterfaceName() { - return "com.opensymphony.xwork2.ActionSupport"; - } - - public String getPauseSignature() { - return "(Ljava/lang/String;)V"; - } -} diff --git a/plugins/continuations/src/main/resources/LICENSE.txt b/plugins/continuations/src/main/resources/LICENSE.txt deleted file mode 100644 index dd5b3a58a..000000000 --- a/plugins/continuations/src/main/resources/LICENSE.txt +++ /dev/null @@ -1,174 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. diff --git a/plugins/continuations/src/main/resources/NOTICE.txt b/plugins/continuations/src/main/resources/NOTICE.txt deleted file mode 100644 index cd13ec449..000000000 --- a/plugins/continuations/src/main/resources/NOTICE.txt +++ /dev/null @@ -1,5 +0,0 @@ -Apache Struts -Copyright 2000-2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/plugins/continuations/src/main/resources/struts-plugin.xml b/plugins/continuations/src/main/resources/struts-plugin.xml deleted file mode 100644 index 0901b686d..000000000 --- a/plugins/continuations/src/main/resources/struts-plugin.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index 9030e89fe..4a3ed933d 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-jasperreports-plugin diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java index d193e9683..8c9cf37bf 100644 --- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java +++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java @@ -32,7 +32,14 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sf.jasperreports.engine.*; +import net.sf.jasperreports.engine.JRException; +import net.sf.jasperreports.engine.JRExporter; +import net.sf.jasperreports.engine.JRExporterParameter; +import net.sf.jasperreports.engine.JRParameter; +import net.sf.jasperreports.engine.JasperExportManager; +import net.sf.jasperreports.engine.JasperFillManager; +import net.sf.jasperreports.engine.JasperPrint; +import net.sf.jasperreports.engine.JasperReport; import net.sf.jasperreports.engine.export.JRCsvExporter; import net.sf.jasperreports.engine.export.JRCsvExporterParameter; import net.sf.jasperreports.engine.export.JRHtmlExporter; @@ -44,11 +51,11 @@ import net.sf.jasperreports.engine.util.JRLoader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import com.opensymphony.xwork2.util.TextUtils; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.StrutsResultSupport; + import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.util.TextUtils; import com.opensymphony.xwork2.util.ValueStack; /** diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index a087c130f..48820471b 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-jfreechart-plugin @@ -19,68 +19,68 @@ - - - j4 - - - - org.codehaus.mojo - retrotranslator-maven-plugin - - - retrotranslate - - - - - maven-jar-plugin - - - create-j4-jar - jar - - ${project.build.directory}/classes-retro - j4 - - - ${project.artifactId}-j4 - ${project.organization.name} - ${project.organization.name} - ${project.description} - ${project.version} - ${scm.revision} - - - - - - - - - - - sun.jdk - rt - 1.4.0 - system - - ${java14.jar} - - - net.sf.retrotranslator - retrotranslator-runtime - 1.0.8 - - - + --> + j4 + + + + org.codehaus.mojo + retrotranslator-maven-plugin + + + retrotranslate + + + + + maven-jar-plugin + + + create-j4-jar + jar + + ${project.build.directory}/classes-retro + j4 + + + ${project.artifactId}-j4 + ${project.organization.name} + ${project.organization.name} + ${project.description} + ${project.version} + ${scm.revision} + + + + + + + + + + + sun.jdk + rt + 1.4.0 + system + + ${java14.jar} + + + net.sf.retrotranslator + retrotranslator-runtime + 1.0.8 + + + diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml index 5c4bac9ce..6ac8f1fb8 100644 --- a/plugins/jsf/pom.xml +++ b/plugins/jsf/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-jsf-plugin diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml index 270f524b7..1e7ec5eca 100644 --- a/plugins/pell-multipart/pom.xml +++ b/plugins/pell-multipart/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-pell-multipart-plugin diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index 0ce3676ba..6fca4c1a6 100644 --- a/plugins/plexus/pom.xml +++ b/plugins/plexus/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-plexus-plugin diff --git a/plugins/pom.xml b/plugins/pom.xml index 2a6f6522e..8395aa5ed 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-parent - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-plugins @@ -21,7 +21,6 @@ codebehind config-browser - continuations jasperreports jfreechart jsf diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml index 96bdd920e..542c54e47 100644 --- a/plugins/sitegraph/pom.xml +++ b/plugins/sitegraph/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-sitegraph-plugin diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index d89bc25f8..089d275d4 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-sitemesh-plugin diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 77524f841..34a079883 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-spring-plugin diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml index bff780029..6b9d30588 100644 --- a/plugins/struts1/pom.xml +++ b/plugins/struts1/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-struts1-plugin diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index d417ea93d..b51e037f4 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.1.0-SNAPSHOT + 2.0.6 org.apache.struts struts2-tiles-plugin diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java index 378d9cb4e..2973547ee 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java @@ -80,12 +80,7 @@ public class StrutsTilesRequestContext extends TilesRequestContextWrapper { } public void dispatch(String include) throws IOException { - if (include.endsWith(mask)) { - // FIXME This way FreeMarker results still don't have a content-type! - include(include); - } else { - super.dispatch(include); - } + include(include); } /** diff --git a/pom.xml b/pom.xml index 808106e5a..5ecb81101 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 4.0.0 org.apache.struts struts2-parent - 2.1.0-SNAPSHOT + 2.0.6 pom Struts 2 http://struts.apache.org/struts2 @@ -78,7 +78,7 @@ core - api + diff --git a/src/site/site.xml b/src/site/site.xml index 71e8676f7..21bd6406e 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -8,12 +8,13 @@ Apache Struts images/struts2.png - http://struts.apache.org/2.x/ - + http://struts.apache.org + - - + + + - + + /> + /> + /> + /> + href="docs/release-notes-205.html" + /> @@ -140,45 +141,5 @@ /> - - - - - - - - - - - - - -