Commits

Anonymous committed 25ed68f

Changing references from WebWork to either Struts 2 or XWork
XW-415

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@1177e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (17)

 
 <p/>
 
-XWork is an command-pattern framework that is used to power WebWork as well as other applications.
+XWork is an command-pattern framework that is used to power Struts 2 as well as other applications.
 XWork provides an Inversion of Control container, a powerful expression language, data type conversion,
 validation, and pluggable configuration. 
 

src/etc/README.txt

-Thanks for trying out XWork: the foundation for WebWork, Java's most 
-cutting edge web development platform. WebWork is brought to you by
-the OpenSymphony team. You can find out more about WebWork and
-OpenSymphony at http://www.opensymphony.com.
+Thanks for trying out XWork: the foundation for Struts 2, Java's most 
+cutting edge web development platform. Struts 2 is brought to you by
+the Apache Struts team. You can find out more about Struts 2 and
+the Apache Software Foundation at http://struts.apache.org.
 
 === Documentation ===
 The documentation can be found in HTML and PDF format in the docs

src/java/com/opensymphony/xwork2/ActionInvocation.java

 
     /**
      * Invokes only the action (not interceptors or results). This is useful in rare situations where advanced usage
-     * with the interceptor/action/result workflow is being manipulated for certain functionality. Specifically,
-     * WebWork's execAndWait interceptor takes advantage of this method.
+     * with the interceptor/action/result workflow is being manipulated for certain functionality. 
      */
     String invokeActionOnly() throws Exception;
 }

