cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r569114 - in /cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding: ServletService.java ShieldingServletService.java
Date Thu, 23 Aug 2007 18:43:46 GMT
Author: danielf
Date: Thu Aug 23 11:43:45 2007
New Revision: 569114

URL: http://svn.apache.org/viewvc?rev=569114&view=rev
Log:
Clean up:
Move the ServletService to the same package as the ShieldingServletService as its only use
is as base class to the shielding servlet service. Otherwise the ServletFactorybean with the
custom XML format is the preferable way to create servlet services.

Added:
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ServletService.java
      - copied, changed from r569093, cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletService.java
Modified:
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingServletService.java

Copied: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ServletService.java
(from r569093, 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-components/src/main/java/org/apache/cocoon/servletservice/shielding/ServletService.java?p2=cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ServletService.java&p1=cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/ServletService.java&r1=569093&r2=569114&rev=569114&view=diff
==============================================================================
--- 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-components/src/main/java/org/apache/cocoon/servletservice/shielding/ServletService.java
Thu Aug 23 11:43:45 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.servletservice;
+package org.apache.cocoon.servletservice.shielding;
 
 import java.io.IOException;
 import java.util.Enumeration;
@@ -29,6 +29,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.cocoon.servletservice.ServletServiceContext;
 import org.apache.cocoon.servletservice.util.ServletConfigurationWrapper;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanNameAware;
@@ -42,6 +43,11 @@
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
+ * This class is only used as a base class for the {@link ShieldingServletService}. For non
shielded servlet
+ * services, the {@link org.apache.cocoon.servletservice.spring.ServletFactoryBean} should
be used.
+ * 
+ * TODO: Make the shielding work together with the ServletBeanFactory.
+ * 
  * @version $Id$
  */
 public class ServletService extends HttpServlet

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingServletService.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingServletService.java?rev=569114&r1=569113&r2=569114&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingServletService.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingServletService.java
Thu Aug 23 11:43:45 2007
@@ -23,7 +23,6 @@
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 
-import org.apache.cocoon.servletservice.ServletService;
 
 import org.springframework.aop.framework.ProxyFactory;
 



Mime
View raw message