cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r556319 - in /cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice: ServletService.java ServletServiceContextAware.java spring/ServletFactoryBean.java
Date Sat, 14 Jul 2007 18:42:45 GMT
Author: danielf
Date: Sat Jul 14 11:42:44 2007
New Revision: 556319

URL: http://svn.apache.org/viewvc?view=rev&rev=556319
Log:
More reasonable return types from getServletServiceContext() (due to Rice Yeh) and some spelling
errors in comments.

Modified:
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletService.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletServiceContextAware.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/spring/ServletFactoryBean.java

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletService.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletService.java?view=diff&rev=556319&r1=556318&r2=556319
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletService.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletService.java
Sat Jul 14 11:42:44 2007
@@ -83,7 +83,7 @@
             new ServletConfigurationWrapper(servletConfig, this.servletServiceContext) {
 
                 // FIXME: The context should get the init parameters from the
-                // config rather than the oposite way around.
+                // config rather than the opposite way around.
                 public String getInitParameter(String name) {
                     return super.getServletContext().getInitParameter(name);
                 }
@@ -93,7 +93,7 @@
                 }
             };
 
-        // create and initialize the embeded servlet
+        // create and initialize the embedded servlet
         this.embeddedServlet = createEmbeddedServlet(this.embeddedServletClass, blockServletConfig);
         this.embeddedServlet.init(blockServletConfig);
         this.servletServiceContext.setServlet(this.embeddedServlet);
@@ -131,7 +131,7 @@
     /**
      * @return the servletServiceContext
      */
-    public ServletContext getServletServiceContext() {
+    public ServletServiceContext getServletServiceContext() {
         return this.servletServiceContext;
     }
     
@@ -160,8 +160,8 @@
      * must start with an '/'.
      * @param blockContextURL
      */
-    // FIXME: would like to throw an exeption if the form of the url is faulty,
-    // what is the prefered way of handling faulty properties in Spring?
+    // FIXME: would like to throw an exception if the form of the url is faulty,
+    // what is the preferred way of handling faulty properties in Spring?
     public void setBlockContextURL(String blockContextURL) {
         this.servletServiceContext.setContextPath(blockContextURL);
     }

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletServiceContextAware.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletServiceContextAware.java?view=diff&rev=556319&r1=556318&r2=556319
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletServiceContextAware.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletServiceContextAware.java
Sat Jul 14 11:42:44 2007
@@ -16,12 +16,11 @@
  */
 package org.apache.cocoon.servletservice;
 
-import javax.servlet.ServletContext;
 
 /**
- * Inteface for making the servlet service context of a servlet service
+ * Interface for making the servlet service context of a servlet service
  * available. It is needed for inter servlet communication in the servlet
- * service framework. It is normaly introduced by an AOP mixin.
+ * service framework. It is normally introduced by an AOP mixin.
  * 
  * @version $Id$
  */
@@ -30,5 +29,5 @@
      * The servlet context used for inter servlet service communication
      * @return
      */
-    public ServletContext getServletServiceContext();
+    public ServletServiceContext getServletServiceContext();
 }

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/spring/ServletFactoryBean.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/spring/ServletFactoryBean.java?view=diff&rev=556319&r1=556318&r2=556319
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/spring/ServletFactoryBean.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/spring/ServletFactoryBean.java
Sat Jul 14 11:42:44 2007
@@ -251,7 +251,7 @@
     private class ServletServiceContextMixin extends DelegatingIntroductionInterceptor
     implements ServletServiceContextAware {
 
-        public ServletContext getServletServiceContext() {
+        public ServletServiceContext getServletServiceContext() {
             return ServletFactoryBean.this.servletServiceContext;
         }
     }



Mime
View raw message