Author: crazybob
Date: Fri Jun 30 16:05:20 2006
New Revision: 418412
URL: http://svn.apache.org/viewvc?rev=418412&view=rev
Log:
Renamed API package.
Added:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Action.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/Action.java
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/MessageAware.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/MessageAware.java
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Messages.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/Messages.java
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/ResultNames.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/ResultNames.java
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Validatable.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/Validatable.java
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ParameterAware.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/servlet/ParameterAware.java
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ServletRequestAware.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/servlet/ServletRequestAware.java
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ServletResponseAware.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/servlet/ServletResponseAware.java
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ActionContext.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/ActionContext.java
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/Interceptor.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/Interceptor.java
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/RequestContext.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/RequestContext.java
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/RequestContextAware.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/RequestContextAware.java
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/Result.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/Result.java
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ThreadLocalRequestContext.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/ThreadLocalRequestContext.java
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ValueStack.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/ValueStack.java
struts/action2/trunk/action-api/src/test/java/org/apache/struts2/
struts/action2/trunk/action-api/src/test/java/org/apache/struts2/spi/
struts/action2/trunk/action-api/src/test/java/org/apache/struts2/spi/ThreadLocalRequestTest.java
- copied, changed from r418379,
struts/action2/trunk/action-api/src/test/java/org/apache/struts/action2/spi/ThreadLocalRequestTest.java
Removed:
struts/action2/trunk/action-api/src/main/java/org/apache/struts/
struts/action2/trunk/action-api/src/test/java/org/apache/struts/
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Action.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/Action.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Action.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Action.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/Action.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/Action.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Action.java
Fri Jun 30 16:05:20 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2;
+package org.apache.struts2;
/**
* Default action interface. Provided purely for user convenience. Struts does
not require actions to implement any
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/MessageAware.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/MessageAware.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/MessageAware.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/MessageAware.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/MessageAware.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/MessageAware.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/MessageAware.java
Fri Jun 30 16:05:20 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2;
+package org.apache.struts2;
/**
* Implemented by actions which may need to record errors or messages.
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Messages.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/Messages.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Messages.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Messages.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/Messages.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/Messages.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Messages.java
Fri Jun 30 16:05:20 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2;
+package org.apache.struts2;
import java.util.List;
import java.util.Set;
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/ResultNames.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/ResultNames.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/ResultNames.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/ResultNames.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/ResultNames.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/ResultNames.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/ResultNames.java
Fri Jun 30 16:05:20 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2;
+package org.apache.struts2;
/**
* Commonly used result names returned by action methods.
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Validatable.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/Validatable.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Validatable.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Validatable.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/Validatable.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/Validatable.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/Validatable.java
Fri Jun 30 16:05:20 2006
@@ -1,4 +1,6 @@
-package org.apache.struts.action2;
+package org.apache.struts2;
+
+import org.apache.struts2.MessageAware;
/**
* Implemented by actions which wish to execute some validation logic before
their action method. Useful for
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ParameterAware.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/servlet/ParameterAware.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ParameterAware.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ParameterAware.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/servlet/ParameterAware.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/servlet/ParameterAware.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ParameterAware.java
Fri Jun 30 16:05:20 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.servlet;
+package org.apache.struts2.servlet;
import java.util.Map;
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ServletRequestAware.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/servlet/ServletRequestAware.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ServletRequestAware.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ServletRequestAware.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/servlet/ServletRequestAware.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/servlet/ServletRequestAware.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ServletRequestAware.java
Fri Jun 30 16:05:20 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.servlet;
+package org.apache.struts2.servlet;
import javax.servlet.http.HttpServletRequest;
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ServletResponseAware.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/servlet/ServletResponseAware.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ServletResponseAware.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ServletResponseAware.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/servlet/ServletResponseAware.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/servlet/ServletResponseAware.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/servlet/ServletResponseAware.java
Fri Jun 30 16:05:20 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.servlet;
+package org.apache.struts2.servlet;
import javax.servlet.http.HttpServletResponse;
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ActionContext.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/ActionContext.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ActionContext.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ActionContext.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/ActionContext.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/ActionContext.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ActionContext.java
Fri Jun 30 16:05:20 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.spi;
+package org.apache.struts2.spi;
import java.lang.reflect.Method;
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/Interceptor.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/Interceptor.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/Interceptor.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/Interceptor.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/Interceptor.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/Interceptor.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/Interceptor.java
Fri Jun 30 16:05:20 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.spi;
+package org.apache.struts2.spi;
/**
* Intercepts an action request.
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/RequestContext.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/RequestContext.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/RequestContext.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/RequestContext.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/RequestContext.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/RequestContext.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/RequestContext.java
Fri Jun 30 16:05:20 2006
@@ -1,6 +1,7 @@
-package org.apache.struts.action2.spi;
+package org.apache.struts2.spi;
-import org.apache.struts.action2.Messages;
+import org.apache.struts2.Messages;
+import org.apache.struts2.spi.ActionContext;
import javax.servlet.ServletContext;
import javax.servlet.http.Cookie;
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/RequestContextAware.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/RequestContextAware.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/RequestContextAware.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/RequestContextAware.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/RequestContextAware.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/RequestContextAware.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/RequestContextAware.java
Fri Jun 30 16:05:20 2006
@@ -1,7 +1,9 @@
-package org.apache.struts.action2.spi;
+package org.apache.struts2.spi;
+
+import org.apache.struts2.spi.RequestContext;
/**
- * Implemented by actions that need access to the current [EMAIL PROTECTED]
org.apache.struts.action2.spi.RequestContext}. Use
+ * Implemented by actions that need access to the current [EMAIL PROTECTED]
org.apache.struts2.spi.RequestContext}. Use
* judiciously.
*
* @author [EMAIL PROTECTED] (Bob Lee)
@@ -9,7 +11,7 @@
public interface RequestContextAware {
/**
- * Sets [EMAIL PROTECTED] org.apache.struts.action2.spi.RequestContext}.
+ * Sets [EMAIL PROTECTED] org.apache.struts2.spi.RequestContext}.
*
* @param requestContext
*/
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/Result.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/Result.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/Result.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/Result.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/Result.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/Result.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/Result.java
Fri Jun 30 16:05:20 2006
@@ -1,4 +1,6 @@
-package org.apache.struts.action2.spi;
+package org.apache.struts2.spi;
+
+import org.apache.struts2.spi.RequestContext;
/**
* The result of an action request. Struts creates a new [EMAIL PROTECTED]
Result} instance for each request.
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ThreadLocalRequestContext.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/ThreadLocalRequestContext.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ThreadLocalRequestContext.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ThreadLocalRequestContext.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/ThreadLocalRequestContext.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/ThreadLocalRequestContext.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ThreadLocalRequestContext.java
Fri Jun 30 16:05:20 2006
@@ -1,9 +1,11 @@
-package org.apache.struts.action2.spi;
+package org.apache.struts2.spi;
+
+import org.apache.struts2.spi.RequestContext;
import java.util.concurrent.Callable;
/**
- * Provides a reference to the current [EMAIL PROTECTED] RequestContext} for
this thread.
+ * Provides a reference to the current [EMAIL PROTECTED]
org.apache.struts2.spi.RequestContext} for this thread.
*
* <p>Actions which spawn additional threads are responsible for setting this
value if access to Struts from the
* additional thread is needed.
Copied:
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ValueStack.java
(from r418379,
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/ValueStack.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ValueStack.java?p2=struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ValueStack.java&p1=struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/ValueStack.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/main/java/org/apache/struts/action2/spi/ValueStack.java
(original)
+++
struts/action2/trunk/action-api/src/main/java/org/apache/struts2/spi/ValueStack.java
Fri Jun 30 16:05:20 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.spi;
+package org.apache.struts2.spi;
/**
* A central fixture of the Struts Action framework, the [EMAIL PROTECTED]
ValueStack} is a stack which contains the actions
Copied:
struts/action2/trunk/action-api/src/test/java/org/apache/struts2/spi/ThreadLocalRequestTest.java
(from r418379,
struts/action2/trunk/action-api/src/test/java/org/apache/struts/action2/spi/ThreadLocalRequestTest.java)
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/action-api/src/test/java/org/apache/struts2/spi/ThreadLocalRequestTest.java?p2=struts/action2/trunk/action-api/src/test/java/org/apache/struts2/spi/ThreadLocalRequestTest.java&p1=struts/action2/trunk/action-api/src/test/java/org/apache/struts/action2/spi/ThreadLocalRequestTest.java&r1=418379&r2=418412&rev=418412&view=diff
==============================================================================
---
struts/action2/trunk/action-api/src/test/java/org/apache/struts/action2/spi/ThreadLocalRequestTest.java
(original)
+++
struts/action2/trunk/action-api/src/test/java/org/apache/struts2/spi/ThreadLocalRequestTest.java
Fri Jun 30 16:05:20 2006
@@ -1,6 +1,8 @@
-package org.apache.struts.action2.spi;
+package org.apache.struts2.spi;
import static org.easymock.EasyMock.*;
+import org.apache.struts2.spi.RequestContext;
+import org.apache.struts2.spi.ThreadLocalRequestContext;
import junit.framework.TestCase;
import java.util.concurrent.Callable;