src/java/com/opensymphony/xwork2/ObjectFactory.java

                     try {
                         byte[] bytes = com.uwyn.rife.continuations.util.ClassByteUtil.getBytes(name, parent);
                         if (bytes == null) {
-                            throw new RuntimeException("Continuation error: no bytes loaded");
+                            throw new ClassNotFoundException(name);
                         }
 
                         byte[] resume_bytes = null;

src/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java

             }
             return true;
         } catch (ClassNotFoundException e) {
-            throw new ConfigurationException("Action class [" + className + "] not found", e, loc);
+            throw new ConfigurationException("Action class [" + className + "] not found", loc);
         } catch (NoSuchMethodException e) {
             throw new ConfigurationException("Action class [" + className + "] does not have a public no-arg constructor", e, loc);
         } catch (Exception ex) {

src/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java

                 } catch (RuntimeException e) {
                     final Boolean devMode = (Boolean) stack.getContext().get(ActionContext.DEV_MODE);
                     if (devMode != null && devMode.booleanValue()) {
-                        String developerNotification = LocalizedTextUtil.findText(ParametersInterceptor.class, "webwork.messages.devmode.notification", ActionContext.getContext().getLocale(), "Developer Notification (set webwork.devMode to false to disable this message):\n{0}", new Object[]{
+                        String developerNotification = LocalizedTextUtil.findText(ParametersInterceptor.class, "devmode.notification", ActionContext.getContext().getLocale(), "Developer Notification:\n{0}", new Object[]{
                                 e.getMessage()
                         });
                         LOG.error(developerNotification);

src/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java

         Class clazz = null;
         if (useClassCache) {
             // this cache of classes is needed because Spring sucks at dealing with situations where the
-            // class instance changes (such as WebWork's QuickStart)
+            // class instance changes 
             clazz = (Class) classes.get(className);
         }
 

src/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java

  * <li>ModelDriven's model (if implements ModelDriven), for the model object repeat from 1</li>
  * <li>package.properties (of the directory where class is located and every parent directory all the way to the root directory)</li>
  * <li>search up the i18n message key hierarchy itself</li>
- * <li>global resource properties (webwork.custom.i18n.resources) defined in webwork.properties</li>
+ * <li>global resource properties</li>
  * </ol>
  * <p/>
  * <!-- END SNIPPET: searchorder -->
  * <!-- END SNIPPET: packagenote -->
  *
  * <!-- START SNIPPET: globalresource -->
- * A global resource bundle could be specified through the 'webwork.custom.i18n.resources' property in
- * webwork.properties. The locale can be siwtched by 'webwork.locale' in the webwork.properties as well.
+ * A global resource bundle could be specified programatically, as well as the locale.
  * <p/>
  * <!-- END SNIPPET: globalresource -->
  *
- * <!-- START SNIPPET: strutscomparison -->
- * Struts users should be familiar with the application.properties resource bundle, where you can put all the messages
- * in the application that are going to be translated. WebWork, though, splits the resource bundles per action or model
- * class, and you may end up with duplicated messages in those resource bundles. A quick fix for that is to create a
- * file called ActionSupport.properties in com/opensymphony/xwork2 and put it on your classpath. This will only work well
- * if all your actions subclass ActionSupport.
- * <p/>
- * <!-- END SNIPPET: strutscomparison -->
- *
  * @author Jason Carreira
  * @author Mark Woon
  * @author Rainer Hermanns
 
     /**
      * Should resorce bundles be reloaded.
-     * <p/>
-     * In WW see <code>webwork.i18n.reload</code> property.
      * @param reloadBundles  reload bundles?  
      */
     public static void setReloadBundles(boolean reloadBundles) {

src/java/com/opensymphony/xwork2/util/ObjectTypeDeterminerFactory.java

 
 /**
  * Factory for getting an instance of {@link ObjectTypeDeterminer}.
- * <p/>
- * In WebWork this factory is used to instantiate a JDK5 generics compatible factory.
  * <br/>
  * Will use <code>com.opensymphony.xwork2.util.GenericsObjectTypeDeterminer</code> if running on JDK5 or higher.
  * If not <code>com.opensymphony.xwork2.util.ObjectTypeDeterminer</code> is used.

src/java/com/opensymphony/xwork2/util/XWorkBasicConverter.java

 /**
  * <!-- START SNIPPET: javadoc -->
  * <p/>
- * WebWork will automatically handle the most common type conversion for you. This includes support for converting to
+ * XWork will automatically handle the most common type conversion for you. This includes support for converting to
  * and from Strings for each of the following:
  * <p/>
  * <ul>

src/java/com/opensymphony/xwork2/validator/ValidatorFactory.java

  * <b>INFORMATION</b>
  * <!-- START SNIPPET: information -->
  * validators.xml if being defined should be available in the classpath. However 
- * this is not necessary, if no custom validator is needed. Webwork will automatically 
- * picked up a predefined sets of validators defined in 
- * com/opensymphony/xwork2/validator/validators/default.xml packaged together 
- * in xwork jar file that comes with webwork distribution. See ValidatorFactory 
- * static block for details.
+ * this is not necessary, if no custom validator is needed. Predefined sets of validators
+ * will automatically be picked up when defined in 
+ * com/opensymphony/xwork2/validator/validators/default.xml packaged in 
+ * in the xwork jar file. See ValidatorFactory static block for details.
  * <!-- END SNIPPET: information -->
  * </p>
  * 
  * <!-- START SNIPPET: nonFieldValidators -->
  * Non-field validators only add action level messages. Non-field validators 
  * are mostly domain specific and therefore often custom implementations. 
- * The most important standard non-field validator provided by XWork/WebWork 
+ * The most important standard non-field validator provided by XWork
  * is ExpressionValidator.
  * <!-- END SNIPPET: nonFieldValidators -->
  * </p>
  *  <li> Per Action class: in a file named ActionName-validation.xml</li>
  *  <li> Per Action alias: in a file named ActionName-alias-validation.xml</li>
  *  <li> Inheritance hierarchy and interfaces implemented by Action class: 
- *  WebWork searches up the inheritance tree of the action to find default 
+ *  XWork searches up the inheritance tree of the action to find default 
  *  validations for parent classes of the Action and interfaces implemented</li>
  * </ol>
  * Here is an example for SimpleAction-validation.xml:

src/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidator.java

  * 
  * <b>NOTE:</b> If no date converter is specified, XWorkBasicConverter will kick
  * in to do the date conversion, which by default using the <code>Date.SHORT</code> format using 
- * the locale specified in webwork.properties else falling back to the system 
+ * the a programmatically specified locale else falling back to the system 
  * default locale.
  * 
  * 

src/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java

  * 
  * &lt;!-- xwork.xml --&gt;
  * &lt;xwork&gt;
- * &lt;include file="webwork-default.xml" /&gt;
+ * &lt;include file="xwork-default.xml" /&gt;
  * ....
- * &lt;package name="myPackage" extends="webwork-default"&gt;
+ * &lt;package name="myPackage" extends="xwork-default"&gt;
  *   ....
  *   &lt;action name="someAction" class="example.MyActionSupport.java"&gt;
  *      &lt;result name="input"&gt;myJspPage.jsp&lt;/result&gt;

src/java/com/opensymphony/xwork2/validator/validators/VisitorFieldValidator.java

  * </pre>
  * 
  * <!-- START SNIPPET: explanation -->
- * <p>In the example above, if the acion's getUser() method return User object, WebWork
+ * <p>In the example above, if the acion's getUser() method return User object, XWork
  * will look for User-myContext-validation.xml for the validators. Since appednPrefix is true,
  * every field name will be prefixed with 'user' such that if the actual field name for 'name' is  
  * 'user.name' </p>

src/test/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java

         ModelDrivenAction action = (ModelDrivenAction) proxy.getAction();
         TestBean model = (TestBean) action.getModel();
 
-        String property = System.getProperty("webwork.security.test");
+        String property = System.getProperty("xwork.security.test");
         assertNull(property);
     }
 

src/test/com/opensymphony/xwork2/util/XWorkConverterTest.java

     public void testConvertSameCollectionToCollection() {
         Collection names = new ArrayList();
         names.add("XWork");
-        names.add("WebWork");
+        names.add("Struts");
 
         Collection col = (Collection) converter.convertValue(context, names, Collection.class);
         assertSame(names, col);

tiger/src/java/com/opensymphony/xwork2/util/AnnotationXWorkConverter.java

  * <!-- START SNIPPET: javadoc -->
  * <p/>
  * Type conversion is great for situations where you need to turn a String in to a more complex object. Because the web
- * is type-agnostic (everything is a string in HTTP), WebWork's type conversion features are very useful. For instance,
+ * is type-agnostic (everything is a string in HTTP), XWork's type conversion features are very useful. For instance,
  * if you were prompting a user to enter in coordinates in the form of a string (such as "3, 22"), you could have
- * WebWork do the conversion both from String to Point and from Point to String.
+ * XWork do the conversion both from String to Point and from Point to String.
  * <p/>
  * <p/> Using this "point" example, if your action (or another compound object in which you are setting properties on)
- * has a corresponding ClassName-conversion.properties file, WebWork will use the configured type converters for
+ * has a corresponding ClassName-conversion.properties file, XWork will use the configured type converters for
  * conversion to and from strings. So turning "3, 22" in to new Point(3, 22) is done by merely adding the following
  * entry to <b>ClassName-conversion.properties</b> (Note that the PointConverter should impl the ognl.TypeConverter
  * interface):
  * <!-- START SNIPPET: i18n-note -->
  * <p/>
  * Type conversion should not be used as a substitute for i18n. It is not recommended to use this feature to print out
- * properly formatted dates. Rather, you should use the i18n features of WebWork (and consult the JavaDocs for JDK's
+ * properly formatted dates. Rather, you should use the i18n features of XWork (and consult the JavaDocs for JDK's
  * MessageFormat object) to see how a properly formatted date should be displayed.
  * <p/>
  * <!-- END SNIPPET: i18n-note -->