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 14:04:45 UTC
svn commit: r731548 - in /incubator/click/trunk/click/mock: src/org/
src/org/apache/ src/org/apache/click/ src/org/apache/click/servlet/
test/org/ test/org/apache/ test/org/apache/click/
test/org/apache/click/pages/ test/org/apache/click/servlet/ test/...
Author: sabob
Date: Mon Jan 5 05:04:44 2009
New Revision: 731548
URL: http://svn.apache.org/viewvc?rev=731548&view=rev
Log:
migrated mock to Apache namespace
Added:
incubator/click/trunk/click/mock/src/org/
incubator/click/trunk/click/mock/src/org/apache/
incubator/click/trunk/click/mock/src/org/apache/click/
incubator/click/trunk/click/mock/src/org/apache/click/MockContainer.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/src/net/sf/click/MockContainer.java
incubator/click/trunk/click/mock/src/org/apache/click/MockContext.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/src/net/sf/click/MockContext.java
incubator/click/trunk/click/mock/src/org/apache/click/package.html (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/src/net/sf/click/package.html
incubator/click/trunk/click/mock/src/org/apache/click/servlet/
incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockRequest.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockRequest.java
incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockRequestDispatcher.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockRequestDispatcher.java
incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockResponse.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockResponse.java
incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockServletConfig.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockServletConfig.java
incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockServletContext.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockServletContext.java
incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockSession.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockSession.java
incubator/click/trunk/click/mock/src/org/apache/click/servlet/package.html (props changed)
- copied unchanged from r729543, incubator/click/trunk/click/mock/src/net/sf/click/servlet/package.html
incubator/click/trunk/click/mock/test/org/
incubator/click/trunk/click/mock/test/org/apache/
incubator/click/trunk/click/mock/test/org/apache/click/
incubator/click/trunk/click/mock/test/org/apache/click/MockContainerTest.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/test/net/sf/click/MockContainerTest.java
incubator/click/trunk/click/mock/test/org/apache/click/MockContextTest.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/test/net/sf/click/MockContextTest.java
incubator/click/trunk/click/mock/test/org/apache/click/MockRequestTest.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/test/net/sf/click/MockRequestTest.java
incubator/click/trunk/click/mock/test/org/apache/click/pages/
incubator/click/trunk/click/mock/test/org/apache/click/pages/BorderPage.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/test/net/sf/click/pages/BorderPage.java
incubator/click/trunk/click/mock/test/org/apache/click/pages/BorderTestPage.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/test/net/sf/click/pages/BorderTestPage.java
incubator/click/trunk/click/mock/test/org/apache/click/pages/FormPage.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/test/net/sf/click/pages/FormPage.java
incubator/click/trunk/click/mock/test/org/apache/click/pages/ForwardPage.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/test/net/sf/click/pages/ForwardPage.java
incubator/click/trunk/click/mock/test/org/apache/click/pages/RedirectPage.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/test/net/sf/click/pages/RedirectPage.java
incubator/click/trunk/click/mock/test/org/apache/click/pages/TestPage.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/test/net/sf/click/pages/TestPage.java
incubator/click/trunk/click/mock/test/org/apache/click/servlet/
incubator/click/trunk/click/mock/test/org/apache/click/servlet/MockTests.java (contents, props changed)
- copied, changed from r729543, incubator/click/trunk/click/mock/test/net/sf/click/servlet/MockTests.java
Modified:
incubator/click/trunk/click/mock/test/web/WEB-INF/click.xml
Copied: incubator/click/trunk/click/mock/src/org/apache/click/MockContainer.java (from r729543, incubator/click/trunk/click/mock/src/net/sf/click/MockContainer.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/src/org/apache/click/MockContainer.java?p2=incubator/click/trunk/click/mock/src/org/apache/click/MockContainer.java&p1=incubator/click/trunk/click/mock/src/net/sf/click/MockContainer.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/src/net/sf/click/MockContainer.java (original)
+++ incubator/click/trunk/click/mock/src/org/apache/click/MockContainer.java Mon Jan 5 05:04:44 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click;
+package org.apache.click;
-import net.sf.click.servlet.MockServletContext;
-import net.sf.click.servlet.MockServletConfig;
-import net.sf.click.servlet.MockResponse;
-import net.sf.click.servlet.MockRequest;
+import org.apache.click.servlet.MockServletContext;
+import org.apache.click.servlet.MockServletConfig;
+import org.apache.click.servlet.MockResponse;
+import org.apache.click.servlet.MockRequest;
import java.io.File;
import java.io.PrintStream;
import java.io.PrintWriter;
@@ -31,7 +31,7 @@
import java.util.Map.Entry;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
-import net.sf.click.servlet.MockSession;
+import org.apache.click.servlet.MockSession;
import org.apache.commons.lang.StringUtils;
/**
@@ -154,7 +154,7 @@
// -------------------------------------------------------- Public getters/setters
/**
- * Return the container {@link net.sf.click.servlet.MockRequest}.
+ * Return the container {@link org.apache.click.servlet.MockRequest}.
*
* @return the container MockRequest
*/
@@ -163,7 +163,7 @@
}
/**
- * Set the container {@link net.sf.click.servlet.MockRequest}.
+ * Set the container {@link org.apache.click.servlet.MockRequest}.
*
* @param request the container MockRequest
*/
@@ -172,7 +172,7 @@
}
/**
- * Return the container {@link net.sf.click.servlet.MockResponse}.
+ * Return the container {@link org.apache.click.servlet.MockResponse}.
*
* @return the container MockResponse
*/
@@ -181,7 +181,7 @@
}
/**
- * Set the container {@link net.sf.click.servlet.MockResponse}.
+ * Set the container {@link org.apache.click.servlet.MockResponse}.
*
* @param response the container MockResponse
*/
@@ -190,7 +190,7 @@
}
/**
- * Return the container {@link net.sf.click.ClickServlet}.
+ * Return the container {@link org.apache.click.ClickServlet}.
*
* @return the container ClickServlet
*/
@@ -199,7 +199,7 @@
}
/**
- * Set the container {@link net.sf.click.ClickServlet}.
+ * Set the container {@link org.apache.click.ClickServlet}.
*
* @param clickServlet the container ClickServlet
*/
@@ -208,7 +208,7 @@
}
/**
- * Return the container {@link net.sf.click.servlet.MockServletConfig}.
+ * Return the container {@link org.apache.click.servlet.MockServletConfig}.
*
* @return the container MockServletConfig
*/
@@ -217,7 +217,7 @@
}
/**
- * Set the container {@link net.sf.click.servlet.MockServletConfig}.
+ * Set the container {@link org.apache.click.servlet.MockServletConfig}.
*
* @param servletConfig the container MockServletConfig
*/
@@ -226,7 +226,7 @@
}
/**
- * Return the container {@link net.sf.click.servlet.MockServletContext}.
+ * Return the container {@link org.apache.click.servlet.MockServletContext}.
*
* @return the container MockServletContext
*/
@@ -235,7 +235,7 @@
}
/**
- * Set the container {@link net.sf.click.servlet.MockServletContext}.
+ * Set the container {@link org.apache.click.servlet.MockServletContext}.
*
* @param servletContext the container MockServletContext
*/
@@ -244,7 +244,7 @@
}
/**
- * Return the container {@link net.sf.click.servlet.MockSession}.
+ * Return the container {@link org.apache.click.servlet.MockSession}.
*
* @return the container MockSession
*/
@@ -253,7 +253,7 @@
}
/**
- * Set the container {@link net.sf.click.servlet.MockSession}.
+ * Set the container {@link org.apache.click.servlet.MockSession}.
*
* @param session the container MockSession
*/
@@ -265,22 +265,22 @@
/**
* Starts the container and configure it for testing
- * {@link net.sf.click.Page} instances.
+ * {@link org.apache.click.Page} instances.
* <p/>
* During configuration a full mock servlet stack is created consisting of:
* <ul>
- * <li>{@link net.sf.click.ClickServlet}</li>
- * <li>{@link net.sf.click.servlet.MockRequest}</li>
- * <li>{@link net.sf.click.servlet.MockResponse}</li>
- * <li>{@link net.sf.click.servlet.MockServletContext}</li>
- * <li>{@link net.sf.click.servlet.MockServletConfig}</li>
- * <li>{@link net.sf.click.servlet.MockSession}</li>
- * <li>{@link net.sf.click.MockContext}</li>
+ * <li>{@link org.apache.click.ClickServlet}</li>
+ * <li>{@link org.apache.click.servlet.MockRequest}</li>
+ * <li>{@link org.apache.click.servlet.MockResponse}</li>
+ * <li>{@link org.apache.click.servlet.MockServletContext}</li>
+ * <li>{@link org.apache.click.servlet.MockServletConfig}</li>
+ * <li>{@link org.apache.click.servlet.MockSession}</li>
+ * <li>{@link org.apache.click.MockContext}</li>
* </ul>
* <p/>
* You can provide your own Mock implementations and set them on the
* container using the appropriate <tt>setter</tt> method for example:
- * {@link #setRequest(net.sf.click.servlet.MockRequest)}.
+ * {@link #setRequest(org.apache.click.servlet.MockRequest)}.
* <p/>
* <b>Please note</b> that you must set the mock objects on the container
* <tt>before</tt> calling <tt>start()</tt>.
@@ -326,7 +326,7 @@
}
/**
- * Convenience method for setting the {@link net.sf.click.servlet.MockRequest}
+ * Convenience method for setting the {@link org.apache.click.servlet.MockRequest}
* attribute.
* <p/>
* <b>Note</b> this method returns <tt>this</tt> so you can easily chain
@@ -350,7 +350,7 @@
}
/**
- * Convenience method for setting the {@link net.sf.click.servlet.MockRequest}
+ * Convenience method for setting the {@link org.apache.click.servlet.MockRequest}
* parameter.
* <p/>
* <b>Note</b> this method returns <tt>this</tt> so you can easily chain
@@ -375,7 +375,7 @@
}
/**
- * Convenience method for setting multi-valued {@link net.sf.click.servlet.MockRequest}
+ * Convenience method for setting multi-valued {@link org.apache.click.servlet.MockRequest}
* parameters.
* <p/>
* <b>Note</b> this method returns <tt>this</tt> so you can easily chain
@@ -455,7 +455,7 @@
* This method simulates a browser requesting (GET) or submitting (POST)
* the url associated with the specified pageClass and request parameters.
* <p/>
- * The container forwards the request to {@link net.sf.click.ClickServlet}
+ * The container forwards the request to {@link org.apache.click.ClickServlet}
* for processing and returns the Page instance that was created.
*
* @param pageClass specifies the class of the Page to test
@@ -537,8 +537,8 @@
* {@link javax.servlet.HttpResponse}.
* <p/>
* <b>Please note:</b> if the <tt>Page</tt> invokes
- * {@link net.sf.click.Page#setForward(Class)} or
- * {@link net.sf.click.Page#setRedirect(Class)}, this method will
+ * {@link org.apache.click.Page#setForward(Class)} or
+ * {@link org.apache.click.Page#setRedirect(Class)}, this method will
* return blank.
* </p/>
* The reason for this is that <tt>forward</tt> and <tt>redirect</tt> calls
@@ -547,7 +547,7 @@
* The forward and redirect path's are only used for assertion purposes.
* <p/>
* JSP templates is not supported by this method because a JSP template
- * is always accessed through a {@link net.sf.click.Page#setForward(Class)}
+ * is always accessed through a {@link org.apache.click.Page#setForward(Class)}
* call.
*
* @return the rendered html document
@@ -578,7 +578,7 @@
}
/**
- * Return the path that {@link net.sf.click.Page} forwarded to.
+ * Return the path that {@link org.apache.click.Page} forwarded to.
*
* @return the path that Page forwarded to
*/
@@ -587,7 +587,7 @@
}
/**
- * Return the Class that {@link net.sf.click.Page} forwarded to.
+ * Return the Class that {@link org.apache.click.Page} forwarded to.
*
* @return the class that Page forwarded to
*/
@@ -603,7 +603,7 @@
}
/**
- * Return the path that {@link net.sf.click.Page} redirected to.
+ * Return the path that {@link org.apache.click.Page} redirected to.
*
* @return the path that Page redirected to
*/
@@ -612,7 +612,7 @@
}
/**
- * Return the Class that {@link net.sf.click.Page} redirected to.
+ * Return the Class that {@link org.apache.click.Page} redirected to.
*
* @return the Class that Page redirected to
*/
@@ -652,7 +652,7 @@
// -------------------------------------------------------- Package private methods
/**
- * Removes any {@link net.sf.click.Context} instances from the ThradLocal
+ * Removes any {@link org.apache.click.Context} instances from the ThradLocal
* ContextStack.
*
* @see #start()
Propchange: incubator/click/trunk/click/mock/src/org/apache/click/MockContainer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/src/org/apache/click/MockContext.java (from r729543, incubator/click/trunk/click/mock/src/net/sf/click/MockContext.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/src/org/apache/click/MockContext.java?p2=incubator/click/trunk/click/mock/src/org/apache/click/MockContext.java&p1=incubator/click/trunk/click/mock/src/net/sf/click/MockContext.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/src/net/sf/click/MockContext.java (original)
+++ incubator/click/trunk/click/mock/src/org/apache/click/MockContext.java Mon Jan 5 05:04:44 2009
@@ -16,23 +16,23 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click;
+package org.apache.click;
-import net.sf.click.servlet.MockServletConfig;
-import net.sf.click.servlet.MockResponse;
-import net.sf.click.servlet.MockRequest;
+import org.apache.click.servlet.MockServletConfig;
+import org.apache.click.servlet.MockResponse;
+import org.apache.click.servlet.MockRequest;
import java.util.Locale;
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.click.service.ConsoleLogService;
-import net.sf.click.servlet.MockServletContext;
-import net.sf.click.servlet.MockSession;
-import net.sf.click.util.ClickUtils;
+import org.apache.click.service.ConsoleLogService;
+import org.apache.click.servlet.MockServletContext;
+import org.apache.click.servlet.MockSession;
+import org.apache.click.util.ClickUtils;
/**
- * Provides a mock {@link net.sf.click.Context} object for unit testing.
+ * Provides a mock {@link org.apache.click.Context} object for unit testing.
* <p/>
* <b>Note:</b> if you want to test your Click Page instances use
* {@link MockContainer} instead.
@@ -112,7 +112,7 @@
// --------------------------------------------------------- Public getters and setters
/**
- * Return the mock {@link net.sf.click.ClickServlet} instance for this
+ * Return the mock {@link org.apache.click.ClickServlet} instance for this
* context.
*
* @return the clickServlet instance
@@ -122,7 +122,7 @@
}
/**
- * Return the {@link net.sf.click.servlet.MockRequest} instance for this
+ * Return the {@link org.apache.click.servlet.MockRequest} instance for this
* context.
*
* @return the MockRequest instance
Propchange: incubator/click/trunk/click/mock/src/org/apache/click/MockContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/click/trunk/click/mock/src/org/apache/click/MockContext.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/src/org/apache/click/package.html (from r729543, incubator/click/trunk/click/mock/src/net/sf/click/package.html)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/src/org/apache/click/package.html?p2=incubator/click/trunk/click/mock/src/org/apache/click/package.html&p1=incubator/click/trunk/click/mock/src/net/sf/click/package.html&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/src/net/sf/click/package.html (original)
+++ incubator/click/trunk/click/mock/src/org/apache/click/package.html Mon Jan 5 05:04:44 2009
@@ -21,13 +21,13 @@
Provides a mock package for Click, enabling unit testing of Pages and Controls.
<p/>
This package defines the main mock classes but developers only have to be concerned
-with two classes namely {@link net.sf.click.MockContainer} and
-{@link net.sf.click.MockContext}.
+with two classes namely {@link org.apache.click.MockContainer} and
+{@link org.apache.click.MockContext}.
<p/>
-The main class developers will use is {@link net.sf.click.MockContainer} which
+The main class developers will use is {@link org.apache.click.MockContainer} which
provides mocking mocking of application pages and controls.
<p/>
-The class {@link net.sf.click.MockContext} provides mocking of
-{@link net.sf.click.Control}s and is easier to setup and use than
-{@link net.sf.click.MockContainer}.
+The class {@link org.apache.click.MockContext} provides mocking of
+{@link org.apache.click.Control}s and is easier to setup and use than
+{@link org.apache.click.MockContainer}.
</body>
\ No newline at end of file
Propchange: incubator/click/trunk/click/mock/src/org/apache/click/package.html
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockRequest.java (from r729543, incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockRequest.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockRequest.java?p2=incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockRequest.java&p1=incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockRequest.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockRequest.java (original)
+++ incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockRequest.java Mon Jan 5 05:04:44 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click.servlet;
+package org.apache.click.servlet;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -47,7 +47,7 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import net.sf.click.util.ClickUtils;
+import org.apache.click.util.ClickUtils;
import org.apache.commons.fileupload.FileUploadBase;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
@@ -1168,7 +1168,7 @@
/**
* Returns the url that was forwarded to, otherwise return null.
*
- * @see net.sf.click.servlet.MockRequestDispatcher#forward(javax.servlet.ServletRequest,
+ * @see org.apache.click.servlet.MockRequestDispatcher#forward(javax.servlet.ServletRequest,
* javax.servlet.ServletResponse)
*
* @return url that was forwarded to
@@ -1180,7 +1180,7 @@
/**
* Returns the list of server side included url's.
*
- * @see net.sf.click.servlet.MockRequestDispatcher#include(javax.servlet.ServletRequest,
+ * @see org.apache.click.servlet.MockRequestDispatcher#include(javax.servlet.ServletRequest,
* javax.servlet.ServletResponse)
*
* @return list of urls that were included
Propchange: incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockRequest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockRequestDispatcher.java (from r729543, incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockRequestDispatcher.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockRequestDispatcher.java?p2=incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockRequestDispatcher.java&p1=incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockRequestDispatcher.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockRequestDispatcher.java (original)
+++ incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockRequestDispatcher.java Mon Jan 5 05:04:44 2009
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click.servlet;
+package org.apache.click.servlet;
import java.io.IOException;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import net.sf.click.MockContainer;
+import org.apache.click.MockContainer;
/**
* Mock implementation of {@link javax.servlet.RequestDispatcher}.
Propchange: incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockRequestDispatcher.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockResponse.java (from r729543, incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockResponse.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockResponse.java?p2=incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockResponse.java&p1=incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockResponse.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockResponse.java (original)
+++ incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockResponse.java Mon Jan 5 05:04:44 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click.servlet;
+package org.apache.click.servlet;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Propchange: incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockResponse.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockServletConfig.java (from r729543, incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockServletConfig.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockServletConfig.java?p2=incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockServletConfig.java&p1=incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockServletConfig.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockServletConfig.java (original)
+++ incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockServletConfig.java Mon Jan 5 05:04:44 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click.servlet;
+package org.apache.click.servlet;
import java.util.Collections;
import java.util.Enumeration;
Propchange: incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockServletConfig.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockServletContext.java (from r729543, incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockServletContext.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockServletContext.java?p2=incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockServletContext.java&p1=incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockServletContext.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockServletContext.java (original)
+++ incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockServletContext.java Mon Jan 5 05:04:44 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click.servlet;
+package org.apache.click.servlet;
import java.io.File;
import java.io.FileInputStream;
@@ -37,8 +37,8 @@
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import net.sf.click.util.ClickUtils;
-import net.sf.click.util.HtmlStringBuffer;
+import org.apache.click.util.ClickUtils;
+import org.apache.click.util.HtmlStringBuffer;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
@@ -469,7 +469,7 @@
* Get the mime type for the given file. Uses a hardcoded map of mime
* types set at initialization time. If the mime type was not explicitly
* set, this method will fallback to
- * {@link net.sf.click.util.ClickUtils#getMimeType(String)}.
+ * {@link org.apache.click.util.ClickUtils#getMimeType(String)}.
*
* @param name The name to get the mime type for
*
Propchange: incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockServletContext.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockSession.java (from r729543, incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockSession.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockSession.java?p2=incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockSession.java&p1=incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockSession.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/src/net/sf/click/servlet/MockSession.java (original)
+++ incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockSession.java Mon Jan 5 05:04:44 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click.servlet;
+package org.apache.click.servlet;
import java.util.Collections;
import java.util.Enumeration;
@@ -26,7 +26,7 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionContext;
-import net.sf.click.util.HtmlStringBuffer;
+import org.apache.click.util.HtmlStringBuffer;
import org.apache.commons.lang.StringUtils;
/**
Propchange: incubator/click/trunk/click/mock/src/org/apache/click/servlet/MockSession.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/click/trunk/click/mock/src/org/apache/click/servlet/package.html
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/test/org/apache/click/MockContainerTest.java (from r729543, incubator/click/trunk/click/mock/test/net/sf/click/MockContainerTest.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/test/org/apache/click/MockContainerTest.java?p2=incubator/click/trunk/click/mock/test/org/apache/click/MockContainerTest.java&p1=incubator/click/trunk/click/mock/test/net/sf/click/MockContainerTest.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/test/net/sf/click/MockContainerTest.java (original)
+++ incubator/click/trunk/click/mock/test/org/apache/click/MockContainerTest.java Mon Jan 5 05:04:44 2009
@@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click;
+package org.apache.click;
import java.io.File;
import java.net.URI;
import java.net.URL;
import junit.framework.Assert;
import junit.framework.TestCase;
-import net.sf.click.control.Form;
-import net.sf.click.pages.BorderTestPage;
-import net.sf.click.pages.FormPage;
-import net.sf.click.pages.ForwardPage;
-import net.sf.click.pages.RedirectPage;
-import net.sf.click.pages.TestPage;
+import org.apache.click.control.Form;
+import org.apache.click.pages.BorderTestPage;
+import org.apache.click.pages.FormPage;
+import org.apache.click.pages.ForwardPage;
+import org.apache.click.pages.RedirectPage;
+import org.apache.click.pages.TestPage;
/**
* Sanity tests for MockContainer.
Propchange: incubator/click/trunk/click/mock/test/org/apache/click/MockContainerTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/test/org/apache/click/MockContextTest.java (from r729543, incubator/click/trunk/click/mock/test/net/sf/click/MockContextTest.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/test/org/apache/click/MockContextTest.java?p2=incubator/click/trunk/click/mock/test/org/apache/click/MockContextTest.java&p1=incubator/click/trunk/click/mock/test/net/sf/click/MockContextTest.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/test/net/sf/click/MockContextTest.java (original)
+++ incubator/click/trunk/click/mock/test/org/apache/click/MockContextTest.java Mon Jan 5 05:04:44 2009
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click;
+package org.apache.click;
import junit.framework.TestCase;
-import net.sf.click.servlet.MockServletConfig;
-import net.sf.click.servlet.MockServletContext;
-import net.sf.click.servlet.MockRequest;
-import net.sf.click.servlet.MockResponse;
+import org.apache.click.servlet.MockServletConfig;
+import org.apache.click.servlet.MockServletContext;
+import org.apache.click.servlet.MockRequest;
+import org.apache.click.servlet.MockResponse;
/**
* MockContext tests.
Propchange: incubator/click/trunk/click/mock/test/org/apache/click/MockContextTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/test/org/apache/click/MockRequestTest.java (from r729543, incubator/click/trunk/click/mock/test/net/sf/click/MockRequestTest.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/test/org/apache/click/MockRequestTest.java?p2=incubator/click/trunk/click/mock/test/org/apache/click/MockRequestTest.java&p1=incubator/click/trunk/click/mock/test/net/sf/click/MockRequestTest.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/test/net/sf/click/MockRequestTest.java (original)
+++ incubator/click/trunk/click/mock/test/org/apache/click/MockRequestTest.java Mon Jan 5 05:04:44 2009
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click;
+package org.apache.click;
import junit.framework.TestCase;
-import net.sf.click.servlet.MockRequest;
-import net.sf.click.control.TextArea;
+import org.apache.click.servlet.MockRequest;
+import org.apache.click.control.TextArea;
/**
* Sanity tests for MockRequest.
Propchange: incubator/click/trunk/click/mock/test/org/apache/click/MockRequestTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/test/org/apache/click/pages/BorderPage.java (from r729543, incubator/click/trunk/click/mock/test/net/sf/click/pages/BorderPage.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/test/org/apache/click/pages/BorderPage.java?p2=incubator/click/trunk/click/mock/test/org/apache/click/pages/BorderPage.java&p1=incubator/click/trunk/click/mock/test/net/sf/click/pages/BorderPage.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/test/net/sf/click/pages/BorderPage.java (original)
+++ incubator/click/trunk/click/mock/test/org/apache/click/pages/BorderPage.java Mon Jan 5 05:04:44 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click.pages;
+package org.apache.click.pages;
-import net.sf.click.Page;
+import org.apache.click.Page;
/**
* A border page for mock testing.
Propchange: incubator/click/trunk/click/mock/test/org/apache/click/pages/BorderPage.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/test/org/apache/click/pages/BorderTestPage.java (from r729543, incubator/click/trunk/click/mock/test/net/sf/click/pages/BorderTestPage.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/test/org/apache/click/pages/BorderTestPage.java?p2=incubator/click/trunk/click/mock/test/org/apache/click/pages/BorderTestPage.java&p1=incubator/click/trunk/click/mock/test/net/sf/click/pages/BorderTestPage.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/test/net/sf/click/pages/BorderTestPage.java (original)
+++ incubator/click/trunk/click/mock/test/org/apache/click/pages/BorderTestPage.java Mon Jan 5 05:04:44 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click.pages;
+package org.apache.click.pages;
/**
* Basic test page.
Propchange: incubator/click/trunk/click/mock/test/org/apache/click/pages/BorderTestPage.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/test/org/apache/click/pages/FormPage.java (from r729543, incubator/click/trunk/click/mock/test/net/sf/click/pages/FormPage.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/test/org/apache/click/pages/FormPage.java?p2=incubator/click/trunk/click/mock/test/org/apache/click/pages/FormPage.java&p1=incubator/click/trunk/click/mock/test/net/sf/click/pages/FormPage.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/test/net/sf/click/pages/FormPage.java (original)
+++ incubator/click/trunk/click/mock/test/org/apache/click/pages/FormPage.java Mon Jan 5 05:04:44 2009
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click.pages;
+package org.apache.click.pages;
-import net.sf.click.Page;
-import net.sf.click.control.Form;
-import net.sf.click.control.TextField;
+import org.apache.click.Page;
+import org.apache.click.control.Form;
+import org.apache.click.control.TextField;
/**
* Form test page.
Propchange: incubator/click/trunk/click/mock/test/org/apache/click/pages/FormPage.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/test/org/apache/click/pages/ForwardPage.java (from r729543, incubator/click/trunk/click/mock/test/net/sf/click/pages/ForwardPage.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/test/org/apache/click/pages/ForwardPage.java?p2=incubator/click/trunk/click/mock/test/org/apache/click/pages/ForwardPage.java&p1=incubator/click/trunk/click/mock/test/net/sf/click/pages/ForwardPage.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/test/net/sf/click/pages/ForwardPage.java (original)
+++ incubator/click/trunk/click/mock/test/org/apache/click/pages/ForwardPage.java Mon Jan 5 05:04:44 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click.pages;
+package org.apache.click.pages;
-import net.sf.click.*;
+import org.apache.click.*;
/**
* Forward test page.
Propchange: incubator/click/trunk/click/mock/test/org/apache/click/pages/ForwardPage.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/test/org/apache/click/pages/RedirectPage.java (from r729543, incubator/click/trunk/click/mock/test/net/sf/click/pages/RedirectPage.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/test/org/apache/click/pages/RedirectPage.java?p2=incubator/click/trunk/click/mock/test/org/apache/click/pages/RedirectPage.java&p1=incubator/click/trunk/click/mock/test/net/sf/click/pages/RedirectPage.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/test/net/sf/click/pages/RedirectPage.java (original)
+++ incubator/click/trunk/click/mock/test/org/apache/click/pages/RedirectPage.java Mon Jan 5 05:04:44 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click.pages;
+package org.apache.click.pages;
-import net.sf.click.*;
+import org.apache.click.*;
/**
* Redirect test page.
Propchange: incubator/click/trunk/click/mock/test/org/apache/click/pages/RedirectPage.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/test/org/apache/click/pages/TestPage.java (from r729543, incubator/click/trunk/click/mock/test/net/sf/click/pages/TestPage.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/test/org/apache/click/pages/TestPage.java?p2=incubator/click/trunk/click/mock/test/org/apache/click/pages/TestPage.java&p1=incubator/click/trunk/click/mock/test/net/sf/click/pages/TestPage.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/test/net/sf/click/pages/TestPage.java (original)
+++ incubator/click/trunk/click/mock/test/org/apache/click/pages/TestPage.java Mon Jan 5 05:04:44 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click.pages;
+package org.apache.click.pages;
-import net.sf.click.*;
+import org.apache.click.*;
/**
* A test page.
Propchange: incubator/click/trunk/click/mock/test/org/apache/click/pages/TestPage.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/click/trunk/click/mock/test/org/apache/click/servlet/MockTests.java (from r729543, incubator/click/trunk/click/mock/test/net/sf/click/servlet/MockTests.java)
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/test/org/apache/click/servlet/MockTests.java?p2=incubator/click/trunk/click/mock/test/org/apache/click/servlet/MockTests.java&p1=incubator/click/trunk/click/mock/test/net/sf/click/servlet/MockTests.java&r1=729543&r2=731548&rev=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/test/net/sf/click/servlet/MockTests.java (original)
+++ incubator/click/trunk/click/mock/test/org/apache/click/servlet/MockTests.java Mon Jan 5 05:04:44 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package net.sf.click.servlet;
+package org.apache.click.servlet;
-import net.sf.click.*;
+import org.apache.click.*;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileWriter;
Propchange: incubator/click/trunk/click/mock/test/org/apache/click/servlet/MockTests.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/click/trunk/click/mock/test/web/WEB-INF/click.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/mock/test/web/WEB-INF/click.xml?rev=731548&r1=731547&r2=731548&view=diff
==============================================================================
--- incubator/click/trunk/click/mock/test/web/WEB-INF/click.xml (original)
+++ incubator/click/trunk/click/mock/test/web/WEB-INF/click.xml Mon Jan 5 05:04:44 2009
@@ -20,6 +20,6 @@
-->
<click-app charset="UTF-8">
- <pages package="net.sf.click.pages"/>
+ <pages package="org.apache.click.pages"/>
<mode value="production"/>
</click-app>
\ No newline at end of file