struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r502294 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/ main/java/org/apache/struts2/components/ main/java/org/apache/struts2/config/ main/java/org/apache/struts2/dispatcher/ main/java/org/apache/struts2/dispatcher/multip...
Date Thu, 01 Feb 2007 17:28:02 GMT
Author: niallp
Date: Thu Feb  1 09:28:00 2007
New Revision: 502294

URL: http://svn.apache.org/viewvc?view=rev&rev=502294
Log:
add missing svn properties - no actual changes

Modified:
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/TestNGStrutsTestCase.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Autocompleter.java   (props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java   (props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/MethodConfigurationProvider.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/package.html   (props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/package.html   (props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/SkipValidation.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesInterceptor.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/ServletPortletPreferences.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/util/HttpServletRequestMock.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java   (props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibrary.java   (props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTag.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTagAttribute.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AutocompleterModel.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java   (props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/package.html   (props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/package.html   (props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AutocompleterDirective.java   (contents, props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java   (props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/package.html   (props changed)
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/package.html   (props changed)
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestNGStrutsTestCaseTest.java   (contents, props changed)
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java   (contents, props changed)
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java   (contents, props changed)
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java   (contents, props changed)
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java   (contents, props changed)
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTagTest.java   (props changed)

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/TestNGStrutsTestCase.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/TestNGStrutsTestCase.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/TestNGStrutsTestCase.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/TestNGStrutsTestCase.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id: StrutsTestCase.java 476696 2006-11-19 03:56:18Z tmjee $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/TestNGStrutsTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/TestNGStrutsTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Autocompleter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Autocompleter.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb  1 09:28:00 2007
@@ -1 +1 @@
-Id Author Date Rev
+Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id: DefaultActionMapper.java 498085 2007-01-20 08:13:11Z mrdon $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/MethodConfigurationProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/MethodConfigurationProvider.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/MethodConfigurationProvider.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/MethodConfigurationProvider.java Thu Feb  1 09:28:00 2007
@@ -1,239 +1,239 @@
-package org.apache.struts2.config;
-
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.util.location.LocatableProperties;
-import com.opensymphony.xwork2.ObjectFactory;
-
-import java.util.*;
-import java.lang.reflect.Method;
-
-/**
- * MethodConfigurationProvider creates ActionConfigs for potential action
- * methods that lack a corresponding action mapping,
- * so that these methods can be invoked without extra or redundant configuration.
- * <p/>
- * As a dynamic method, the behavior of this class could be represented as:
- * <p/>
- * <code>
- * int bang = name.indexOf('!');
- * if (bang != -1) {
- * String method = name.substring(bang + 1);
- * mapping.setMethod(method);
- * name = name.substring(0, bang);
- * }
- * </code>
- * <p/>
- * If the action URL is "foo!bar", the the "foo" action is invoked,
- * calling "bar" instead of "execute".
- * <p/>
- * Instead of scanning each request at runtime, the provider creates action mappings
- * for each method that could be matched using a dynamic approach.
- * Advantages over a dynamic approach are that:
- * <p/>
- * <ul>
- * <ol>The "dynamic" methods are not a special case, but just another action mapping,
- * with all the features of a hardcoded mapping.
- * <ol>When needed, a manual action can be provided for a method and invoked with the same
- * syntax as an automatic action.
- * <ol>The ConfigBrowser can display all potential actions.
- * </ul>
- */
-public class MethodConfigurationProvider implements ConfigurationProvider {
-
-    /**
-     * Stores configuration property.
-     */
-    private Configuration configuration;
-
-    /**
-     * Updates configuration property.
-     * @param configuration New configuration
-     */
-    public void setConfiguration(Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    // See superclass for Javadoc
-    public void destroy() {
-        // Override to provide functionality
-    }
-
-    // See superclass for Javadoc
-    public void init(Configuration configuration) throws ConfigurationException {
-        setConfiguration(configuration);
-        configuration.rebuildRuntimeConfiguration();
-    }
-
-    // See superclass for Javadoc
-    public void register(ContainerBuilder containerBuilder, LocatableProperties locatableProperties) throws ConfigurationException {
-        // Override to provide functionality
-    }
-
-    // See superclass for Javadoc
-    public void loadPackages() throws ConfigurationException {
-
-        Set namespaces = Collections.EMPTY_SET;
-        RuntimeConfiguration rc = configuration.getRuntimeConfiguration();
-        Map allActionConfigs = rc.getActionConfigs();
-        if (allActionConfigs != null) {
-            namespaces = allActionConfigs.keySet();
-        }
-
-        if (namespaces.size() == 0) {
-            throw new ConfigurationException("MethodConfigurationProvider.loadPackages: namespaces.size == 0");
-        }
-
-        boolean added = false;
-        for (Object namespace : namespaces) {
-            Map actions = (Map) allActionConfigs.get(namespace);
-            Set actionNames = actions.keySet();
-            for (Object actionName : actionNames) {
-                ActionConfig actionConfig = (ActionConfig) actions.get(actionName);
-                added = added | addDynamicMethods(actions, (String) actionName, actionConfig);
-            }
-        }
-
-        reload = added;
-    }
-
-    /**
-     * Store needsReload property.
-     */
-    boolean reload;
-
-    // See superclass for Javadoc
-    public boolean needsReload() {
-        return reload;
-    }
-
-    /**
-     * Stores ObjectFactory property.
-     */
-    ObjectFactory factory;
-
-    /**
-     * Updates ObjectFactory property.
-     * @param factory
-     */
-    public void setObjectFactory(ObjectFactory factory) {
-        this.factory = factory;
-    }
-
-    /**
-     * Provides ObjectFactory property.
-     * @return
-     * @throws ConfigurationException if ObjectFactory has not been set.
-     */
-    private ObjectFactory getObjectFactory() throws ConfigurationException {
-        if (factory == null) {
-            factory = ObjectFactory.getObjectFactory();
-            if (factory == null) throw new
-                    ConfigurationException("MethodConfigurationProvider.getObjectFactory: ObjectFactory==null");
-        }
-        return factory;
-    }
-
-    /**
-     * Verifies that character at a String position is upper case.
-     * @param pos Position to test
-     * @param string Text containing position
-     * @return True if character at a String position is upper case
-     */
-    private boolean upperAt(int pos, String string) {
-        int len = string.length();
-        if (len < pos) return false;
-        String ch = string.substring(pos, pos+1);
-        return ch.equals(ch.toUpperCase());
-    }
-
-   /**
-    * Scans class for potential Action mehods,
-    * automatically generating and registering ActionConfigs as needed.
-    * <p/>
-    * The system iterates over the set of namespaces and the set of actionNames
-    * in a Configuration and retrieves each ActionConfig.
-    * For each ActionConfig that invokes the default "execute" method,
-    * the provider inspects the className class for other non-void,
-    * no-argument methods that do not begin with "getX" or "isX".
-    * For each qualifying method, the provider looks for another actionName in
-    * the same namespace that equals action.name + "!" + method.name.
-    * If that actionName is not found, System copies the ActionConfig,
-    * changes the method property, and adds it to the package configuration
-    * under the new actionName (action!method).
-    * <p/>
-    * The system ignores ActionConfigs with a method property set so as to
-    * avoid creating alias methods for alias methods.
-    * The system ignores "getX" and "isX" methods since these would appear to be
-    * JavaBeans property and would not be intended as action methods.
-    * (The X represents any upper character or non-letter.)
-    * @param actions All ActionConfigs in namespace
-    * @param actionName Name of ActionConfig to analyze
-    * @param actionConfig ActionConfig corresponding to actionName
-    */
-    protected boolean addDynamicMethods(Map actions, String actionName, ActionConfig actionConfig) throws ConfigurationException {
-
-        String configMethod = actionConfig.getMethodName();
-        boolean hasMethod = (configMethod != null) && (configMethod.length() > 0);
-        if (hasMethod) return false;
-
-        String className = actionConfig.getClassName();
-        Set actionMethods = new HashSet();
-        Class actionClass;
-        ObjectFactory factory = getObjectFactory();
-        try {
-            actionClass = factory.getClassInstance(className);
-        } catch (ClassNotFoundException e) {
-            throw new ConfigurationException(e);
-        }
-
-        Method[] methods = actionClass.getMethods();
-        for (Method method : methods) {
-            String returnString = method.getReturnType().getName();
-            boolean isString = "java.lang.String".equals(returnString);
-            if (isString) {
-                Class[] parameterTypes = method.getParameterTypes();
-                boolean noParameters = (parameterTypes.length == 0);
-                String methodString = method.getName();
-                boolean notGetMethod = !((methodString.startsWith("get")) && upperAt(3, methodString));
-                boolean notIsMethod = !((methodString.startsWith("is")) && upperAt(2, methodString));
-                boolean notToString = !("toString".equals(methodString));
-                boolean notExecute = !("execute".equals(methodString));
-                boolean qualifies = noParameters && notGetMethod && notIsMethod && notToString && notExecute;
-                if (qualifies) {
-                    actionMethods.add(methodString);
-                }
-            }
-        }
-
-        for (Object actionMethod : actionMethods) {
-            String methodName = (String) actionMethod;
-            StringBuilder sb = new StringBuilder();
-            sb.append(actionName);
-            sb.append("!"); // TODO: Make "!" a configurable character
-            sb.append(methodName);
-            String newActionName = sb.toString();
-            boolean haveAction = actions.containsKey(newActionName);
-            if (haveAction) continue;
-            ActionConfig newActionConfig = new ActionConfig(
-                    newActionName,
-                    actionConfig.getClassName(),
-                    actionConfig.getParams(),
-                    actionConfig.getResults(),
-                    actionConfig.getInterceptors(),
-                    actionConfig.getExceptionMappings());
-            newActionConfig.setMethodName(methodName);
-            String packageName = actionConfig.getPackageName();
-            newActionConfig.setPackageName(packageName);
-            PackageConfig packageConfig = configuration.getPackageConfig(packageName);
-            packageConfig.addActionConfig(newActionName, actionConfig);
-        }
-
-        return (actionMethods.size() > 0);
-    }
-}
+package org.apache.struts2.config;
+
+import com.opensymphony.xwork2.config.ConfigurationProvider;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.RuntimeConfiguration;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
+import com.opensymphony.xwork2.inject.ContainerBuilder;
+import com.opensymphony.xwork2.util.location.LocatableProperties;
+import com.opensymphony.xwork2.ObjectFactory;
+
+import java.util.*;
+import java.lang.reflect.Method;
+
+/**
+ * MethodConfigurationProvider creates ActionConfigs for potential action
+ * methods that lack a corresponding action mapping,
+ * so that these methods can be invoked without extra or redundant configuration.
+ * <p/>
+ * As a dynamic method, the behavior of this class could be represented as:
+ * <p/>
+ * <code>
+ * int bang = name.indexOf('!');
+ * if (bang != -1) {
+ * String method = name.substring(bang + 1);
+ * mapping.setMethod(method);
+ * name = name.substring(0, bang);
+ * }
+ * </code>
+ * <p/>
+ * If the action URL is "foo!bar", the the "foo" action is invoked,
+ * calling "bar" instead of "execute".
+ * <p/>
+ * Instead of scanning each request at runtime, the provider creates action mappings
+ * for each method that could be matched using a dynamic approach.
+ * Advantages over a dynamic approach are that:
+ * <p/>
+ * <ul>
+ * <ol>The "dynamic" methods are not a special case, but just another action mapping,
+ * with all the features of a hardcoded mapping.
+ * <ol>When needed, a manual action can be provided for a method and invoked with the same
+ * syntax as an automatic action.
+ * <ol>The ConfigBrowser can display all potential actions.
+ * </ul>
+ */
+public class MethodConfigurationProvider implements ConfigurationProvider {
+
+    /**
+     * Stores configuration property.
+     */
+    private Configuration configuration;
+
+    /**
+     * Updates configuration property.
+     * @param configuration New configuration
+     */
+    public void setConfiguration(Configuration configuration) {
+        this.configuration = configuration;
+    }
+
+    // See superclass for Javadoc
+    public void destroy() {
+        // Override to provide functionality
+    }
+
+    // See superclass for Javadoc
+    public void init(Configuration configuration) throws ConfigurationException {
+        setConfiguration(configuration);
+        configuration.rebuildRuntimeConfiguration();
+    }
+
+    // See superclass for Javadoc
+    public void register(ContainerBuilder containerBuilder, LocatableProperties locatableProperties) throws ConfigurationException {
+        // Override to provide functionality
+    }
+
+    // See superclass for Javadoc
+    public void loadPackages() throws ConfigurationException {
+
+        Set namespaces = Collections.EMPTY_SET;
+        RuntimeConfiguration rc = configuration.getRuntimeConfiguration();
+        Map allActionConfigs = rc.getActionConfigs();
+        if (allActionConfigs != null) {
+            namespaces = allActionConfigs.keySet();
+        }
+
+        if (namespaces.size() == 0) {
+            throw new ConfigurationException("MethodConfigurationProvider.loadPackages: namespaces.size == 0");
+        }
+
+        boolean added = false;
+        for (Object namespace : namespaces) {
+            Map actions = (Map) allActionConfigs.get(namespace);
+            Set actionNames = actions.keySet();
+            for (Object actionName : actionNames) {
+                ActionConfig actionConfig = (ActionConfig) actions.get(actionName);
+                added = added | addDynamicMethods(actions, (String) actionName, actionConfig);
+            }
+        }
+
+        reload = added;
+    }
+
+    /**
+     * Store needsReload property.
+     */
+    boolean reload;
+
+    // See superclass for Javadoc
+    public boolean needsReload() {
+        return reload;
+    }
+
+    /**
+     * Stores ObjectFactory property.
+     */
+    ObjectFactory factory;
+
+    /**
+     * Updates ObjectFactory property.
+     * @param factory
+     */
+    public void setObjectFactory(ObjectFactory factory) {
+        this.factory = factory;
+    }
+
+    /**
+     * Provides ObjectFactory property.
+     * @return
+     * @throws ConfigurationException if ObjectFactory has not been set.
+     */
+    private ObjectFactory getObjectFactory() throws ConfigurationException {
+        if (factory == null) {
+            factory = ObjectFactory.getObjectFactory();
+            if (factory == null) throw new
+                    ConfigurationException("MethodConfigurationProvider.getObjectFactory: ObjectFactory==null");
+        }
+        return factory;
+    }
+
+    /**
+     * Verifies that character at a String position is upper case.
+     * @param pos Position to test
+     * @param string Text containing position
+     * @return True if character at a String position is upper case
+     */
+    private boolean upperAt(int pos, String string) {
+        int len = string.length();
+        if (len < pos) return false;
+        String ch = string.substring(pos, pos+1);
+        return ch.equals(ch.toUpperCase());
+    }
+
+   /**
+    * Scans class for potential Action mehods,
+    * automatically generating and registering ActionConfigs as needed.
+    * <p/>
+    * The system iterates over the set of namespaces and the set of actionNames
+    * in a Configuration and retrieves each ActionConfig.
+    * For each ActionConfig that invokes the default "execute" method,
+    * the provider inspects the className class for other non-void,
+    * no-argument methods that do not begin with "getX" or "isX".
+    * For each qualifying method, the provider looks for another actionName in
+    * the same namespace that equals action.name + "!" + method.name.
+    * If that actionName is not found, System copies the ActionConfig,
+    * changes the method property, and adds it to the package configuration
+    * under the new actionName (action!method).
+    * <p/>
+    * The system ignores ActionConfigs with a method property set so as to
+    * avoid creating alias methods for alias methods.
+    * The system ignores "getX" and "isX" methods since these would appear to be
+    * JavaBeans property and would not be intended as action methods.
+    * (The X represents any upper character or non-letter.)
+    * @param actions All ActionConfigs in namespace
+    * @param actionName Name of ActionConfig to analyze
+    * @param actionConfig ActionConfig corresponding to actionName
+    */
+    protected boolean addDynamicMethods(Map actions, String actionName, ActionConfig actionConfig) throws ConfigurationException {
+
+        String configMethod = actionConfig.getMethodName();
+        boolean hasMethod = (configMethod != null) && (configMethod.length() > 0);
+        if (hasMethod) return false;
+
+        String className = actionConfig.getClassName();
+        Set actionMethods = new HashSet();
+        Class actionClass;
+        ObjectFactory factory = getObjectFactory();
+        try {
+            actionClass = factory.getClassInstance(className);
+        } catch (ClassNotFoundException e) {
+            throw new ConfigurationException(e);
+        }
+
+        Method[] methods = actionClass.getMethods();
+        for (Method method : methods) {
+            String returnString = method.getReturnType().getName();
+            boolean isString = "java.lang.String".equals(returnString);
+            if (isString) {
+                Class[] parameterTypes = method.getParameterTypes();
+                boolean noParameters = (parameterTypes.length == 0);
+                String methodString = method.getName();
+                boolean notGetMethod = !((methodString.startsWith("get")) && upperAt(3, methodString));
+                boolean notIsMethod = !((methodString.startsWith("is")) && upperAt(2, methodString));
+                boolean notToString = !("toString".equals(methodString));
+                boolean notExecute = !("execute".equals(methodString));
+                boolean qualifies = noParameters && notGetMethod && notIsMethod && notToString && notExecute;
+                if (qualifies) {
+                    actionMethods.add(methodString);
+                }
+            }
+        }
+
+        for (Object actionMethod : actionMethods) {
+            String methodName = (String) actionMethod;
+            StringBuilder sb = new StringBuilder();
+            sb.append(actionName);
+            sb.append("!"); // TODO: Make "!" a configurable character
+            sb.append(methodName);
+            String newActionName = sb.toString();
+            boolean haveAction = actions.containsKey(newActionName);
+            if (haveAction) continue;
+            ActionConfig newActionConfig = new ActionConfig(
+                    newActionName,
+                    actionConfig.getClassName(),
+                    actionConfig.getParams(),
+                    actionConfig.getResults(),
+                    actionConfig.getInterceptors(),
+                    actionConfig.getExceptionMappings());
+            newActionConfig.setMethodName(methodName);
+            String packageName = actionConfig.getPackageName();
+            newActionConfig.setPackageName(packageName);
+            PackageConfig packageConfig = configuration.getPackageConfig(packageName);
+            packageConfig.addActionConfig(newActionName, actionConfig);
+        }
+
+        return (actionMethods.size() > 0);
+    }
+}

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/MethodConfigurationProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/MethodConfigurationProvider.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/package.html
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/package.html
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id: Result.java 490514 2006-12-27 15:25:48Z ddewolf $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/SkipValidation.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/SkipValidation.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/SkipValidation.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/SkipValidation.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id: Result.java 490514 2006-12-27 15:25:48Z ddewolf $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/SkipValidation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/SkipValidation.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id: ServletConfigInterceptor.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesInterceptor.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesInterceptor.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id: ServletConfigInterceptor.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java Thu Feb  1 09:28:00 2007
@@ -1,73 +1,73 @@
-package org.apache.struts2.portlet.interceptor;
-
-import org.apache.struts2.interceptor.PrincipalProxy;
-
-import javax.portlet.PortletRequest;
-import javax.servlet.http.HttpServletRequest;
-import java.security.Principal;
-
-/**
- * PrincipalProxy implementation for using PortletRequest Principal related methods.
- */
-public class PortletPrincipalProxy implements PrincipalProxy {
-
-    private PortletRequest request;
-
-    /**
-     * Constructs a proxy
-     *
-     * @param request The underlying request
-     */
-    public PortletPrincipalProxy(PortletRequest request) {
-        this.request = request;
-    }
-
-    /**
-     * True if the user is in the given role
-     *
-     * @param role The role
-     * @return True if the user is in that role
-     */
-    public boolean isUserInRole(String role) {
-        return request.isUserInRole(role);
-    }
-
-    /**
-     * Gets the user principal
-     *
-     * @return The principal
-     */
-    public Principal getUserPrincipal() {
-        return request.getUserPrincipal();
-    }
-
-    /**
-     * Gets the user id
-     *
-     * @return The user id
-     */
-    public String getRemoteUser() {
-        return request.getRemoteUser();
-    }
-
-    /**
-     * Is the request using https?
-     *
-     * @return True if using https
-     */
-    public boolean isRequestSecure() {
-        return request.isSecure();
-    }
-
-    /**
-     * Gets the request.
-     *
-     * @return The request
-     * @throws UnsupportedOperationException not supported in this implementation.
-     * @deprecated To obtain the HttpServletRequest in your action, use
-     *             {@link org.apache.struts2.servlet.ServletRequestAware}, since this method will be dropped in future.
-     */
-    public HttpServletRequest getRequest() {
-        throw new UnsupportedOperationException("Usage of getRequest() method is deprecadet and not supported for this implementation");
-    }
-}
+package org.apache.struts2.portlet.interceptor;
+
+import org.apache.struts2.interceptor.PrincipalProxy;
+
+import javax.portlet.PortletRequest;
+import javax.servlet.http.HttpServletRequest;
+import java.security.Principal;
+
+/**
+ * PrincipalProxy implementation for using PortletRequest Principal related methods.
+ */
+public class PortletPrincipalProxy implements PrincipalProxy {
+
+    private PortletRequest request;
+
+    /**
+     * Constructs a proxy
+     *
+     * @param request The underlying request
+     */
+    public PortletPrincipalProxy(PortletRequest request) {
+        this.request = request;
+    }
+
+    /**
+     * True if the user is in the given role
+     *
+     * @param role The role
+     * @return True if the user is in that role
+     */
+    public boolean isUserInRole(String role) {
+        return request.isUserInRole(role);
+    }
+
+    /**
+     * Gets the user principal
+     *
+     * @return The principal
+     */
+    public Principal getUserPrincipal() {
+        return request.getUserPrincipal();
+    }
+
+    /**
+     * Gets the user id
+     *
+     * @return The user id
+     */
+    public String getRemoteUser() {
+        return request.getRemoteUser();
+    }
+
+    /**
+     * Is the request using https?
+     *
+     * @return True if using https
+     */
+    public boolean isRequestSecure() {
+        return request.isSecure();
+    }
+
+    /**
+     * Gets the request.
+     *
+     * @return The request
+     * @throws UnsupportedOperationException not supported in this implementation.
+     * @deprecated To obtain the HttpServletRequest in your action, use
+     *             {@link org.apache.struts2.servlet.ServletRequestAware}, since this method will be dropped in future.
+     */
+    public HttpServletRequest getRequest() {
+        throw new UnsupportedOperationException("Usage of getRequest() method is deprecadet and not supported for this implementation");
+    }
+}

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/ServletPortletPreferences.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/ServletPortletPreferences.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/ServletPortletPreferences.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/ServletPortletPreferences.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id: ServletConfigInterceptor.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/ServletPortletPreferences.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/interceptor/ServletPortletPreferences.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/util/HttpServletRequestMock.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/util/HttpServletRequestMock.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/util/HttpServletRequestMock.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/util/HttpServletRequestMock.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id: RequestUtils.java 471717 2006-11-06 12:50:18Z husted $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/util/HttpServletRequestMock.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/util/HttpServletRequestMock.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java Thu Feb  1 09:28:00 2007
@@ -1,70 +1,70 @@
-package org.apache.struts2.servlet.interceptor;
-
-import org.apache.struts2.interceptor.PrincipalProxy;
-
-import javax.servlet.http.HttpServletRequest;
-import java.security.Principal;
-
-/**
- * PrincipalProxy implementation for using HttpServletRequest Principal related methods.
- */
-public class ServletPrincipalProxy implements PrincipalProxy {
-    private HttpServletRequest request;
-
-    /**
-     * Constructs a proxy
-     *
-     * @param request The underlying request
-     */
-    public ServletPrincipalProxy(HttpServletRequest request) {
-        this.request = request;
-    }
-
-    /**
-     * True if the user is in the given role
-     *
-     * @param role The role
-     * @return True if the user is in that role
-     */
-    public boolean isUserInRole(String role) {
-        return request.isUserInRole(role);
-    }
-
-    /**
-     * Gets the user principal
-     *
-     * @return The principal
-     */
-    public Principal getUserPrincipal() {
-        return request.getUserPrincipal();
-    }
-
-    /**
-     * Gets the user id
-     *
-     * @return The user id
-     */
-    public String getRemoteUser() {
-        return request.getRemoteUser();
-    }
-
-    /**
-     * Is the request using https?
-     *
-     * @return True if using https
-     */
-    public boolean isRequestSecure() {
-        return request.isSecure();
-    }
-
-    /**
-     * Gets the request.
-     *
-     * @return The request
-     * @deprecated To obtain the HttpServletRequest in your action, use
-     *             {@link org.apache.struts2.servlet.ServletRequestAware}, since this method will be dropped in future.
-     */
-    public HttpServletRequest getRequest() {
-        return request;
-    }
-}
+package org.apache.struts2.servlet.interceptor;
+
+import org.apache.struts2.interceptor.PrincipalProxy;
+
+import javax.servlet.http.HttpServletRequest;
+import java.security.Principal;
+
+/**
+ * PrincipalProxy implementation for using HttpServletRequest Principal related methods.
+ */
+public class ServletPrincipalProxy implements PrincipalProxy {
+    private HttpServletRequest request;
+
+    /**
+     * Constructs a proxy
+     *
+     * @param request The underlying request
+     */
+    public ServletPrincipalProxy(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    /**
+     * True if the user is in the given role
+     *
+     * @param role The role
+     * @return True if the user is in that role
+     */
+    public boolean isUserInRole(String role) {
+        return request.isUserInRole(role);
+    }
+
+    /**
+     * Gets the user principal
+     *
+     * @return The principal
+     */
+    public Principal getUserPrincipal() {
+        return request.getUserPrincipal();
+    }
+
+    /**
+     * Gets the user id
+     *
+     * @return The user id
+     */
+    public String getRemoteUser() {
+        return request.getRemoteUser();
+    }
+
+    /**
+     * Is the request using https?
+     *
+     * @return True if using https
+     */
+    public boolean isRequestSecure() {
+        return request.isSecure();
+    }
+
+    /**
+     * Gets the request.
+     *
+     * @return The request
+     * @deprecated To obtain the HttpServletRequest in your action, use
+     *             {@link org.apache.struts2.servlet.ServletRequestAware}, since this method will be dropped in future.
+     */
+    public HttpServletRequest getRequest() {
+        return request;
+    }
+}

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id: StrutsTestCase.java 476696 2006-11-19 03:56:18Z tmjee $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibrary.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/TagLibrary.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTag.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTag.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTag.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTagAttribute.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTagAttribute.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTagAttribute.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTagAttribute.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTagAttribute.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTagAttribute.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AutocompleterModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AutocompleterModel.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AutocompleterModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AutocompleterModel.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id: ComboBoxModel.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AutocompleterModel.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AutocompleterModel.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb  1 09:28:00 2007
@@ -1 +1 @@
-Id Author Date Rev
+Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/package.html
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/package.html
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AutocompleterDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AutocompleterDirective.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AutocompleterDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AutocompleterDirective.java Thu Feb  1 09:28:00 2007
@@ -1,46 +1,46 @@
-/*
- * $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.views.velocity.components;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.components.Autocompleter;
-import org.apache.struts2.components.Bean;
-import org.apache.struts2.components.Component;
-
-import com.opensymphony.xwork2.util.ValueStack;
-
-/**
- * @see Autocompleter
- */
-public class AutocompleterDirective extends AbstractDirective {
-
-    protected Component getBean(ValueStack stack, HttpServletRequest req,
-            HttpServletResponse res) {
-        return new Autocompleter(stack, req, res);
-    }
-
-    public String getBeanName() {
-        return "autocompleter";
-    }
-
-}
+/*
+ * $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.views.velocity.components;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.components.Autocompleter;
+import org.apache.struts2.components.Bean;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+/**
+ * @see Autocompleter
+ */
+public class AutocompleterDirective extends AbstractDirective {
+
+    protected Component getBean(ValueStack stack, HttpServletRequest req,
+            HttpServletResponse res) {
+        return new Autocompleter(stack, req, res);
+    }
+
+    public String getBeanName() {
+        return "autocompleter";
+    }
+
+}

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AutocompleterDirective.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AutocompleterDirective.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb  1 09:28:00 2007
@@ -1 +1 @@
-Id Author Date Rev
+Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/package.html
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/package.html
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestNGStrutsTestCaseTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestNGStrutsTestCaseTest.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestNGStrutsTestCaseTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestNGStrutsTestCaseTest.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id: StrutsTestCase.java 476696 2006-11-19 03:56:18Z tmjee $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestNGStrutsTestCaseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestNGStrutsTestCaseTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id: SettingsTest.java 498215 2007-01-20 23:59:10Z mrdon $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java Thu Feb  1 09:28:00 2007
@@ -1,241 +1,241 @@
-/*
- * $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.config;
-
-import org.apache.struts2.dispatcher.ServletDispatcherResult;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.springframework.mock.web.MockServletContext;
-
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.entities.*;
-import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
-import com.opensymphony.xwork2.ActionSupport;
-
-import junit.framework.TestCase;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * MethodConfigurationProviderTest exercises the MethodConfigurationProvider
- * to confirm that only the expected methods are generated.
- */
-public class MethodConfigurationProviderTest extends TestCase {
-
-    /**
-     * Object under test.
-     */
-    MethodConfigurationProvider provider;
-
-    /**
-     * Set of packages and ActionConfigs to exercise.
-     */
-    Configuration configuration;
-
-    /**
-     * Mock dispatcher.
-     */
-    Dispatcher dispatcher;
-
-    /**
-     * Creates a mock Dispatcher and seeds Configuration.
-     */
-    public void setUp() {
-
-        InternalConfigurationManager configurationManager = new InternalConfigurationManager();
-        dispatcher = new Dispatcher(new MockServletContext(), new HashMap<String, String>());
-        dispatcher.setConfigurationManager(configurationManager);
-        dispatcher.init();
-        Dispatcher.setInstance(dispatcher);
-
-        configuration = new DefaultConfiguration();
-        // empty package for the "default" namespace of empty String
-        PackageConfig strutsDefault = new PackageConfig("struts-default");
-        strutsDefault.addResultTypeConfig(new ResultTypeConfig("dispatcher", ServletDispatcherResult.class.getName(), "location"));
-        strutsDefault.setDefaultResultType("dispatcher");
-        configuration.addPackageConfig("struts-default", strutsDefault);
-
-        // custom package with various actions
-        PackageConfig customPackage = new PackageConfig("trick-package");
-        customPackage.setNamespace("/trick");
-        // action that specifies ActionSupport (not empty) but with no methods
-        ActionConfig action = new ActionConfig(null, ActionSupport.class, null, null, null);
-        customPackage.addActionConfig("action",action);
-        // action that species a custom Action with a manual method
-        ActionConfig custom = new ActionConfig(null, Custom.class, null, null, null);
-        customPackage.addActionConfig("custom",custom);
-        // action for manual method, with params, to prove it is not overwritten
-        Map params = new HashMap();
-        params.put("name","value");
-        ActionConfig manual = new ActionConfig("manual", Custom.class, params, null, null);
-        customPackage.addActionConfig("custom!manual",manual);
-        configuration.addPackageConfig("trick-package", customPackage);
-
-        provider = new MethodConfigurationProvider();
-        provider.init(configuration);
-        provider.loadPackages();
-    }
-
-    /**
-     * Provides the "custom-package" configuration.
-     * @return the "custom-package" configuration.
-     */
-    private PackageConfig getCustom() {
-        return configuration.getPackageConfig("trick-package");
-    }
-
-    /**
-     * Confirms baseline setup works as expected.
-     */
-    public void testSetup() {
-        assertEquals(2, configuration.getPackageConfigs().size());
-        PackageConfig struts = configuration.getPackageConfig("struts-default");
-        assertNotNull(struts);
-        assertTrue("testSetup: Expected struts-default to be empty!", struts.getActionConfigs().size() == 0);
-
-        PackageConfig custom = getCustom();
-        assertNotNull(custom);
-        assertTrue("testSetup: Expected ActionConfigs to be added!", custom.getActionConfigs().size() > 0);
-    }
-
-    /**
-     * Confirms that system detects no-argument methods that return Strings
-     * and generates the appropriate ActionConfigs.
-     */
-    public void testQualifyingMethods() {
-
-        PackageConfig config = getCustom();
-
-        boolean action = config.getActionConfigs().containsKey("action");
-        assertTrue("The root action is missing!",action);
-
-        boolean custom = config.getActionConfigs().containsKey("custom");
-        assertTrue("The custom action is missing!",custom);
-
-        boolean action_input = getCustom().getActionConfigs().containsKey("action!input");
-        assertTrue("The Action.input method should have an action mapping!",action_input);
-
-        boolean custom_input = getCustom().getActionConfigs().containsKey("custom!input");
-        assertTrue("The Custom.input method should have an action mapping!",custom_input);
-
-        boolean custom_auto = getCustom().getActionConfigs().containsKey("custom!auto");
-        assertTrue("The Custom.auto method should have an action mapping!",custom_auto);
-
-        boolean custom_gettysburg = getCustom().getActionConfigs().containsKey("custom!gettysburg");
-        assertTrue("The Custom.gettysburg method should have an action mapping!",custom_gettysburg);
-    }
-
-    /**
-     * Confirms system excludes methods that do not return Strings
-     * and no-argument or begin with "getx" or "isX".
-     */
-    public void testExcludedMethods() {
-
-        PackageConfig custom = getCustom();
-
-        boolean action_toString = custom.getActionConfigs().containsKey("action!toString");
-        assertFalse("The toString has an ActionConfig!",action_toString);
-
-        boolean action_execute = custom.getActionConfigs().containsKey("action!execute");
-        assertFalse("The execute has an ActionConfig!",action_execute);
-
-        boolean action_get_method = custom.getActionConfigs().containsKey("action!getLocale");
-        assertFalse("A 'getX' method has an ActionConfig!",action_get_method);
-
-        boolean action_is_method = custom.getActionConfigs().containsKey("custom!isIt");
-        assertFalse("A 'isX' method has an ActionConfig!",action_is_method);
-
-        boolean void_method = custom.getActionConfigs().containsKey("action!validate");
-        assertFalse("A void method has an ActionConfig!",void_method);
-
-        boolean void_with_parameters = custom.getActionConfigs().containsKey("action!addActionMessage");
-        assertFalse("A void method with parameters has an ActionConfig!",void_with_parameters);
-
-        boolean return_method = custom.getActionConfigs().containsKey("action!hasActionErrors");
-        assertFalse("A method with a return type other than String has an ActionConfig!",return_method);
-
-        ActionConfig manual = getCustom().getActionConfigs().get("custom!manual");
-        Object val = manual.getParams().get("name");
-        assertTrue("The custom.Manual method was generated!","value".equals(val.toString()));
-    }
-
-    /**
-     * Custom is a test Action class.
-     */
-    public class Custom extends ActionSupport {
-
-        /**
-         * Tests ordinary methods.
-         * @return SUCCESS
-         */
-        public String custom() {
-            return SUCCESS;
-        }
-
-        /**
-         * Tests JavaBean property.
-         * @return SUCCESS
-         */
-        public boolean isIt() {
-            return true;
-        }
-
-        /**
-         * Tests manual override.
-         * @return SUCCESS
-         */
-        public String manual() {
-            return SUCCESS;
-        }
-
-        /**
-         * Tests dynamic configuration.
-         * @return SUCCESS
-         */
-        public String auto() {
-            return SUCCESS;
-        }
-
-        /**
-         * Tests method that looks like a JavaBean property.
-         * @return SUCCESS
-         */
-        public String gettysburg() {
-            return SUCCESS;
-        }
-    }
-
-    /**
-     * InternalConfigurationManager is a mock ConfigurationManager.
-     */
-    class InternalConfigurationManager extends ConfigurationManager {
-    	public boolean destroyConfiguration = false;
-
-    	@Override
-    	public synchronized void destroyConfiguration() {
-    		super.destroyConfiguration();
-    		destroyConfiguration = true;
-    	}
-    }
-
-}
+/*
+ * $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.config;
+
+import org.apache.struts2.dispatcher.ServletDispatcherResult;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.springframework.mock.web.MockServletContext;
+
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import com.opensymphony.xwork2.config.entities.*;
+import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
+import com.opensymphony.xwork2.ActionSupport;
+
+import junit.framework.TestCase;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MethodConfigurationProviderTest exercises the MethodConfigurationProvider
+ * to confirm that only the expected methods are generated.
+ */
+public class MethodConfigurationProviderTest extends TestCase {
+
+    /**
+     * Object under test.
+     */
+    MethodConfigurationProvider provider;
+
+    /**
+     * Set of packages and ActionConfigs to exercise.
+     */
+    Configuration configuration;
+
+    /**
+     * Mock dispatcher.
+     */
+    Dispatcher dispatcher;
+
+    /**
+     * Creates a mock Dispatcher and seeds Configuration.
+     */
+    public void setUp() {
+
+        InternalConfigurationManager configurationManager = new InternalConfigurationManager();
+        dispatcher = new Dispatcher(new MockServletContext(), new HashMap<String, String>());
+        dispatcher.setConfigurationManager(configurationManager);
+        dispatcher.init();
+        Dispatcher.setInstance(dispatcher);
+
+        configuration = new DefaultConfiguration();
+        // empty package for the "default" namespace of empty String
+        PackageConfig strutsDefault = new PackageConfig("struts-default");
+        strutsDefault.addResultTypeConfig(new ResultTypeConfig("dispatcher", ServletDispatcherResult.class.getName(), "location"));
+        strutsDefault.setDefaultResultType("dispatcher");
+        configuration.addPackageConfig("struts-default", strutsDefault);
+
+        // custom package with various actions
+        PackageConfig customPackage = new PackageConfig("trick-package");
+        customPackage.setNamespace("/trick");
+        // action that specifies ActionSupport (not empty) but with no methods
+        ActionConfig action = new ActionConfig(null, ActionSupport.class, null, null, null);
+        customPackage.addActionConfig("action",action);
+        // action that species a custom Action with a manual method
+        ActionConfig custom = new ActionConfig(null, Custom.class, null, null, null);
+        customPackage.addActionConfig("custom",custom);
+        // action for manual method, with params, to prove it is not overwritten
+        Map params = new HashMap();
+        params.put("name","value");
+        ActionConfig manual = new ActionConfig("manual", Custom.class, params, null, null);
+        customPackage.addActionConfig("custom!manual",manual);
+        configuration.addPackageConfig("trick-package", customPackage);
+
+        provider = new MethodConfigurationProvider();
+        provider.init(configuration);
+        provider.loadPackages();
+    }
+
+    /**
+     * Provides the "custom-package" configuration.
+     * @return the "custom-package" configuration.
+     */
+    private PackageConfig getCustom() {
+        return configuration.getPackageConfig("trick-package");
+    }
+
+    /**
+     * Confirms baseline setup works as expected.
+     */
+    public void testSetup() {
+        assertEquals(2, configuration.getPackageConfigs().size());
+        PackageConfig struts = configuration.getPackageConfig("struts-default");
+        assertNotNull(struts);
+        assertTrue("testSetup: Expected struts-default to be empty!", struts.getActionConfigs().size() == 0);
+
+        PackageConfig custom = getCustom();
+        assertNotNull(custom);
+        assertTrue("testSetup: Expected ActionConfigs to be added!", custom.getActionConfigs().size() > 0);
+    }
+
+    /**
+     * Confirms that system detects no-argument methods that return Strings
+     * and generates the appropriate ActionConfigs.
+     */
+    public void testQualifyingMethods() {
+
+        PackageConfig config = getCustom();
+
+        boolean action = config.getActionConfigs().containsKey("action");
+        assertTrue("The root action is missing!",action);
+
+        boolean custom = config.getActionConfigs().containsKey("custom");
+        assertTrue("The custom action is missing!",custom);
+
+        boolean action_input = getCustom().getActionConfigs().containsKey("action!input");
+        assertTrue("The Action.input method should have an action mapping!",action_input);
+
+        boolean custom_input = getCustom().getActionConfigs().containsKey("custom!input");
+        assertTrue("The Custom.input method should have an action mapping!",custom_input);
+
+        boolean custom_auto = getCustom().getActionConfigs().containsKey("custom!auto");
+        assertTrue("The Custom.auto method should have an action mapping!",custom_auto);
+
+        boolean custom_gettysburg = getCustom().getActionConfigs().containsKey("custom!gettysburg");
+        assertTrue("The Custom.gettysburg method should have an action mapping!",custom_gettysburg);
+    }
+
+    /**
+     * Confirms system excludes methods that do not return Strings
+     * and no-argument or begin with "getx" or "isX".
+     */
+    public void testExcludedMethods() {
+
+        PackageConfig custom = getCustom();
+
+        boolean action_toString = custom.getActionConfigs().containsKey("action!toString");
+        assertFalse("The toString has an ActionConfig!",action_toString);
+
+        boolean action_execute = custom.getActionConfigs().containsKey("action!execute");
+        assertFalse("The execute has an ActionConfig!",action_execute);
+
+        boolean action_get_method = custom.getActionConfigs().containsKey("action!getLocale");
+        assertFalse("A 'getX' method has an ActionConfig!",action_get_method);
+
+        boolean action_is_method = custom.getActionConfigs().containsKey("custom!isIt");
+        assertFalse("A 'isX' method has an ActionConfig!",action_is_method);
+
+        boolean void_method = custom.getActionConfigs().containsKey("action!validate");
+        assertFalse("A void method has an ActionConfig!",void_method);
+
+        boolean void_with_parameters = custom.getActionConfigs().containsKey("action!addActionMessage");
+        assertFalse("A void method with parameters has an ActionConfig!",void_with_parameters);
+
+        boolean return_method = custom.getActionConfigs().containsKey("action!hasActionErrors");
+        assertFalse("A method with a return type other than String has an ActionConfig!",return_method);
+
+        ActionConfig manual = getCustom().getActionConfigs().get("custom!manual");
+        Object val = manual.getParams().get("name");
+        assertTrue("The custom.Manual method was generated!","value".equals(val.toString()));
+    }
+
+    /**
+     * Custom is a test Action class.
+     */
+    public class Custom extends ActionSupport {
+
+        /**
+         * Tests ordinary methods.
+         * @return SUCCESS
+         */
+        public String custom() {
+            return SUCCESS;
+        }
+
+        /**
+         * Tests JavaBean property.
+         * @return SUCCESS
+         */
+        public boolean isIt() {
+            return true;
+        }
+
+        /**
+         * Tests manual override.
+         * @return SUCCESS
+         */
+        public String manual() {
+            return SUCCESS;
+        }
+
+        /**
+         * Tests dynamic configuration.
+         * @return SUCCESS
+         */
+        public String auto() {
+            return SUCCESS;
+        }
+
+        /**
+         * Tests method that looks like a JavaBean property.
+         * @return SUCCESS
+         */
+        public String gettysburg() {
+            return SUCCESS;
+        }
+    }
+
+    /**
+     * InternalConfigurationManager is a mock ConfigurationManager.
+     */
+    class InternalConfigurationManager extends ConfigurationManager {
+    	public boolean destroyConfiguration = false;
+
+    	@Override
+    	public synchronized void destroyConfiguration() {
+    		super.destroyConfiguration();
+    		destroyConfiguration = true;
+    	}
+    }
+
+}

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java Thu Feb  1 09:28:00 2007
@@ -1,5 +1,5 @@
 /*
- * $Id: AnnotationValidationInterceptorTest.java 478625 2006-11-23 17:31:52Z wsmoak $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptorTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java?view=diff&rev=502294&r1=502293&r2=502294
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java Thu Feb  1 09:28:00 2007
@@ -1,56 +1,56 @@
-package org.apache.struts2.views.jsp.ui;
-
-import org.apache.struts2.views.jsp.AbstractUITagTest;
-
-/**
- * @see org.apache.struts2.components.Autocompleter
- */
-public class AutocompleterTest extends AbstractUITagTest {
-
-    public void testAjax() throws Exception {
-        AutocompleterTag tag = new AutocompleterTag();
-        tag.setPageContext(pageContext);
-        tag.setTheme("ajax");
-        tag.setAutoComplete("true");
-        tag.setDisabled("false");
-        tag.setForceValidOption("false");
-        tag.setHref("a");
-        tag.setDropdownWidth("10");
-        tag.setDropdownHeight("10");
-        tag.setDelay("100");
-        tag.setSearchType("b");
-        tag.setDisabled("c");
-        tag.setName("f");
-        tag.setValue("g");
-        tag.setIndicator("h");
-        tag.setLoadOnTextChange("true");
-        tag.setLoadMinimumCount("3");
-        tag.setShowDownArrow("false");
-        tag.doStartTag();
-        tag.doEndTag();
-
-        verify(AutocompleterTest.class.getResource("Autocompleter-1.txt"));
-    }
-
-    public void testSimple() throws Exception {
-        AutocompleterTag tag = new AutocompleterTag();
-        tag.setPageContext(pageContext);
-        tag.setTheme("simple");
-        tag.setAutoComplete("true");
-        tag.setDisabled("false");
-        tag.setForceValidOption("false");
-        tag.setList("{'d','e'}");
-        tag.setHref("a");
-        tag.setDropdownWidth("10");
-        tag.setDropdownHeight("10");
-        tag.setDelay("100");
-        tag.setSearchType("b");
-        tag.setDisabled("c");
-        tag.setName("f");
-        tag.doStartTag();
-        tag.doEndTag();
-
-        verify(AutocompleterTest.class.getResource("Autocompleter-2.txt"));
-    }
-
-}
+package org.apache.struts2.views.jsp.ui;
+
+import org.apache.struts2.views.jsp.AbstractUITagTest;
+
+/**
+ * @see org.apache.struts2.components.Autocompleter
+ */
+public class AutocompleterTest extends AbstractUITagTest {
+
+    public void testAjax() throws Exception {
+        AutocompleterTag tag = new AutocompleterTag();
+        tag.setPageContext(pageContext);
+        tag.setTheme("ajax");
+        tag.setAutoComplete("true");
+        tag.setDisabled("false");
+        tag.setForceValidOption("false");
+        tag.setHref("a");
+        tag.setDropdownWidth("10");
+        tag.setDropdownHeight("10");
+        tag.setDelay("100");
+        tag.setSearchType("b");
+        tag.setDisabled("c");
+        tag.setName("f");
+        tag.setValue("g");
+        tag.setIndicator("h");
+        tag.setLoadOnTextChange("true");
+        tag.setLoadMinimumCount("3");
+        tag.setShowDownArrow("false");
+        tag.doStartTag();
+        tag.doEndTag();
+
+        verify(AutocompleterTest.class.getResource("Autocompleter-1.txt"));
+    }
+
+    public void testSimple() throws Exception {
+        AutocompleterTag tag = new AutocompleterTag();
+        tag.setPageContext(pageContext);
+        tag.setTheme("simple");
+        tag.setAutoComplete("true");
+        tag.setDisabled("false");
+        tag.setForceValidOption("false");
+        tag.setList("{'d','e'}");
+        tag.setHref("a");
+        tag.setDropdownWidth("10");
+        tag.setDropdownHeight("10");
+        tag.setDelay("100");
+        tag.setSearchType("b");
+        tag.setDisabled("c");
+        tag.setName("f");
+        tag.doStartTag();
+        tag.doEndTag();
+
+        verify(AutocompleterTest.class.getResource("Autocompleter-2.txt"));
+    }
+
+}

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTagTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb  1 09:28:00 2007
@@ -1 +1 @@
-Id Author Date Rev
+Date Author Id Revision HeadURL



Mime
View raw message