You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/04/14 17:00:41 UTC
svn commit: r647826 - in /incubator/sling/trunk: ./ api/ cache/
cache/src/main/java/org/apache/sling/cache/impl/
Author: cziegeler
Date: Mon Apr 14 08:00:38 2008
New Revision: 647826
URL: http://svn.apache.org/viewvc?rev=647826&view=rev
Log:
Further updates on notice files.
Modified:
incubator/sling/trunk/NOTICE
incubator/sling/trunk/api/NOTICE
incubator/sling/trunk/cache/NOTICE
incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/AbstractCacheFilter.java
incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/BurstCacheFilter.java
incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/CacheFilter.java
Modified: incubator/sling/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/NOTICE?rev=647826&r1=647825&r2=647826&view=diff
==============================================================================
--- incubator/sling/trunk/NOTICE (original)
+++ incubator/sling/trunk/NOTICE Mon Apr 14 08:00:38 2008
@@ -1,5 +1,5 @@
Sling JCR-based applications framework
-Copyright 2007 The Apache Software Foundation.
+Copyright 2007-2008 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: incubator/sling/trunk/api/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/api/NOTICE?rev=647826&r1=647825&r2=647826&view=diff
==============================================================================
--- incubator/sling/trunk/api/NOTICE (original)
+++ incubator/sling/trunk/api/NOTICE Mon Apr 14 08:00:38 2008
@@ -1,6 +1,8 @@
Apache Sling API
Copyright 2007-2008 The Apache Software Foundation
+Based on source code originally developed by
+Day Software (http://www.day.com/).
I. Included Software
Modified: incubator/sling/trunk/cache/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/cache/NOTICE?rev=647826&r1=647825&r2=647826&view=diff
==============================================================================
--- incubator/sling/trunk/cache/NOTICE (original)
+++ incubator/sling/trunk/cache/NOTICE Mon Apr 14 08:00:38 2008
@@ -1,8 +1,20 @@
-Apache Sling
-Copyright 2007 The Apache Software Foundation
+Apache Sling Cache
+Copyright 2007-2008 The Apache Software Foundation
+
+Based on source code originally developed by
+Day Software (http://www.day.com/).
+
+I. Included Software
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+
+II. Used Software
+
+-
+
+
+III. License Summary
+- Apache License 2.0
Modified: incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/AbstractCacheFilter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/AbstractCacheFilter.java?rev=647826&r1=647825&r2=647826&view=diff
==============================================================================
--- incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/AbstractCacheFilter.java (original)
+++ incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/AbstractCacheFilter.java Mon Apr 14 08:00:38 2008
@@ -19,8 +19,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.cache.CacheService;
-import org.apache.sling.component.ComponentRequest;
/**
@@ -34,12 +34,12 @@
List<CacheService> cacheServices;
- protected CacheService getBurstCacheService(ComponentRequest request) {
+ protected CacheService getBurstCacheService(SlingHttpServletRequest request) {
// return a cache service willing to handle burst caching for the request
return null;
}
- protected CacheService getCacheService(ComponentRequest request) {
+ protected CacheService getCacheService(SlingHttpServletRequest request) {
// return a cache service willing to handle this component rendering
return null;
}
Modified: incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/BurstCacheFilter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/BurstCacheFilter.java?rev=647826&r1=647825&r2=647826&view=diff
==============================================================================
--- incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/BurstCacheFilter.java (original)
+++ incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/BurstCacheFilter.java Mon Apr 14 08:00:38 2008
@@ -18,12 +18,12 @@
import java.io.IOException;
-import org.apache.sling.component.ComponentContext;
-import org.apache.sling.component.ComponentException;
-import org.apache.sling.component.ComponentFilter;
-import org.apache.sling.component.ComponentFilterChain;
-import org.apache.sling.component.ComponentRequest;
-import org.apache.sling.component.ComponentResponse;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
/**
* The <code>BurstCacheFilter</code> is a global Request Component API filter,
@@ -39,17 +39,17 @@
* @scr.service
*/
public class BurstCacheFilter extends AbstractCacheFilter implements
- ComponentFilter {
-
- public void doFilter(ComponentRequest request, ComponentResponse response,
- ComponentFilterChain filterChain) throws IOException,
- ComponentException {
+ Filter {
+ public void doFilter(ServletRequest req, ServletResponse res,
+ FilterChain chain) throws IOException, ServletException {
// currently there is no caching, so just forward
- filterChain.doFilter(request, response);
+ chain.doFilter(req, res);
}
- public void init(ComponentContext context) {
+ public void init(FilterConfig config) throws ServletException {
+ // TODO Auto-generated method stub
+
}
public void destroy() {
Modified: incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/CacheFilter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/CacheFilter.java?rev=647826&r1=647825&r2=647826&view=diff
==============================================================================
--- incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/CacheFilter.java (original)
+++ incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/CacheFilter.java Mon Apr 14 08:00:38 2008
@@ -18,12 +18,12 @@
import java.io.IOException;
-import org.apache.sling.component.ComponentContext;
-import org.apache.sling.component.ComponentException;
-import org.apache.sling.component.ComponentFilter;
-import org.apache.sling.component.ComponentFilterChain;
-import org.apache.sling.component.ComponentRequest;
-import org.apache.sling.component.ComponentResponse;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
/**
* The <code>CacheFilter</code> class is a component level filter implementing
@@ -38,15 +38,15 @@
* @scr.property name="filter.order" value="-1000" type="Integer" private="true"
* @scr.service
*/
-public class CacheFilter extends AbstractCacheFilter implements ComponentFilter {
+public class CacheFilter extends AbstractCacheFilter implements Filter {
- /**
- * @see org.apache.sling.component.ComponentFilter#doFilter(org.apache.sling.component.ComponentRequest, org.apache.sling.component.ComponentResponse, org.apache.sling.component.ComponentFilterChain)
- */
- public void doFilter(ComponentRequest request, ComponentResponse response,
- ComponentFilterChain filterChain) throws IOException,
- ComponentException {
+ public void init(FilterConfig config) throws ServletException {
+ // TODO Auto-generated method stub
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain filterChain) throws IOException, ServletException {
// Actually, this needs to be done:
// -> can we handle this from the cache ?
// -> if not, is this cacheable ??
@@ -87,9 +87,6 @@
// currently there is no caching, so just forward
filterChain.doFilter(request, response);
- }
-
- public void init(ComponentContext context) {
}
public void destroy() {
Re: svn commit: r647826 - in /incubator/sling/trunk: ./
api/ cache/ cache/src/main/java/org/apache/sling/cache/impl/
Posted by Felix Meschberger <fm...@gmail.com>.
Hi,
Am Montag, den 14.04.2008, 17:10 +0200 schrieb Carsten Ziegeler:
> Felix Meschberger wrote:
> > Hi,
> >
> > The cache project is "stupid" and useless at the moment. Shouldn't we
> > remove it completely for now ?
> >
> Hehe, I suggested this some months ago and you were reluctant at that
> time :)
Was I ... Hmm, cannot not (or do not want to ;-) ) remember. I will
remove it ...
Regards
Felix
> Big +1 for removing.
>
> Carsten
>
>
Re: svn commit: r647826 - in /incubator/sling/trunk: ./ api/ cache/
cache/src/main/java/org/apache/sling/cache/impl/
Posted by Carsten Ziegeler <cz...@apache.org>.
Felix Meschberger wrote:
> Hi,
>
> The cache project is "stupid" and useless at the moment. Shouldn't we
> remove it completely for now ?
>
Hehe, I suggested this some months ago and you were reluctant at that
time :)
Big +1 for removing.
Carsten
--
Carsten Ziegeler
cziegeler@apache.org
Re: svn commit: r647826 - in /incubator/sling/trunk: ./ api/
cache/ cache/src/main/java/org/apache/sling/cache/impl/
Posted by Felix Meschberger <Fe...@day.com>.
Hi,
The cache project is "stupid" and useless at the moment. Shouldn't we
remove it completely for now ?
Regards
Felix
Am Montag, den 14.04.2008, 15:00 +0000 schrieb cziegeler@apache.org:
> Author: cziegeler
> Date: Mon Apr 14 08:00:38 2008
> New Revision: 647826
>
> URL: http://svn.apache.org/viewvc?rev=647826&view=rev
> Log:
> Further updates on notice files.
>
> Modified:
> incubator/sling/trunk/NOTICE
> incubator/sling/trunk/api/NOTICE
> incubator/sling/trunk/cache/NOTICE
> incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/AbstractCacheFilter.java
> incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/BurstCacheFilter.java
> incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/CacheFilter.java
>
> Modified: incubator/sling/trunk/NOTICE
> URL: http://svn.apache.org/viewvc/incubator/sling/trunk/NOTICE?rev=647826&r1=647825&r2=647826&view=diff
> ==============================================================================
> --- incubator/sling/trunk/NOTICE (original)
> +++ incubator/sling/trunk/NOTICE Mon Apr 14 08:00:38 2008
> @@ -1,5 +1,5 @@
> Sling JCR-based applications framework
> -Copyright 2007 The Apache Software Foundation.
> +Copyright 2007-2008 The Apache Software Foundation.
>
> This product includes software developed at
> The Apache Software Foundation (http://www.apache.org/).
>
> Modified: incubator/sling/trunk/api/NOTICE
> URL: http://svn.apache.org/viewvc/incubator/sling/trunk/api/NOTICE?rev=647826&r1=647825&r2=647826&view=diff
> ==============================================================================
> --- incubator/sling/trunk/api/NOTICE (original)
> +++ incubator/sling/trunk/api/NOTICE Mon Apr 14 08:00:38 2008
> @@ -1,6 +1,8 @@
> Apache Sling API
> Copyright 2007-2008 The Apache Software Foundation
>
> +Based on source code originally developed by
> +Day Software (http://www.day.com/).
>
> I. Included Software
>
>
> Modified: incubator/sling/trunk/cache/NOTICE
> URL: http://svn.apache.org/viewvc/incubator/sling/trunk/cache/NOTICE?rev=647826&r1=647825&r2=647826&view=diff
> ==============================================================================
> --- incubator/sling/trunk/cache/NOTICE (original)
> +++ incubator/sling/trunk/cache/NOTICE Mon Apr 14 08:00:38 2008
> @@ -1,8 +1,20 @@
> -Apache Sling
> -Copyright 2007 The Apache Software Foundation
> +Apache Sling Cache
> +Copyright 2007-2008 The Apache Software Foundation
> +
> +Based on source code originally developed by
> +Day Software (http://www.day.com/).
> +
> +I. Included Software
>
> This product includes software developed at
> The Apache Software Foundation (http://www.apache.org/).
> +Licensed under the Apache License 2.0.
>
> -Based on source code originally developed by
> -Day Software (http://www.day.com/).
> +
> +II. Used Software
> +
> +-
> +
> +
> +III. License Summary
> +- Apache License 2.0
>
> Modified: incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/AbstractCacheFilter.java
> URL: http://svn.apache.org/viewvc/incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/AbstractCacheFilter.java?rev=647826&r1=647825&r2=647826&view=diff
> ==============================================================================
> --- incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/AbstractCacheFilter.java (original)
> +++ incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/AbstractCacheFilter.java Mon Apr 14 08:00:38 2008
> @@ -19,8 +19,8 @@
> import java.util.ArrayList;
> import java.util.List;
>
> +import org.apache.sling.api.SlingHttpServletRequest;
> import org.apache.sling.cache.CacheService;
> -import org.apache.sling.component.ComponentRequest;
>
>
> /**
> @@ -34,12 +34,12 @@
>
> List<CacheService> cacheServices;
>
> - protected CacheService getBurstCacheService(ComponentRequest request) {
> + protected CacheService getBurstCacheService(SlingHttpServletRequest request) {
> // return a cache service willing to handle burst caching for the request
> return null;
> }
>
> - protected CacheService getCacheService(ComponentRequest request) {
> + protected CacheService getCacheService(SlingHttpServletRequest request) {
> // return a cache service willing to handle this component rendering
> return null;
> }
>
> Modified: incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/BurstCacheFilter.java
> URL: http://svn.apache.org/viewvc/incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/BurstCacheFilter.java?rev=647826&r1=647825&r2=647826&view=diff
> ==============================================================================
> --- incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/BurstCacheFilter.java (original)
> +++ incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/BurstCacheFilter.java Mon Apr 14 08:00:38 2008
> @@ -18,12 +18,12 @@
>
> import java.io.IOException;
>
> -import org.apache.sling.component.ComponentContext;
> -import org.apache.sling.component.ComponentException;
> -import org.apache.sling.component.ComponentFilter;
> -import org.apache.sling.component.ComponentFilterChain;
> -import org.apache.sling.component.ComponentRequest;
> -import org.apache.sling.component.ComponentResponse;
> +import javax.servlet.Filter;
> +import javax.servlet.FilterChain;
> +import javax.servlet.FilterConfig;
> +import javax.servlet.ServletException;
> +import javax.servlet.ServletRequest;
> +import javax.servlet.ServletResponse;
>
> /**
> * The <code>BurstCacheFilter</code> is a global Request Component API filter,
> @@ -39,17 +39,17 @@
> * @scr.service
> */
> public class BurstCacheFilter extends AbstractCacheFilter implements
> - ComponentFilter {
> -
> - public void doFilter(ComponentRequest request, ComponentResponse response,
> - ComponentFilterChain filterChain) throws IOException,
> - ComponentException {
> + Filter {
>
> + public void doFilter(ServletRequest req, ServletResponse res,
> + FilterChain chain) throws IOException, ServletException {
> // currently there is no caching, so just forward
> - filterChain.doFilter(request, response);
> + chain.doFilter(req, res);
> }
>
> - public void init(ComponentContext context) {
> + public void init(FilterConfig config) throws ServletException {
> + // TODO Auto-generated method stub
> +
> }
>
> public void destroy() {
>
> Modified: incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/CacheFilter.java
> URL: http://svn.apache.org/viewvc/incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/CacheFilter.java?rev=647826&r1=647825&r2=647826&view=diff
> ==============================================================================
> --- incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/CacheFilter.java (original)
> +++ incubator/sling/trunk/cache/src/main/java/org/apache/sling/cache/impl/CacheFilter.java Mon Apr 14 08:00:38 2008
> @@ -18,12 +18,12 @@
>
> import java.io.IOException;
>
> -import org.apache.sling.component.ComponentContext;
> -import org.apache.sling.component.ComponentException;
> -import org.apache.sling.component.ComponentFilter;
> -import org.apache.sling.component.ComponentFilterChain;
> -import org.apache.sling.component.ComponentRequest;
> -import org.apache.sling.component.ComponentResponse;
> +import javax.servlet.Filter;
> +import javax.servlet.FilterChain;
> +import javax.servlet.FilterConfig;
> +import javax.servlet.ServletException;
> +import javax.servlet.ServletRequest;
> +import javax.servlet.ServletResponse;
>
> /**
> * The <code>CacheFilter</code> class is a component level filter implementing
> @@ -38,15 +38,15 @@
> * @scr.property name="filter.order" value="-1000" type="Integer" private="true"
> * @scr.service
> */
> -public class CacheFilter extends AbstractCacheFilter implements ComponentFilter {
> +public class CacheFilter extends AbstractCacheFilter implements Filter {
>
> - /**
> - * @see org.apache.sling.component.ComponentFilter#doFilter(org.apache.sling.component.ComponentRequest, org.apache.sling.component.ComponentResponse, org.apache.sling.component.ComponentFilterChain)
> - */
> - public void doFilter(ComponentRequest request, ComponentResponse response,
> - ComponentFilterChain filterChain) throws IOException,
> - ComponentException {
> + public void init(FilterConfig config) throws ServletException {
> + // TODO Auto-generated method stub
>
> + }
> +
> + public void doFilter(ServletRequest request, ServletResponse response,
> + FilterChain filterChain) throws IOException, ServletException {
> // Actually, this needs to be done:
> // -> can we handle this from the cache ?
> // -> if not, is this cacheable ??
> @@ -87,9 +87,6 @@
>
> // currently there is no caching, so just forward
> filterChain.doFilter(request, response);
> - }
> -
> - public void init(ComponentContext context) {
> }
>
> public void destroy() {
>
>