You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/03/18 21:26:03 UTC
svn commit: r638555 - in /incubator/sling/trunk/sling/core/src/main:
java/org/apache/sling/core/impl/ java/org/apache/sling/core/impl/filter/
java/org/apache/sling/core/impl/request/ java/org/apache/sling/core/locale/
resources/OSGI-INF/metatype/
Author: fmeschbe
Date: Tue Mar 18 13:26:02 2008
New Revision: 638555
URL: http://svn.apache.org/viewvc?rev=638555&view=rev
Log:
SLING-335 Remove Locale resolution stuff moved to the sling/i18n module
Removed:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/LocaleResolverFilter.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/locale/
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/RequestData.java
incubator/sling/trunk/sling/core/src/main/resources/OSGI-INF/metatype/metatype.properties
Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java?rev=638555&r1=638554&r2=638555&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java (original)
+++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java Tue Mar 18 13:26:02 2008
@@ -117,15 +117,6 @@
}
/**
- * @see javax.servlet.ServletRequestWrapper#getLocale()
- */
- public Locale getLocale() {
- return (this.getRequestData() != null)
- ? this.getRequestData().getLocale()
- : super.getLocale();
- }
-
- /**
* @see javax.servlet.ServletRequestWrapper#getParameter(java.lang.String)
*/
public String getParameter(String name) {
Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/RequestData.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/RequestData.java?rev=638555&r1=638554&r2=638555&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/RequestData.java (original)
+++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/RequestData.java Tue Mar 18 13:26:02 2008
@@ -27,7 +27,6 @@
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.util.LinkedList;
-import java.util.Locale;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
@@ -100,8 +99,6 @@
private RequestProgressTracker requestProgressTracker;
- private Locale locale;
-
/** the current ContentData */
private ContentData currentContentData;
@@ -537,20 +534,6 @@
*/
public boolean isContentIncluded() {
return contentDataStack != null && !contentDataStack.isEmpty();
- }
-
- /**
- * @return the locale
- */
- public Locale getLocale() {
- return locale;
- }
-
- /**
- * @param locale the locale to set
- */
- public void setLocale(Locale locale) {
- this.locale = locale;
}
public ResourceResolver getResourceResolver() {
Modified: incubator/sling/trunk/sling/core/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=638555&r1=638554&r2=638555&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ incubator/sling/trunk/sling/core/src/main/resources/OSGI-INF/metatype/metatype.properties Tue Mar 18 13:26:02 2008
@@ -82,25 +82,6 @@
no configurable properties.
#
-# (Default) Locale Resolver Filter
-locale.name = Locale Resolver Filter
-locale.description = Request Level filter which extracts the primary locale \
- from the Request, which has been transferred from the client in the HTTP \
- Accept-Language header. If a LocaleResolver service has been registered, that \
- service is called instead of getting the HTTP header value for the locale.
-locale.default.name = Default Locale
-locale.default.description = The default locale to assume if none can be \
- resolved from a LocalResolver service or the HTTP Accept-Language header. This \
- value must be in the form acceptable to the =java.util.Locale= class.
-
-#
-# Theme Resolver Filter
-theme.name = Theme Resolver Filter
-theme.description = Request Level filter which uses a registered ThemeResovler \
- service to resolve a Theme to be used to render the response. This filter has \
- no configurable properties.
-
-#
# Component Action Filter
action.name = Component Action Filter
action.description = Component level filter, which calls the performAction \