struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject svn commit: r441724 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/Debug.java main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java main/java/org/apache/struts2/util/StrutsTypeConverter.java site/site.xml
Date Sat, 09 Sep 2006 02:00:09 GMT
Author: husted
Date: Fri Sep  8 19:00:09 2006
New Revision: 441724

URL: http://svn.apache.org/viewvc?view=rev&rev=441724
Log:
WW-1349 Update site menu to omit reference to obsolete TLD docs. Update some remaining WW
references. 

Modified:
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java
    struts/struts2/trunk/core/src/site/site.xml

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java?view=diff&rev=441724&r1=441723&r2=441724
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java Fri Sep
 8 19:00:09 2006
@@ -33,7 +33,7 @@
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @s.tag name="debug" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.DebugTag"
+ * @s.tag name="debug" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.DebugTag"
  * description="Render debug tag"
   */
 public class Debug extends UIBean {

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java?view=diff&rev=441724&r1=441723&r2=441724
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
(original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
Fri Sep  8 19:00:09 2006
@@ -40,12 +40,12 @@
  * configuration files. This means you can change your URL patterns at any point and your
application will still work.
  * It is strongly recommended that if you are redirecting to another action, you use this
result rather than the
  * standard redirect result.
- * 
+ *
  * <p/>
- * 
- * To pass parameters, the &lt;param&gt; ... &lt;/param&gt; tag. The following
parameters will not be 
+ *
+ * To pass parameters, the &lt;param&gt; ... &lt;/param&gt; tag. The following
parameters will not be
  * passable becuase they are part of the config param for this particular result.
- * 
+ *
  * <ul>
  * 	<li>actionName</li>
  *  <li>namespace</li>
@@ -55,7 +55,7 @@
  *  <li>location</li>
  *  <li>prependServletContext</li>
  * </ul>
- * 
+ *
  * See examples below for an example of how request parameters could be passed in.
  *
  * <!-- END SNIPPET: description -->
@@ -99,11 +99,11 @@
  *         &lt;result&gt;error.jsp&lt;/result&gt;
  *     &lt;/action&gt;
  * &lt;/package&gt;
- * 
- * &lt;package name="passingRequestParameters" extends="webwork-default" namespace="/passingRequestParameters"&gt;
+ *
+ * &lt;package name="passingRequestParameters" extends="struts-default" namespace="/passingRequestParameters"&gt;
  * 	  &lt;-- Pass parameters (reportType, width and height) --&gt;
- *    &lt;!-- 
- *    The redirect-action url generated will be : 
+ *    &lt;!--
+ *    The redirect-action url generated will be :
  *    /genReport/generateReport.action?reportType=pie&width=100&height=100
  *    --&gt;
  *    &lt;action name="gatherReportInfo" class="..."&gt;
@@ -116,14 +116,14 @@
  *       &lt;/result&gt;
  *    &lt;/action&gt;
  * &lt;/package&gt;
- * 
- * 
+ *
+ *
  * <!-- END SNIPPET: example --></pre>
  *
  * @see ActionMapper
  */
 public class ServletActionRedirectResult extends ServletRedirectResult {
-	
+
 	private static final long serialVersionUID = -9042425229314584066L;
 
     /** The default parameter */
@@ -132,11 +132,11 @@
     protected String actionName;
     protected String namespace;
     protected String method;
-    
-    protected List<String> prohibitedResultParam = Arrays.asList(new String[] { 
-    		DEFAULT_PARAM, "namespace", "method", "encode", "parse", "location", 
+
+    protected List<String> prohibitedResultParam = Arrays.asList(new String[] {
+    		DEFAULT_PARAM, "namespace", "method", "encode", "parse", "location",
     		"prependServletContext" });
-    
+
     /**
      * @see com.opensymphony.xwork2.Result#execute(com.opensymphony.xwork2.ActionInvocation)
      */
@@ -161,24 +161,24 @@
         for (Iterator i = resultConfigParams.entrySet().iterator(); i.hasNext(); ) {
         	Map.Entry e = (Map.Entry) i.next();
         	if (! prohibitedResultParam.contains(e.getKey())) {
-        		requestParameters.put(e.getKey().toString(), 
-        				e.getValue() == null ? "": 
+        		requestParameters.put(e.getKey().toString(),
+        				e.getValue() == null ? "":
         					conditionalParse(e.getValue().toString(), invocation));
         	}
         }
-        
+
         ActionMapper mapper = ActionMapperFactory.getMapper();
         StringBuffer tmpLocation = new StringBuffer(mapper.getUriFromActionMapping(new ActionMapping(actionName,
namespace, method, null)));
         UrlHelper.buildParametersString(requestParameters, tmpLocation, "&");
-        
+
         location = tmpLocation.toString();
-        
+
         super.execute(invocation);
     }
 
     /**
      * Sets the action name
-     * 
+     *
      * @param actionName The name
      */
     public void setActionName(String actionName) {
@@ -187,16 +187,16 @@
 
     /**
      * Sets the namespace
-     * 
+     *
      * @param namespace The namespace
      */
     public void setNamespace(String namespace) {
         this.namespace = namespace;
     }
-    
+
     /**
      * Sets the method
-     * 
+     *
      * @param method The method
      */
     public void setMethod(String method) {

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java?view=diff&rev=441724&r1=441723&r2=441724
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java
(original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java
Fri Sep  8 19:00:09 2006
@@ -30,15 +30,15 @@
  * <p/> Type converters do not have to use this class. It is merely a helper base class,
although it is recommended that
  * you use this class as it provides the common type conversion contract required for all
web-based type conversion.
  *
- * <p/> There's a hook (fall back method) called <code>performFallbackConversion</code>
of which 
- * could be used to perform some fallback conversion if <code>convertValue</code>
method of this 
+ * <p/> There's a hook (fall back method) called <code>performFallbackConversion</code>
of which
+ * could be used to perform some fallback conversion if <code>convertValue</code>
method of this
  * failed. By default it just ask its super class (Ognl's DefaultTypeConverter) to do the
conversion.
  *
- * <p/> To allow WebWork to recongnize that a converison error has occurred, throw
an XWorkException or 
+ * <p/> To allow the framework to recognize that a conversion error has occurred, throw
an XWorkException or
  * preferable a TypeConversionException.
  *
  * <!-- END SNIPPET: javadoc -->
- * 
+ *
  */
 public abstract class StrutsTypeConverter extends DefaultTypeConverter {
     public Object convertValue(Map context, Object o, Class toClass) {
@@ -52,12 +52,12 @@
         	return performFallbackConversion(context, o, toClass);
         }
     }
-    
+
     /**
      * Hook to perform a fallback conversion if every default options failed. By default
-     * this will ask Ognl's DefaultTypeConverter (of which this class extends) to 
+     * this will ask Ognl's DefaultTypeConverter (of which this class extends) to
      * perform the conversion.
-     * 
+     *
      * @param context
      * @param o
      * @param toClass
@@ -66,7 +66,7 @@
     protected Object performFallbackConversion(Map context, Object o, Class toClass) {
     	return super.convertValue(context, o, toClass);
     }
-    
+
 
     /**
      * Converts one or more String values to the specified class.

Modified: struts/struts2/trunk/core/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/site.xml?view=diff&rev=441724&r1=441723&r2=441724
==============================================================================
--- struts/struts2/trunk/core/src/site/site.xml (original)
+++ struts/struts2/trunk/core/src/site/site.xml Fri Sep  8 19:00:09 2006
@@ -66,13 +66,8 @@
 
             <item
                     name="Tag Reference"
-                    href="tagreference.html"
+                    href="http://cwiki.apache.org/WW/tag-reference.html"
                     />        
-
-            <item
-                    name="Struts Tags API"
-                    href="tlddoc/index.html"
-                    />
 
             <item
                     name="Source Repository"



Mime
View raw message