cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r635985 - in /cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src: main/java/org/apache/cocoon/servletservice/ main/java/org/apache/cocoon/servletservice/util/ test/java/org/apache/cocoon/servletservice/
Date Tue, 11 Mar 2008 15:57:02 GMT
Author: reinhard
Date: Tue Mar 11 08:56:59 2008
New Revision: 635985

URL: http://svn.apache.org/viewvc?rev=635985&view=rev
Log:
fix typo

Added:
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/ServletServiceRequest.java
      - copied, changed from r635882, cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/ServletSerivceRequest.java
Removed:
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/ServletSerivceRequest.java
Modified:
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/AbsoluteServletConnection.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/AbstractServletConnection.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/RelativeServletConnection.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/test/java/org/apache/cocoon/servletservice/ServletServiceContextTestCase.java

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/AbsoluteServletConnection.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/AbsoluteServletConnection.java?rev=635985&r1=635984&r2=635985&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/AbsoluteServletConnection.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/AbsoluteServletConnection.java
Tue Mar 11 08:56:59 2008
@@ -24,7 +24,7 @@
 import javax.servlet.ServletException;
 
 import org.apache.cocoon.callstack.environment.CallFrameHelper;
-import org.apache.cocoon.servletservice.util.ServletSerivceRequest;
+import org.apache.cocoon.servletservice.util.ServletServiceRequest;
 import org.apache.cocoon.servletservice.util.ServletServiceResponse;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -76,7 +76,7 @@
             iae.initCause(e);
             throw iae;
         }
-        this.request = new ServletSerivceRequest(reqUri, CallFrameHelper.getRequest());
+        this.request = new ServletServiceRequest(reqUri, CallFrameHelper.getRequest());
         this.response = new ServletServiceResponse();
     }
 

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/AbstractServletConnection.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/AbstractServletConnection.java?rev=635985&r1=635984&r2=635985&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/AbstractServletConnection.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/AbstractServletConnection.java
Tue Mar 11 08:56:59 2008
@@ -26,7 +26,7 @@
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 
-import org.apache.cocoon.servletservice.util.ServletSerivceRequest;
+import org.apache.cocoon.servletservice.util.ServletServiceRequest;
 import org.apache.cocoon.servletservice.util.ServletServiceResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -41,7 +41,7 @@
     protected final Log logger = LogFactory.getLog(this.getClass());
 
     /** Connection request */
-    protected ServletSerivceRequest request;
+    protected ServletServiceRequest request;
 
     /** Connection response */
     protected ServletServiceResponse response;

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/RelativeServletConnection.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/RelativeServletConnection.java?rev=635985&r1=635984&r2=635985&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/RelativeServletConnection.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/RelativeServletConnection.java
Tue Mar 11 08:56:59 2008
@@ -24,7 +24,7 @@
 import javax.servlet.ServletException;
 
 import org.apache.cocoon.callstack.environment.CallFrameHelper;
-import org.apache.cocoon.servletservice.util.ServletSerivceRequest;
+import org.apache.cocoon.servletservice.util.ServletServiceRequest;
 import org.apache.cocoon.servletservice.util.ServletServiceResponse;
 
 /**
@@ -78,7 +78,7 @@
         }
 
         // prepare request and response objects
-        this.request = new ServletSerivceRequest(reqUri, CallFrameHelper.getRequest());
+        this.request = new ServletServiceRequest(reqUri, CallFrameHelper.getRequest());
         this.response = new ServletServiceResponse();
 
         if(this.logger.isDebugEnabled()) {

Copied: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/ServletServiceRequest.java
(from r635882, cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/ServletSerivceRequest.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/ServletServiceRequest.java?p2=cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/ServletServiceRequest.java&p1=cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/ServletSerivceRequest.java&r1=635882&r2=635985&rev=635985&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/ServletSerivceRequest.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/util/ServletServiceRequest.java
Tue Mar 11 08:56:59 2008
@@ -65,7 +65,7 @@
  *          vgritsenko $
  * @since 1.0.0
  */
