You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by sa...@apache.org on 2009/01/05 13:57:25 UTC

svn commit: r731546 [2/4] - in /incubator/click/trunk/click/extras: src/ src/org/ src/org/apache/ src/org/apache/click/ src/org/apache/click/extras/ src/org/apache/click/extras/cayenne/ src/org/apache/click/extras/control/ src/org/apache/click/extras/c...

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker.java (from r729543, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/ColorPicker.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/ColorPicker.java&r1=729543&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/ColorPicker.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker.java Mon Jan  5 04:57:19 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 import java.text.MessageFormat;
 import java.util.HashMap;
@@ -24,10 +24,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import net.sf.click.Context;
-import net.sf.click.control.Field;
-import net.sf.click.util.ClickUtils;
-import net.sf.click.util.HtmlStringBuffer;
+import org.apache.click.Context;
+import org.apache.click.control.Field;
+import org.apache.click.util.ClickUtils;
+import org.apache.click.util.HtmlStringBuffer;
 
 /**
  * Provides a ColorPicker control:   <input type='text'><img>.
@@ -187,7 +187,7 @@
      * Return the HTML head import statements for the JavaScript files
      * <tt>click/prototype.js</tt>) and <tt>click/colorpicker.js</tt>.
      *
-     * @see net.sf.click.control.Field#getHtmlImports()
+     * @see org.apache.click.control.Field#getHtmlImports()
      *
      * @return the HTML head import statements for prototype.js and colorpicker.js
      */
@@ -255,7 +255,7 @@
     // --------------------------------------------------------- Public Methods
 
     /**
-     * @see net.sf.click.control.AbstractControl#getControlSizeEst()
+     * @see org.apache.click.control.AbstractControl#getControlSizeEst()
      *
      * @return the estimated rendered control size in characters
      */
@@ -337,7 +337,7 @@
      * Validates the input to check wheter is required or not and that the
      * input contains a valid color hex value.
      *
-     * @see net.sf.click.control.TextField#validate()
+     * @see org.apache.click.control.TextField#validate()
      */
     public void validate() {
         setError(null);

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker_cs.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker_cs.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker_de.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker_en.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker_fr.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker_it.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker_ja.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker_nl.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker_ro.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker_tr.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ColorPicker_zh_CN.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CountrySelect.java (from r729543, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/CountrySelect.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CountrySelect.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CountrySelect.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/CountrySelect.java&r1=729543&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/CountrySelect.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CountrySelect.java Mon Jan  5 04:57:19 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 import java.text.Collator;
 import java.util.Comparator;
@@ -24,9 +24,9 @@
 
 import java.util.Set;
 import java.util.TreeSet;
-import net.sf.click.control.Option;
-import net.sf.click.control.Select;
-import net.sf.click.util.HtmlStringBuffer;
+import org.apache.click.control.Option;
+import org.apache.click.control.Select;
+import org.apache.click.util.HtmlStringBuffer;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -148,7 +148,7 @@
      * Set the locale of this control to something else than the
      * <code>Context</code> locale.
      *
-     * @see net.sf.click.Context#getLocale()
+     * @see org.apache.click.Context#getLocale()
      *
      * @param locale the locale to set for this control
      */

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CountrySelect.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CountrySelect.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField.java (from r731262, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/CreditCardField.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/CreditCardField.java&r1=731262&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/CreditCardField.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField.java Mon Jan  5 04:57:19 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -24,11 +24,11 @@
 
 import javax.servlet.ServletContext;
 
-import net.sf.click.control.Option;
-import net.sf.click.control.Select;
-import net.sf.click.control.TextField;
-import net.sf.click.util.ClickUtils;
-import net.sf.click.util.HtmlStringBuffer;
+import org.apache.click.control.Option;
+import org.apache.click.control.Select;
+import org.apache.click.control.TextField;
+import org.apache.click.util.ClickUtils;
+import org.apache.click.util.HtmlStringBuffer;
 
 /**
  * Provides a Credit Card control: &nbsp; &lt;input type='text'&gt;&lt;select&gt;.
@@ -49,7 +49,7 @@
  * <p/>
  * The CreditCardField uses a JavaScript onkeypress() integerFilter() method to
  * prevent users from entering invalid characters. To enable number key filtering
- * reference the {@link net.sf.click.util.PageImports} object in the page template.
+ * reference the {@link org.apache.click.util.PageImports} object in the page template.
  *
  * <h3>CreditCardField Example</h3>
  *
@@ -304,7 +304,7 @@
     }
 
     /**
-     * @see net.sf.click.control.AbstractControl#getControlSizeEst()
+     * @see org.apache.click.control.AbstractControl#getControlSizeEst()
      *
      * @return the estimated rendered control size in characters
      */
@@ -370,7 +370,7 @@
      *       <li>field-required-error</li>
      *     </ul>
      *   </li>
-     *   <li>/net/sf/click/extras/control/CreditCardField.properties
+     *   <li>/org/apache/click/extras/control/CreditCardField.properties
      *     <ul>
      *       <li>creditcard-number-error</li>
      *     </ul>
@@ -446,13 +446,13 @@
      * Deploy the <tt>extras-control.js</tt> file to the <tt>click</tt> web
      * directory when the application is initialized.
      *
-     * @see net.sf.click.Control#onDeploy(ServletContext)
+     * @see org.apache.click.Control#onDeploy(ServletContext)
      *
      * @param servletContext the servlet context
      */
     public void onDeploy(ServletContext servletContext) {
         ClickUtils.deployFile(servletContext,
-                              "/net/sf/click/extras/control/extras-control.js",
+                              "/org/apache/click/extras/control/extras-control.js",
                               "click");
     }
 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_cs.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_cs.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_de.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_en.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_en.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_fr.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_it_IT.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_it_IT.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_it_IT.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_ja.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_nl.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_pt_BR.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_ro.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_tr.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_zh_CN.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/CreditCardField_zh_CN.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField.java (from r731262, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/DateField.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/DateField.java&r1=731262&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/DateField.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField.java Mon Jan  5 04:57:19 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 import java.sql.Timestamp;
 import java.text.ParseException;
@@ -24,8 +24,8 @@
 import java.util.Date;
 import java.util.Locale;
 
-import net.sf.click.control.TextField;
-import net.sf.click.util.HtmlStringBuffer;
+import org.apache.click.control.TextField;
+import org.apache.click.util.HtmlStringBuffer;
 
 /**
  * Provides a Date Field control: &nbsp; &lt;input type='text'&gt;.
@@ -336,7 +336,7 @@
     }
 
     /**
-     * @see net.sf.click.control.Field#setName(String)
+     * @see org.apache.click.control.Field#setName(String)
      *
      * @param name of the control
      * @throws IllegalArgumentException if the name is null
@@ -429,7 +429,7 @@
      *       <li>field-required-error</li>
      *     </ul>
      *   </li>
-     *   <li>/net/sf/click/extras/control/DateField.properties
+     *   <li>/org/apache/click/extras/control/DateField.properties
      *     <ul>
      *       <li>date-format-error</li>
      *     </ul>

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_cs.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_cs.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_de.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_en.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_en.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_fr.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_it_IT.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_it_IT.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_it_IT.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_ja.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_nl.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_pt_BR.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_ro.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_tr.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_zh_CN.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DateField_zh_CN.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DoubleField.java (from r731262, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/DoubleField.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DoubleField.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DoubleField.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/DoubleField.java&r1=731262&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/DoubleField.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DoubleField.java Mon Jan  5 04:57:19 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 import java.text.NumberFormat;
 import java.text.ParseException;
@@ -36,7 +36,7 @@
  * <p/>
  * The DoubleField uses a JavaScript onkeypress() doubleFilter() method to prevent
  * users from entering invalid characters. To enable number key filtering
- * reference the {@link net.sf.click.util.PageImports} object in your page
+ * reference the {@link org.apache.click.util.PageImports} object in your page
  * header section. For example:
  *
  * <pre class="codeHtml">
@@ -203,7 +203,7 @@
     /**
      * Validates the NumberField request submission. If the value entered
      * by the user can be parsed by the NumberFormat the string value
-     * of this Field ({@link net.sf.click.control.Field#getValue()}) is
+     * of this Field ({@link org.apache.click.control.Field#getValue()}) is
      * set to the formatted value of the user input.
      * <p/>
      * A field error message is displayed if a validation error occurs.

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DoubleField.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/DoubleField.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField.java (from r731262, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/EmailField.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/EmailField.java&r1=731262&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/EmailField.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField.java Mon Jan  5 04:57:19 2009
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 import java.text.MessageFormat;
 
 import javax.servlet.ServletContext;
 
-import net.sf.click.control.TextField;
-import net.sf.click.util.ClickUtils;
+import org.apache.click.control.TextField;
+import org.apache.click.util.ClickUtils;
 
 /**
  * Provides a Email Field control: &nbsp; &lt;input type='text'&gt;.
@@ -170,7 +170,7 @@
      * Return the HTML head import statements for the JavaScript
      * (<tt>click/extras-control.js</tt>) file.
      *
-     * @see net.sf.click.Control#getHtmlImports()
+     * @see org.apache.click.Control#getHtmlImports()
      *
      * @return the HTML head import statements for the JavaScript file
      */
@@ -209,13 +209,13 @@
      * Deploy the <tt>extras-control.js</tt> file to the <tt>click</tt> web
      * directory when the application is initialized.
      *
-     * @see net.sf.click.Control#onDeploy(ServletContext)
+     * @see org.apache.click.Control#onDeploy(ServletContext)
      *
      * @param servletContext the servlet context
      */
     public void onDeploy(ServletContext servletContext) {
         ClickUtils.deployFile(servletContext,
-                              "/net/sf/click/extras/control/extras-control.js",
+                              "/org/apache/click/extras/control/extras-control.js",
                               "click");
     }
 
@@ -233,7 +233,7 @@
      *       <li>field-required-error</li>
      *     </ul>
      *   </li>
-     *   <li>/net/sf/click/extras/control/EmailField.properties
+     *   <li>/org/apache/click/extras/control/EmailField.properties
      *     <ul>
      *       <li>email-format-error</li>
      *     </ul>

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_cs.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_cs.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_de.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_en.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_en.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_fr.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_it_IT.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_it_IT.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_it_IT.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_ja.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_nl.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_pt_BR.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_ro.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_tr.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_zh_CN.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/EmailField_zh_CN.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ExternalLink.java (from r731262, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/ExternalLink.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ExternalLink.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ExternalLink.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/ExternalLink.java&r1=731262&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/ExternalLink.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ExternalLink.java Mon Jan  5 04:57:19 2009
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 import java.util.Iterator;
 import java.util.Map;
 
-import net.sf.click.control.AbstractLink;
-import net.sf.click.util.ClickUtils;
-import net.sf.click.util.HtmlStringBuffer;
+import org.apache.click.control.AbstractLink;
+import org.apache.click.util.ClickUtils;
+import org.apache.click.util.HtmlStringBuffer;
 
 /**
  * Provides an External Link control: &nbsp; &lt;a href="" &gt;&lt;/a&gt;.
@@ -130,7 +130,7 @@
     /**
      * This method does nothing.
      *
-     * @see net.sf.click.Control#setListener(Object, String)
+     * @see org.apache.click.Control#setListener(Object, String)
      *
      * @param listener the listener object with the named method to invoke
      * @param method the name of the method to invoke
@@ -161,7 +161,7 @@
     /**
      * This method will return true.
      *
-     * @see net.sf.click.Control#onProcess()
+     * @see org.apache.click.Control#onProcess()
      *
      * @return true
      */

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/ExternalLink.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/FieldColumn.java (from r729543, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/FieldColumn.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/FieldColumn.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/FieldColumn.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/FieldColumn.java&r1=729543&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/FieldColumn.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/FieldColumn.java Mon Jan  5 04:57:19 2009
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
-import net.sf.click.Context;
-import net.sf.click.control.Column;
-import net.sf.click.control.Field;
-import net.sf.click.control.Form;
-import net.sf.click.util.HtmlStringBuffer;
+import org.apache.click.Context;
+import org.apache.click.control.Column;
+import org.apache.click.control.Field;
+import org.apache.click.control.Form;
+import org.apache.click.util.HtmlStringBuffer;
 
 /**
  * Provides a FieldColumn for rendering table data cells.

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/FieldColumn.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/FormTable.java (from r729543, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/FormTable.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/FormTable.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/FormTable.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/FormTable.java&r1=729543&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/FormTable.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/FormTable.java Mon Jan  5 04:57:19 2009
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import net.sf.click.Context;
-import net.sf.click.control.Button;
-import net.sf.click.control.Column;
-import net.sf.click.control.Field;
-import net.sf.click.control.Form;
-import net.sf.click.control.HiddenField;
-import net.sf.click.control.Table;
-import net.sf.click.util.HtmlStringBuffer;
+import org.apache.click.Context;
+import org.apache.click.control.Button;
+import org.apache.click.control.Column;
+import org.apache.click.control.Field;
+import org.apache.click.control.Form;
+import org.apache.click.control.HiddenField;
+import org.apache.click.control.Table;
+import org.apache.click.util.HtmlStringBuffer;
 import ognl.Ognl;
 
 import org.apache.commons.lang.StringUtils;
@@ -50,7 +50,7 @@
  * and an array of {@link FieldColumn} objects.
  * <p/>
  * <b>Please note</b> it is possible to associate FormTable with an external
- * Form through this {@link FormTable#FormTable(java.lang.String, net.sf.click.control.Form) constructor}.
+ * Form through this {@link FormTable#FormTable(java.lang.String, org.apache.click.control.Form) constructor}.
  * <p/>
  * FieldColumn extends the {@link Column} class and includes a {@link Field}
  * object which is uses to render its column value. Each table data cell
@@ -152,7 +152,7 @@
  * By default FormTable will create an internal Form to submit its values.
  * <p/>
  * If you would like to integrate FormTable with an externally defined Form,
- * use the {@link FormTable#FormTable(java.lang.String, net.sf.click.control.Form) constructor}
+ * use the {@link FormTable#FormTable(java.lang.String, org.apache.click.control.Form) constructor}
  * which accepts a Form.
  * <p/>
  * Example usage:
@@ -296,7 +296,7 @@
      * <p/>
      * The returned Form control will either be an internally created Form
      * instance, or an external instance specified through
-     * this {@link FormTable#FormTable(java.lang.String, net.sf.click.control.Form) contructor}.
+     * this {@link FormTable#FormTable(java.lang.String, org.apache.click.control.Form) contructor}.
      *
      * @return the form object
      */
@@ -311,7 +311,7 @@
      * Return the HTML head element import string. This method will also include
      * the imports of the form and the contained fields.
      *
-     * @see net.sf.click.Control#getHtmlImports()
+     * @see org.apache.click.Control#getHtmlImports()
      *
      * @return the HTML head element import string
      */
@@ -343,7 +343,7 @@
     }
 
     /**
-     * @see net.sf.click.Control#setName(String)
+     * @see org.apache.click.Control#setName(String)
      *
      * @param name of the control
      * @throws IllegalArgumentException if the name is null
@@ -474,7 +474,7 @@
     }
 
     /**
-     * @see net.sf.click.control.AbstractControl#getControlSizeEst()
+     * @see org.apache.click.control.AbstractControl#getControlSizeEst()
      *
      * @return the estimated rendered control size in characters
      */

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/FormTable.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/FormTable.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/FormTable_en.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/FormTable_nl.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/FormTable_tr.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/HtmlFieldSet.java (from r729543, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/HtmlFieldSet.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/HtmlFieldSet.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/HtmlFieldSet.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/HtmlFieldSet.java&r1=729543&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/HtmlFieldSet.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/HtmlFieldSet.java Mon Jan  5 04:57:19 2009
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
-import net.sf.click.Control;
-import net.sf.click.control.Field;
-import net.sf.click.control.FieldSet;
-import net.sf.click.util.HtmlStringBuffer;
+import org.apache.click.Control;
+import org.apache.click.control.Field;
+import org.apache.click.control.FieldSet;
+import org.apache.click.util.HtmlStringBuffer;
 
 /**
  * Provides an HTML FieldSet container to create composite based fieldsets:
  * &nbsp; &lt;fieldset&gt;.
  * <p/>
- * {@link net.sf.click.control.FieldSet} uses an HTML Table to layout its fields
+ * {@link org.apache.click.control.FieldSet} uses an HTML Table to layout its fields
  * and controls. HtmlFieldSet on the other hand does not provide a layout and
  * instead relies on the developer to compose a layout programmatically.
  * <p/>
@@ -132,7 +132,7 @@
      * Returns the HTML representation of the FieldSet.
      * <p/>
      * The rendering of the FieldSet is delegated to
-     * {@link #render(net.sf.click.util.HtmlStringBuffer)}. The size of buffer
+     * {@link #render(org.apache.click.util.HtmlStringBuffer)}. The size of buffer
      * is determined by {@link #getControlSizeEst()}.
      *
      * @see Object#toString()
@@ -146,7 +146,7 @@
     // ------------------------------------------------------ Protected Methods
 
     /**
-     * @see net.sf.click.control.AbstractControl#renderTagBegin(java.lang.String, net.sf.click.util.HtmlStringBuffer)
+     * @see org.apache.click.control.AbstractControl#renderTagBegin(java.lang.String, org.apache.click.util.HtmlStringBuffer)
      *
      * @param tagName the name of the tag to render
      * @param buffer the buffer to append the output to
@@ -167,7 +167,7 @@
     }
 
     /**
-     * @see net.sf.click.control.AbstractControl#renderTagEnd(java.lang.String, net.sf.click.util.HtmlStringBuffer).
+     * @see org.apache.click.control.AbstractControl#renderTagEnd(java.lang.String, org.apache.click.util.HtmlStringBuffer).
      *
      * @param tagName the name of the tag to close
      * @param buffer the buffer to append the output to
@@ -177,7 +177,7 @@
     }
 
     /**
-     * @see net.sf.click.control.AbstractContainer#renderContent(net.sf.click.util.HtmlStringBuffer)
+     * @see org.apache.click.control.AbstractContainer#renderContent(org.apache.click.util.HtmlStringBuffer)
      *
      * @param buffer the buffer to append the output to
      */

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/HtmlFieldSet.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/HtmlForm.java (from r729543, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/HtmlForm.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/HtmlForm.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/HtmlForm.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/HtmlForm.java&r1=729543&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/HtmlForm.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/HtmlForm.java Mon Jan  5 04:57:19 2009
@@ -16,22 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 import java.util.Iterator;
 import java.util.List;
-import net.sf.click.Control;
-import net.sf.click.control.Field;
-import net.sf.click.control.Form;
-import net.sf.click.service.FileUploadService;
-import net.sf.click.util.ContainerUtils;
-import net.sf.click.util.HtmlStringBuffer;
+import org.apache.click.Control;
+import org.apache.click.control.Field;
+import org.apache.click.control.Form;
+import org.apache.click.service.FileUploadService;
+import org.apache.click.util.ContainerUtils;
+import org.apache.click.util.HtmlStringBuffer;
 
 /**
  * Provides an HTML Form control to create composite based forms:
  * &nbsp; &lt;form method='post'&gt;.
  * <p/>
- * {@link net.sf.click.control.Form} uses an HTML Table to layout its fields and
+ * {@link org.apache.click.control.Form} uses an HTML Table to layout its fields and
  * controls. HtmlForm on the other hand does not provide a layout and instead
  * relies on the developer to compose a layout programmatically.
  * <p/>
@@ -98,7 +98,7 @@
     }
 
     /**
-     * @see net.sf.click.Control#onProcess().
+     * @see org.apache.click.Control#onProcess().
      *
      * @return true to continue Page event processing or false otherwise
      */
@@ -145,7 +145,7 @@
      * Render the HTML representation of the form and all its child
      * controls to the specified buffer.
      *
-     * @see net.sf.click.control.AbstractControl#render(net.sf.click.util.HtmlStringBuffer)
+     * @see org.apache.click.control.AbstractControl#render(org.apache.click.util.HtmlStringBuffer)
      *
      * @param buffer the specified buffer to render the control's output to
      */
@@ -171,7 +171,7 @@
     // ------------------------------------------------------ Protected Methods
 
     /**
-     * @see net.sf.click.control.AbstractControl#renderTagBegin(java.lang.String, net.sf.click.util.HtmlStringBuffer)
+     * @see org.apache.click.control.AbstractControl#renderTagBegin(java.lang.String, org.apache.click.util.HtmlStringBuffer)
      *
      * @param tagName the name of the tag to render
      * @param buffer the buffer to append the output to
@@ -192,7 +192,7 @@
     }
 
     /**
-     * @see net.sf.click.control.AbstractContainer#renderContent(net.sf.click.util.HtmlStringBuffer)
+     * @see org.apache.click.control.AbstractContainer#renderContent(org.apache.click.util.HtmlStringBuffer)
      *
      * @param buffer the buffer to append the output to
      */
@@ -210,7 +210,7 @@
     }
 
     /**
-     * @see net.sf.click.control.AbstractContainer#renderChildren(net.sf.click.util.HtmlStringBuffer)
+     * @see org.apache.click.control.AbstractContainer#renderChildren(org.apache.click.util.HtmlStringBuffer)
      *
      * @param buffer the buffer to append the output to
      */
@@ -237,7 +237,7 @@
     }
 
     /**
-     * @see net.sf.click.control.AbstractControl#getControlSizeEst()
+     * @see org.apache.click.control.AbstractControl#getControlSizeEst()
      *
      * @param formFields the list of form fields
      * @return the estimated rendered control size in characters

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/HtmlForm.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/IntegerField.java (from r731262, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/IntegerField.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/IntegerField.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/IntegerField.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/IntegerField.java&r1=731262&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/IntegerField.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/IntegerField.java Mon Jan  5 04:57:19 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 /**
  * Provides a Integer Field control: &nbsp; &lt;input type='text'&gt;.
@@ -201,7 +201,7 @@
      * Return the field Integer value, or null if value was empty or a parsing
      * error occured.
      *
-     * @see net.sf.click.control.Field#getValueObject()
+     * @see org.apache.click.control.Field#getValueObject()
      *
      * @return the Integer object representation of the Field value
      */
@@ -212,7 +212,7 @@
     /**
      * Set the integer value of the field using the given object.
      *
-     * @see net.sf.click.control.Field#setValueObject(Object)
+     * @see org.apache.click.control.Field#setValueObject(Object)
      *
      * @param object the object value to set
      */

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/IntegerField.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/IntegerField.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/LinkDecorator.java (from r729543, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/LinkDecorator.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/LinkDecorator.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/LinkDecorator.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/LinkDecorator.java&r1=729543&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/LinkDecorator.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/LinkDecorator.java Mon Jan  5 04:57:19 2009
@@ -16,23 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import net.sf.click.Context;
-import net.sf.click.control.AbstractControl;
-import net.sf.click.control.AbstractLink;
-import net.sf.click.control.ActionButton;
-import net.sf.click.control.ActionLink;
-import net.sf.click.control.Decorator;
-import net.sf.click.control.PageLink;
-import net.sf.click.control.Table;
-import net.sf.click.util.HtmlStringBuffer;
-import net.sf.click.util.PropertyUtils;
+import org.apache.click.Context;
+import org.apache.click.control.AbstractControl;
+import org.apache.click.control.AbstractLink;
+import org.apache.click.control.ActionButton;
+import org.apache.click.control.ActionLink;
+import org.apache.click.control.Decorator;
+import org.apache.click.control.PageLink;
+import org.apache.click.control.Table;
+import org.apache.click.util.HtmlStringBuffer;
+import org.apache.click.util.PropertyUtils;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -100,8 +100,8 @@
  * default parameter.
  * <p/>
  * In such cases you can override the methods
- * {@link #renderActionLink(net.sf.click.util.HtmlStringBuffer, net.sf.click.control.AbstractLink, net.sf.click.Context, java.lang.Object, java.lang.Object) renderActionLink}
- * or {@link #renderActionButton(net.sf.click.util.HtmlStringBuffer, net.sf.click.control.ActionButton, net.sf.click.Context, java.lang.Object, java.lang.Object) renderActionButton}.
+ * {@link #renderActionLink(org.apache.click.util.HtmlStringBuffer, org.apache.click.control.AbstractLink, org.apache.click.Context, java.lang.Object, java.lang.Object) renderActionLink}
+ * or {@link #renderActionButton(org.apache.click.util.HtmlStringBuffer, org.apache.click.control.ActionButton, org.apache.click.Context, java.lang.Object, java.lang.Object) renderActionButton}.
  * <p/>
  * In the example below we want to send both the <tt>state</tt> and <tt>postCode</tt>
  * parameters to the <tt>AddressPage</tt>:
@@ -149,8 +149,8 @@
  * This class was inspired by Richardo Lecheta's <tt>ViewDecorator</tt> design
  * pattern.
  *
- * @see net.sf.click.control.ActionLink
- * @see net.sf.click.control.PageLink
+ * @see org.apache.click.control.ActionLink
+ * @see org.apache.click.control.PageLink
  *
  * @author Malcolm Edgar
  */
@@ -239,7 +239,7 @@
      * Create a new AbstractLink table column Decorator with the given
      * AbstractLinks array and row object identifier property name.
      *
-     * @see LinkDecorator#LinkDecorator(net.sf.click.control.Table, net.sf.click.control.AbstractLink, java.lang.String)
+     * @see LinkDecorator#LinkDecorator(org.apache.click.control.Table, org.apache.click.control.AbstractLink, java.lang.String)
      *
      * @param table the table to render the links for
      * @param links the array of AbstractLinks to render
@@ -267,7 +267,7 @@
      * ActionButton and row object identifier property name.
      * The default linkSeparator for buttons is <tt>" "</tt>.
      *
-     * @see LinkDecorator#LinkDecorator(net.sf.click.control.Table, net.sf.click.control.AbstractLink, java.lang.String)
+     * @see LinkDecorator#LinkDecorator(org.apache.click.control.Table, org.apache.click.control.AbstractLink, java.lang.String)
      *
      * @param table the table to render the links for
      * @param button the ActionButton to render
@@ -297,7 +297,7 @@
      * ActionButtons array and row object identifier property name.
      * The default linkSeparator for buttons is <tt>" "</tt>.
      *
-     * @see LinkDecorator#LinkDecorator(net.sf.click.control.Table, net.sf.click.control.AbstractLink, java.lang.String)
+     * @see LinkDecorator#LinkDecorator(org.apache.click.control.Table, org.apache.click.control.AbstractLink, java.lang.String)
      *
      * @param table the table to render the links for
      * @param buttons the array of ActionButtons to render
@@ -329,7 +329,7 @@
      * Please note you must provide either AbstractLink objects or ActionButton
      * objects in the controls array, but not a mixture of both.
      *
-     * @see LinkDecorator#LinkDecorator(net.sf.click.control.Table, net.sf.click.control.AbstractLink, java.lang.String)
+     * @see LinkDecorator#LinkDecorator(org.apache.click.control.Table, org.apache.click.control.AbstractLink, java.lang.String)
      *
      * @param table the table to render the links for
      * @param controls the list of AbstractLink or ActionButtons to render
@@ -410,7 +410,7 @@
     /**
      * Render the given row object using the links or buttons.
      *
-     * @see Decorator#render(java.lang.Object, net.sf.click.Context)
+     * @see Decorator#render(java.lang.Object, org.apache.click.Context)
      *
      * @param row the row object to render
      * @param context the request context
@@ -435,10 +435,10 @@
      * Render the given row object using the actionLinks array.
      * <p/>
      * This method initializes each link in actionLinks array by invoking
-     * {@link #initLink(net.sf.click.control.AbstractLink, net.sf.click.Context, java.lang.Object)}.
+     * {@link #initLink(org.apache.click.control.AbstractLink, org.apache.click.Context, java.lang.Object)}.
      * <p/>
      * This method also renders each link in the array by
-     * invoking {@link #renderActionLink(net.sf.click.util.HtmlStringBuffer, net.sf.click.control.AbstractLink, net.sf.click.Context, java.lang.Object, java.lang.Object)}.
+     * invoking {@link #renderActionLink(org.apache.click.util.HtmlStringBuffer, org.apache.click.control.AbstractLink, org.apache.click.Context, java.lang.Object, java.lang.Object)}.
      *
      * @param row the row object to render
      * @param context the request context
@@ -483,10 +483,10 @@
      * Render the given row object using the actionButtons array.
      * <p/>
      * This method initializes each button in actionButtons array by invoking
-     * {@link #initButton(net.sf.click.control.ActionButton, net.sf.click.Context, java.lang.Object)}.
+     * {@link #initButton(org.apache.click.control.ActionButton, org.apache.click.Context, java.lang.Object)}.
      * <p/>
      * This method also renders each button in the array by
-     * invoking {@link #renderActionButton(net.sf.click.util.HtmlStringBuffer, net.sf.click.control.ActionButton, net.sf.click.Context, java.lang.Object, java.lang.Object)}.
+     * invoking {@link #renderActionButton(org.apache.click.util.HtmlStringBuffer, org.apache.click.control.ActionButton, org.apache.click.Context, java.lang.Object, java.lang.Object)}.
      *
      * @param row the row object to render
      * @param context the request context
@@ -550,7 +550,7 @@
      * remember to invoke <tt>super.renderActionButton</tt> so default rendering
      * can continue.
      *
-     * @see #renderActionLink(net.sf.click.util.HtmlStringBuffer, net.sf.click.control.AbstractLink, net.sf.click.Context, java.lang.Object, java.lang.Object)
+     * @see #renderActionLink(org.apache.click.util.HtmlStringBuffer, org.apache.click.control.AbstractLink, org.apache.click.Context, java.lang.Object, java.lang.Object)
      *
      * @param buffer the specified buffer to render the button output to
      * @param button the button to render
@@ -640,7 +640,7 @@
         }
 
         /**
-         * @see net.sf.click.Control#onProcess()
+         * @see org.apache.click.Control#onProcess()
          */
         public boolean onProcess() {
             Context context = getContext();

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/LinkDecorator.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/LongField.java (from r731262, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/LongField.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/LongField.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/LongField.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/LongField.java&r1=731262&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/LongField.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/LongField.java Mon Jan  5 04:57:19 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 /**
  * Provides a Long Field control: &nbsp; &lt;input type='text'&gt;.
@@ -188,7 +188,7 @@
      * Return the field Long value, or null if value was empty or a parsing
      * error occured.
      *
-     * @see net.sf.click.control.Field#getValueObject()
+     * @see org.apache.click.control.Field#getValueObject()
      *
      * @return the Long object representation of the Field value
      */
@@ -199,7 +199,7 @@
     /**
      * Set the long value of the field using the given object.
      *
-     * @see net.sf.click.control.Field#setValueObject(Object)
+     * @see org.apache.click.control.Field#setValueObject(Object)
      *
      * @param object the object value to set
      */

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/LongField.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/LongField.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java (from r729543, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/Menu.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/Menu.java&r1=729543&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/Menu.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java Mon Jan  5 04:57:19 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -26,11 +26,11 @@
 
 import javax.servlet.ServletContext;
 
-import net.sf.click.Context;
-import net.sf.click.control.AbstractControl;
-import net.sf.click.service.ConfigService;
-import net.sf.click.util.ClickUtils;
-import net.sf.click.util.HtmlStringBuffer;
+import org.apache.click.Context;
+import org.apache.click.control.AbstractControl;
+import org.apache.click.service.ConfigService;
+import org.apache.click.util.ClickUtils;
+import org.apache.click.util.HtmlStringBuffer;
 
 import org.apache.commons.lang.StringUtils;
 import org.w3c.dom.Document;
@@ -611,7 +611,7 @@
      * Return the HTML head import statements for the CSS stylesheet
      * (<tt>click/menu.css</tt>) and JavaScript (<tt>click/extras-control.js</tt>) files.
      *
-     * @see net.sf.click.Control#getHtmlImports()
+     * @see org.apache.click.Control#getHtmlImports()
      *
      * @return the HTML head import statements for the control stylesheet and
      * JavaScript files
@@ -649,7 +649,7 @@
     /**
      * This method returns null.
      *
-     * @see net.sf.click.Control#getId()
+     * @see org.apache.click.Control#getId()
      *
      * @return null
      */
@@ -660,7 +660,7 @@
     /**
      * This method does nothing.
      *
-     * @see net.sf.click.Control#setListener(Object, String)
+     * @see org.apache.click.Control#setListener(Object, String)
      *
      * @param listener the listener object with the named method to invoke
      * @param method the name of the method to invoke
@@ -674,14 +674,14 @@
      * Deploy the <tt>menu.css</tt> and <tt>menu.js</tt> files to the
      * <tt>click</tt> web directory when the application is initialized.
      *
-     * @see net.sf.click.Control#onDeploy(ServletContext)
+     * @see org.apache.click.Control#onDeploy(ServletContext)
      *
      * @param servletContext the servlet context
      */
     public void onDeploy(ServletContext servletContext) {
         String[] files = new String[] {
-                "/net/sf/click/extras/control/menu.css",
-                "/net/sf/click/extras/control/extras-control.js"
+                "/org/apache/click/extras/control/menu.css",
+                "/org/apache/click/extras/control/extras-control.js"
             };
 
         ClickUtils.deployFiles(servletContext, files, "click");
@@ -690,7 +690,7 @@
     /**
      * This sets the parent to be null.
      *
-     * @see net.sf.click.Control#onDestroy()
+     * @see org.apache.click.Control#onDestroy()
      */
     public void onDestroy() {
         setParent(null);

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/Menu.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/NumberField.java (from r731262, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/NumberField.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/NumberField.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/NumberField.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/NumberField.java&r1=731262&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/NumberField.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/NumberField.java Mon Jan  5 04:57:19 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 import java.text.DecimalFormat;
 import java.text.MessageFormat;
@@ -26,8 +26,8 @@
 
 import javax.servlet.ServletContext;
 
-import net.sf.click.control.TextField;
-import net.sf.click.util.ClickUtils;
+import org.apache.click.control.TextField;
+import org.apache.click.util.ClickUtils;
 
 /**
  * Provides a Number Field control: &nbsp; &lt;input type='text'&gt;.
@@ -47,7 +47,7 @@
  * <p/>
  * When NumberField is validated and the input string can be parsed by the
  * NumberFormat then the string value of this field
- * (@link net.sf.click.control.Field#getValue()} is set to the formatted value
+ * (@link org.apache.click.control.Field#getValue()} is set to the formatted value
  * of the input.
  * <p/>
  * For example if you define an integer pattern of <tt>"#,##0"</tt> and the
@@ -400,7 +400,7 @@
      * Return the HTML head import statements for the JavaScript
      * (<tt>click/extras-control.js</tt>) file.
      *
-     * @see net.sf.click.Control#getHtmlImports()
+     * @see org.apache.click.Control#getHtmlImports()
      *
      * @return the HTML head import statements for the JavaScript file
      */
@@ -438,20 +438,20 @@
      * Deploy the <tt>extras-control.js</tt> file to the <tt>click</tt> web
      * directory when the application is initialized.
      *
-     * @see net.sf.click.Control#onDeploy(ServletContext)
+     * @see org.apache.click.Control#onDeploy(ServletContext)
      *
      * @param servletContext the servlet context
      */
     public void onDeploy(ServletContext servletContext) {
         ClickUtils.deployFile(servletContext,
-                              "/net/sf/click/extras/control/extras-control.js",
+                              "/org/apache/click/extras/control/extras-control.js",
                               "click");
     }
 
     /**
      * Validates the NumberField request submission. If the value entered
      * by the user can be parsed by the NumberFormat the string value
-     * of this Field ({@link net.sf.click.control.Field#getValue()}) is
+     * of this Field ({@link org.apache.click.control.Field#getValue()}) is
      * set to the formatted value of the user input.
      * <p/>
      * A field error message is displayed if a validation error occurs.
@@ -508,7 +508,7 @@
     // ------------------------------------------------------ Protected Methods
 
     /**
-     * @see net.sf.click.control.Field#getRequestValue()
+     * @see org.apache.click.control.Field#getRequestValue()
      *
      * @return the field's value from the request
      */

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/NumberField.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/NumberField.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/NumberField.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PageButton.java (from r729543, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/PageButton.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PageButton.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PageButton.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/PageButton.java&r1=729543&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/PageButton.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PageButton.java Mon Jan  5 04:57:19 2009
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
-import net.sf.click.control.PageLink;
-import net.sf.click.util.HtmlStringBuffer;
+import org.apache.click.control.PageLink;
+import org.apache.click.util.HtmlStringBuffer;
 
 /**
  * Provides a Page link Button control: &nbsp; &lt;input type='button'&gt;.
@@ -37,7 +37,7 @@
  *
  * <h4>PageButton Advantages</h4>
  * <ul>
- *      <li>Over {@link net.sf.click.control.Button Button} + direct javascript trick:
+ *      <li>Over {@link org.apache.click.control.Button Button} + direct javascript trick:
  *          <ul>
  *               <li>encoding of parameters works correctly due to the {@link PageLink} it extends.</li>
  *          </ul>
@@ -49,17 +49,17 @@
  *                  to simulate buttons with <code>Link</code> elements.</li>
  *          </ul>
  *      </li>
- *      <li>Over {@link net.sf.click.control.ActionButton ActionButton} + forward/redirect trick:
+ *      <li>Over {@link org.apache.click.control.ActionButton ActionButton} + forward/redirect trick:
  *          <ul>
  *               <li>there's no roundtrip to the server.</li>
- *               <li><code>net.sf.click.Page#redirect(Class) does not support parameters</code> and
- *               <code>net.sf.click.Page#redirect(String)</code> is prone to errors when hardcoding
+ *               <li><code>org.apache.click.Page#redirect(Class) does not support parameters</code> and
+ *               <code>org.apache.click.Page#redirect(String)</code> is prone to errors when hardcoding
  *               them in the <code>String</code>.</li>
  *          </ul>
  *      </li>
  * </ul>
  * <p/>
- * <b>Note:</b> this control is related to {@link PageLink} and not to {@link net.sf.click.extras.control.PageSubmit}.
+ * <b>Note:</b> this control is related to {@link PageLink} and not to {@link org.apache.click.extras.control.PageSubmit}.
  *
  * @author Ahmed Mohombe
  */
@@ -126,7 +126,7 @@
     /**
      * Return the links html tag: <tt>input</tt>.
      *
-     * @see net.sf.click.control.AbstractControl#getTag()
+     * @see org.apache.click.control.AbstractControl#getTag()
      *
      * @return this controls html tag
      */

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PageButton.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PageButton.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PageSubmit.java (from r731262, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/PageSubmit.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PageSubmit.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PageSubmit.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/PageSubmit.java&r1=731262&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/PageSubmit.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PageSubmit.java Mon Jan  5 04:57:19 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
-import net.sf.click.Page;
-import net.sf.click.control.Submit;
-import net.sf.click.util.ClickUtils;
+import org.apache.click.Page;
+import org.apache.click.control.Submit;
+import org.apache.click.util.ClickUtils;
 
 /**
  * Provides a Page redirect Submit control: &nbsp; &lt;input type='submit'&gt;.

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PageSubmit.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PickList.htm
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PickList.java (from r729543, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/PickList.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PickList.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PickList.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/PickList.java&r1=729543&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/PickList.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PickList.java Mon Jan  5 04:57:19 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -28,12 +28,12 @@
 
 import javax.servlet.ServletContext;
 
-import net.sf.click.control.Field;
-import net.sf.click.control.Option;
-import net.sf.click.util.ClickUtils;
-import net.sf.click.util.Format;
-import net.sf.click.util.HtmlStringBuffer;
-import net.sf.click.util.PropertyUtils;
+import org.apache.click.control.Field;
+import org.apache.click.control.Option;
+import org.apache.click.util.ClickUtils;
+import org.apache.click.util.Format;
+import org.apache.click.util.HtmlStringBuffer;
+import org.apache.click.util.PropertyUtils;
 
 /**
  * Provides a twin multiple Select box control to select items.
@@ -272,7 +272,7 @@
      * For example given the Collection of CustomerType <tt>objects</tt>,
      * <tt>value</tt> "id" and <tt>label</tt> "name", the <tt>id</tt> and
      * <tt>name</tt> properties of each CustomerType will be retrieved. For each
-     * CustomerType in the Collection a new {@link net.sf.click.control.Option}
+     * CustomerType in the Collection a new {@link org.apache.click.control.Option}
      * instance is created and its <tt>value</tt> and <tt>label</tt> is set to
      * the <tt>value</tt> and <tt>label</tt> retrieved from the CustomerType
      * instance.
@@ -371,7 +371,7 @@
      * Return the HTML head import statements for the JavaScript
      * (<tt>click/extras-control.js</tt>) file.
      *
-     * @see net.sf.click.Control#getHtmlImports()
+     * @see org.apache.click.Control#getHtmlImports()
      *
      * @return the HTML head import statements for the JavaScript file
      */
@@ -526,13 +526,13 @@
      * Deploy the <tt>extras-control.js</tt> file to the <tt>click</tt> web
      * directory when the application is initialized.
      *
-     * @see net.sf.click.Control#onDeploy(ServletContext)
+     * @see org.apache.click.Control#onDeploy(ServletContext)
      *
      * @param servletContext the servlet context
      */
     public void onDeploy(ServletContext servletContext) {
         ClickUtils.deployFile(servletContext,
-                              "/net/sf/click/extras/control/extras-control.js",
+                              "/org/apache/click/extras/control/extras-control.js",
                               "click");
     }
 
@@ -541,7 +541,7 @@
      * <p/>
      * A field error message is displayed if a validation error occurs.
      * These messages are defined in the resource bundle: <blockquote>
-     * <pre>net.sf.click.control.MessageProperties</pre></blockquote>
+     * <pre>org.apache.click.control.MessageProperties</pre></blockquote>
      * <p/>
      * Error message bundle key names include: <blockquote><ul>
      * <li>field-required-error</li>

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/PickList.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField.java (from r731262, incubator/click/trunk/click/extras/src/net/sf/click/extras/control/RegexField.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField.java?p2=incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField.java&p1=incubator/click/trunk/click/extras/src/net/sf/click/extras/control/RegexField.java&r1=731262&r2=731546&rev=731546&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/RegexField.java (original)
+++ incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField.java Mon Jan  5 04:57:19 2009
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package net.sf.click.extras.control;
+package org.apache.click.extras.control;
 
 import java.text.MessageFormat;
 import java.util.regex.Pattern;
 
 import javax.servlet.ServletContext;
 
-import net.sf.click.control.TextField;
-import net.sf.click.util.ClickUtils;
+import org.apache.click.control.TextField;
+import org.apache.click.util.ClickUtils;
 
 /**
  * Provides a Regex Field control: &nbsp; &lt;input type='text'&gt;.
@@ -212,7 +212,7 @@
      * Return the HTML head import statements for the JavaScript
      * (<tt>click/extras-control.js</tt>) file.
      *
-     * @see net.sf.click.Control#getHtmlImports()
+     * @see org.apache.click.Control#getHtmlImports()
      *
      * @return the HTML head import statements for the JavaScript file
      */
@@ -262,7 +262,7 @@
      *       <li>field-required-error</li>
      *     </ul>
      *   </li>
-     *   <li>/net/sf/click/extras/control/RegexField.properties
+     *   <li>/org/apache/click/extras/control/RegexField.properties
      *     <ul>
      *       <li>field-pattern-error</li>
      *     </ul>
@@ -290,13 +290,13 @@
      * Deploy the <tt>extras-control.js</tt> file to the <tt>click</tt> web
      * directory when the application is initialized.
      *
-     * @see net.sf.click.Control#onDeploy(ServletContext)
+     * @see org.apache.click.Control#onDeploy(ServletContext)
      *
      * @param servletContext the servlet context
      */
     public void onDeploy(ServletContext servletContext) {
         ClickUtils.deployFile(servletContext,
-                              "/net/sf/click/extras/control/extras-control.js",
+                              "/org/apache/click/extras/control/extras-control.js",
                               "click");
     }
 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_cs.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_cs.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_de.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_en.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_en.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_fr.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_it_IT.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_it_IT.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_it_IT.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_ja.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_nl.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_pt_BR.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_ro.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_tr.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/RegexField_zh_CN.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/TabbedForm.htm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/click/trunk/click/extras/src/org/apache/click/extras/control/TabbedForm.htm
------------------------------------------------------------------------------
    svn:mergeinfo =