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 2009/06/09 08:19:04 UTC
svn commit: r782894 - in
/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom: ./
src/main/java/org/apache/sling/atom/taglib/
src/main/java/org/apache/sling/atom/taglib/media/
Author: fmeschbe
Date: Tue Jun 9 06:19:03 2009
New Revision: 782894
URL: http://svn.apache.org/viewvc?rev=782894&view=rev
Log:
SLING-985 Remove unused Sling dependencies
Modified:
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/pom.xml
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/AbstractAbderaHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/FeedTagHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCategoryTagHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaContentTagHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCopyrightTagHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCreditTagHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaDescriptionTagHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaGroupTagHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaHashTagHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaKeywordsTagHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaPlayerTagHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRatingTagHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRestrictionTagHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTextTagHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaThumbnailTagHandler.java
incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTitleTagHandler.java
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/pom.xml?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/pom.xml (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/pom.xml Tue Jun 9 06:19:03 2009
@@ -54,6 +54,11 @@
<Export-Package>
org.apache.sling.atom.taglib.*;version=${pom.version}
</Export-Package>
+ <Import-Package>
+ javax.servlet;version=2.4,
+ javax.servlet.jsp.*;version=2.0,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
@@ -70,23 +75,6 @@
<artifactId>jsp-api</artifactId>
<version>2.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.api
- </artifactId>
- <version>2.0.4-incubator</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.scripting.jsp
- </artifactId>
- <version>2.0.2-incubator</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/AbstractAbderaHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/AbstractAbderaHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/AbstractAbderaHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/AbstractAbderaHandler.java Tue Jun 9 06:19:03 2009
@@ -18,6 +18,7 @@
*/
package org.apache.sling.atom.taglib;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.tagext.BodyTagSupport;
import org.apache.abdera.Abdera;
@@ -27,8 +28,6 @@
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
import org.apache.abdera.parser.stax.FOMFactory;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class AbstractAbderaHandler extends BodyTagSupport {
@@ -39,11 +38,11 @@
}
protected Abdera getAbdera() {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
return getAbdera(request);
}
- protected Abdera getAbdera(SlingHttpServletRequest request) {
+ protected Abdera getAbdera(ServletRequest request) {
Abdera abdera;
if (request.getAttribute("abdera") != null
&& (request.getAttribute("abdera") instanceof Abdera)) {
@@ -73,7 +72,7 @@
return abdera;
}
- protected Feed getFeed(SlingHttpServletRequest request) {
+ protected Feed getFeed(ServletRequest request) {
Feed feed;
if (request.getAttribute("feed") != null
&& (request.getAttribute("feed") instanceof Feed)) {
@@ -86,12 +85,12 @@
}
protected Feed getFeed() {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
return getFeed(request);
}
protected Entry getEntry() {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
if (request.getAttribute("entry") instanceof Entry) {
return (Entry) request.getAttribute("entry");
}
@@ -99,7 +98,7 @@
}
protected void setEntry(Entry entry) {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
request.setAttribute("entry", entry);
}
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/FeedTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/FeedTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/FeedTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/FeedTagHandler.java Tue Jun 9 06:19:03 2009
@@ -21,12 +21,11 @@
import java.io.IOException;
import java.util.Date;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
import javax.servlet.jsp.JspException;
import org.apache.abdera.model.Feed;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class FeedTagHandler extends AbstractAbderaHandler {
@@ -94,8 +93,8 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
- final SlingHttpServletResponse response = TagUtil.getResponse(pageContext);
+ final ServletRequest request = pageContext.getRequest();
+ final ServletResponse response = pageContext.getResponse();
// get the current feed
Feed feed = getFeed(request);
@@ -126,7 +125,7 @@
@Override
public int doStartTag() {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
// create a feed
Feed feed = getFeed(request);
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCategoryTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCategoryTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCategoryTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCategoryTagHandler.java Tue Jun 9 06:19:03 2009
@@ -18,6 +18,7 @@
*/
package org.apache.sling.atom.taglib.media;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.abdera.ext.media.MediaCategory;
@@ -26,9 +27,7 @@
import org.apache.abdera.ext.media.MediaGroup;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.atom.taglib.AbstractAbderaHandler;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class MediaCategoryTagHandler extends AbstractAbderaHandler {
@@ -40,7 +39,7 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
MediaCategory category;
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaContentTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaContentTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaContentTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaContentTagHandler.java Tue Jun 9 06:19:03 2009
@@ -18,6 +18,7 @@
*/
package org.apache.sling.atom.taglib.media;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.abdera.ext.media.MediaConstants;
@@ -26,9 +27,7 @@
import org.apache.abdera.ext.media.MediaConstants.Expression;
import org.apache.abdera.ext.media.MediaConstants.Medium;
import org.apache.abdera.model.Entry;
-import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.atom.taglib.AbstractAbderaHandler;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class MediaContentTagHandler extends AbstractAbderaHandler {
@@ -62,7 +61,7 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
// clear out the group
request.setAttribute("content", null);
@@ -71,7 +70,7 @@
@Override
public int doStartTag() {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
MediaContent content;
if (request.getAttribute("group") instanceof MediaGroup) {
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCopyrightTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCopyrightTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCopyrightTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCopyrightTagHandler.java Tue Jun 9 06:19:03 2009
@@ -18,6 +18,7 @@
*/
package org.apache.sling.atom.taglib.media;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.abdera.ext.media.MediaConstants;
@@ -26,9 +27,7 @@
import org.apache.abdera.ext.media.MediaGroup;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.atom.taglib.AbstractAbderaHandler;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class MediaCopyrightTagHandler extends AbstractAbderaHandler {
@@ -38,7 +37,7 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
MediaCopyright copyright;
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCreditTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCreditTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCreditTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCreditTagHandler.java Tue Jun 9 06:19:03 2009
@@ -18,6 +18,7 @@
*/
package org.apache.sling.atom.taglib.media;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.abdera.ext.media.MediaConstants;
@@ -26,9 +27,7 @@
import org.apache.abdera.ext.media.MediaGroup;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.atom.taglib.AbstractAbderaHandler;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class MediaCreditTagHandler extends AbstractAbderaHandler {
@@ -40,7 +39,7 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
MediaCredit credit;
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaDescriptionTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaDescriptionTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaDescriptionTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaDescriptionTagHandler.java Tue Jun 9 06:19:03 2009
@@ -18,6 +18,7 @@
*/
package org.apache.sling.atom.taglib.media;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.abdera.ext.media.MediaConstants;
@@ -27,9 +28,7 @@
import org.apache.abdera.ext.media.MediaConstants.Type;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.atom.taglib.AbstractAbderaHandler;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class MediaDescriptionTagHandler extends AbstractAbderaHandler {
@@ -39,7 +38,7 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
MediaDescription description;
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaGroupTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaGroupTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaGroupTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaGroupTagHandler.java Tue Jun 9 06:19:03 2009
@@ -18,13 +18,12 @@
*/
package org.apache.sling.atom.taglib.media;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.abdera.ext.media.MediaConstants;
import org.apache.abdera.model.Entry;
-import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.atom.taglib.AbstractAbderaHandler;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class MediaGroupTagHandler extends AbstractAbderaHandler {
@@ -32,7 +31,7 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
// clear out the group
request.setAttribute("group", null);
@@ -46,7 +45,7 @@
getAbdera().getConfiguration().getExtensionFactories();
Object group = entry.addExtension(MediaConstants.GROUP);
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
request.setAttribute("group", group);
return EVAL_BODY_INCLUDE;
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaHashTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaHashTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaHashTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaHashTagHandler.java Tue Jun 9 06:19:03 2009
@@ -18,6 +18,7 @@
*/
package org.apache.sling.atom.taglib.media;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.abdera.ext.media.MediaConstants;
@@ -27,9 +28,7 @@
import org.apache.abdera.ext.media.MediaConstants.Algo;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.atom.taglib.AbstractAbderaHandler;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class MediaHashTagHandler extends AbstractAbderaHandler {
@@ -39,7 +38,7 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
MediaHash hash;
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaKeywordsTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaKeywordsTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaKeywordsTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaKeywordsTagHandler.java Tue Jun 9 06:19:03 2009
@@ -18,6 +18,7 @@
*/
package org.apache.sling.atom.taglib.media;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.abdera.ext.media.MediaConstants;
@@ -26,9 +27,7 @@
import org.apache.abdera.ext.media.MediaKeywords;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.atom.taglib.AbstractAbderaHandler;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class MediaKeywordsTagHandler extends AbstractAbderaHandler {
@@ -36,7 +35,7 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
MediaKeywords keywords;
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaPlayerTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaPlayerTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaPlayerTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaPlayerTagHandler.java Tue Jun 9 06:19:03 2009
@@ -18,6 +18,7 @@
*/
package org.apache.sling.atom.taglib.media;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.abdera.ext.media.MediaConstants;
@@ -26,9 +27,7 @@
import org.apache.abdera.ext.media.MediaPlayer;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.atom.taglib.AbstractAbderaHandler;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class MediaPlayerTagHandler extends AbstractAbderaHandler {
@@ -66,7 +65,7 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
MediaPlayer player;
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRatingTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRatingTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRatingTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRatingTagHandler.java Tue Jun 9 06:19:03 2009
@@ -18,6 +18,7 @@
*/
package org.apache.sling.atom.taglib.media;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.abdera.ext.media.MediaConstants;
@@ -26,9 +27,7 @@
import org.apache.abdera.ext.media.MediaRating;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.atom.taglib.AbstractAbderaHandler;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class MediaRatingTagHandler extends AbstractAbderaHandler {
@@ -38,7 +37,7 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
MediaRating rating;
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRestrictionTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRestrictionTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRestrictionTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRestrictionTagHandler.java Tue Jun 9 06:19:03 2009
@@ -18,6 +18,7 @@
*/
package org.apache.sling.atom.taglib.media;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.abdera.ext.media.MediaConstants;
@@ -28,9 +29,7 @@
import org.apache.abdera.ext.media.MediaConstants.RestrictionType;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.atom.taglib.AbstractAbderaHandler;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class MediaRestrictionTagHandler extends AbstractAbderaHandler {
@@ -42,7 +41,7 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
MediaRestriction restriction;
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTextTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTextTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTextTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTextTagHandler.java Tue Jun 9 06:19:03 2009
@@ -18,6 +18,7 @@
*/
package org.apache.sling.atom.taglib.media;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.abdera.ext.media.MediaConstants;
@@ -27,9 +28,7 @@
import org.apache.abdera.ext.media.MediaConstants.Type;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.atom.taglib.AbstractAbderaHandler;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class MediaTextTagHandler extends AbstractAbderaHandler {
@@ -69,7 +68,7 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
MediaText text;
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaThumbnailTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaThumbnailTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaThumbnailTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaThumbnailTagHandler.java Tue Jun 9 06:19:03 2009
@@ -18,6 +18,7 @@
*/
package org.apache.sling.atom.taglib.media;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.abdera.ext.media.MediaConstants;
@@ -26,9 +27,7 @@
import org.apache.abdera.ext.media.MediaThumbnail;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.atom.taglib.AbstractAbderaHandler;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class MediaThumbnailTagHandler extends AbstractAbderaHandler {
@@ -76,7 +75,7 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
MediaThumbnail thumbnail;
Modified: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTitleTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTitleTagHandler.java?rev=782894&r1=782893&r2=782894&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTitleTagHandler.java (original)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTitleTagHandler.java Tue Jun 9 06:19:03 2009
@@ -18,6 +18,7 @@
*/
package org.apache.sling.atom.taglib.media;
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import org.apache.abdera.ext.media.MediaConstants;
@@ -27,9 +28,7 @@
import org.apache.abdera.ext.media.MediaConstants.Type;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.atom.taglib.AbstractAbderaHandler;
-import org.apache.sling.scripting.jsp.util.TagUtil;
public class MediaTitleTagHandler extends AbstractAbderaHandler {
@@ -39,7 +38,7 @@
@Override
public int doEndTag() throws JspException {
- final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+ final ServletRequest request = pageContext.getRequest();
MediaTitle title;