-public class ServletSerivceRequest implements HttpServletRequest {
+public class ServletServiceRequest implements HttpServletRequest {
 
     /**
      * Protocol of block call requests.
@@ -130,7 +130,7 @@
      * @param parentRequest
      *            reference to the request object that makes a servlet call
      */
-    public ServletSerivceRequest(URI uri, HttpServletRequest parentRequest) {
+    public ServletServiceRequest(URI uri, HttpServletRequest parentRequest) {
         this.parentRequest = parentRequest;
         this.uri = uri;
         this.headers = new Headers();
@@ -406,8 +406,8 @@
 
         HttpServletRequest request = this.parentRequest;
         while (request != null) {
-            if (request instanceof ServletSerivceRequest) {
-                request = ((ServletSerivceRequest) request).parentRequest;
+            if (request instanceof ServletServiceRequest) {
+                request = ((ServletServiceRequest) request).parentRequest;
             } else {
                 break;
             }
@@ -518,7 +518,7 @@
             for (int i = 0; i < CallStack.size(); i++) {
                 CallFrame frame = CallStack.frameAt(i);
                 HttpServletRequest request = (HttpServletRequest) frame.getAttribute(CallFrameHelper.REQUEST_OBJECT);
-                if (request instanceof ServletSerivceRequest) {
+                if (request instanceof ServletServiceRequest) {
                     names.addAll(this.values.keySet());
                 } else {
                     for (Enumeration enumeration = this.namesOf(request); enumeration.hasMoreElements();)
{
@@ -533,7 +533,7 @@
             return new EnumerationFromIterator(names.iterator());
         }
 
-        protected abstract ServletSerivceRequest getRequest();
+        protected abstract ServletServiceRequest getRequest();
 
         final class EnumerationFromIterator implements Enumeration {
 
@@ -615,7 +615,7 @@
             for (int i = 0; i < CallStack.size(); i++) {
                 CallFrame frame = CallStack.frameAt(i);
                 HttpServletRequest request = (HttpServletRequest) frame.getAttribute(CallFrameHelper.REQUEST_OBJECT);
-                if (request instanceof ServletSerivceRequest) {
+                if (request instanceof ServletServiceRequest) {
                     result.putAll(this.values);
                 } else {
                     result.putAll(request.getParameterMap());
@@ -641,8 +641,8 @@
             return result;
         }
 
-        protected ServletSerivceRequest getRequest() {
-            return ServletSerivceRequest.this;
+        protected ServletServiceRequest getRequest() {
+            return ServletServiceRequest.this;
         }
 
         protected Object getValueOfCaller(String name) {
@@ -680,8 +680,8 @@
             return new IteratorEnumeration(list.iterator());
         }
 
-        protected ServletSerivceRequest getRequest() {
-            return ServletSerivceRequest.this;
+        protected ServletServiceRequest getRequest() {
+            return ServletServiceRequest.this;
         }
 
         protected Enumeration namesOf(HttpServletRequest request) {
@@ -715,8 +715,8 @@
             }
         }
 
-        protected ServletSerivceRequest getRequest() {
-            return ServletSerivceRequest.this;
+        protected ServletServiceRequest getRequest() {
+            return ServletServiceRequest.this;
         }
 
         protected Enumeration namesOf(HttpServletRequest request) {
@@ -729,7 +729,7 @@
 
         private ServletServiceContext context;
 
-        private transient ServletSerivceRequest request;
+        private transient ServletServiceRequest request;
 
         public Session(ServletServiceContext context) {
             this.context = context;
@@ -743,11 +743,11 @@
             return this.getRequest().parentRequest.getSession().getAttributeNames();
         }
 
-        protected ServletSerivceRequest getRequest() {
+        protected ServletServiceRequest getRequest() {
             return this.request;
         }
 
-        private void setRequest(ServletSerivceRequest request) {
+        private void setRequest(ServletServiceRequest request) {
             this.request = request;
         }
 

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/test/java/org/apache/cocoon/servletservice/ServletServiceContextTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/test/java/org/apache/cocoon/servletservice/ServletServiceContextTestCase.java?rev=635985&r1=635984&r2=635985&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/test/java/org/apache/cocoon/servletservice/ServletServiceContextTestCase.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/test/java/org/apache/cocoon/servletservice/ServletServiceContextTestCase.java
Tue Mar 11 08:56:59 2008
@@ -32,7 +32,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.cocoon.servletservice.util.ServletSerivceRequest;
+import org.apache.cocoon.servletservice.util.ServletServiceRequest;
 import org.apache.cocoon.servletservice.util.ServletServiceResponse;
 
 /**
@@ -49,14 +49,14 @@
     private ServletServiceContext servletBContext;
     private ServletServiceContext servletCContext;
 
-    ServletSerivceRequest request;
+    ServletServiceRequest request;
     ServletServiceResponse response;
 
     protected void setUp() throws Exception {
         super.setUp();
         this.mainContext = new ServletServiceContext();
 
-        request = new ServletSerivceRequest(new URI("dummy"), null);
+        request = new ServletServiceRequest(new URI("dummy"), null);
         response = new ServletServiceResponse();
 
         //creating ServletContexts



Mime
View raw message