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/08 16:01:21 UTC

svn commit: r782630 [2/2] - in /incubator/sling/trunk/contrib/scripting/jsp-taglib-atom: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/sling/ src/main/java/org/apache/sling/atom/ src/main/java/or...

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCreditTagHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaCreditTagHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev Url

Added: 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=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaDescriptionTagHandler.java (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaDescriptionTagHandler.java Mon Jun  8 14:01:19 2009
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.atom.taglib.media;
+
+import javax.servlet.jsp.JspException;
+
+import org.apache.abdera.ext.media.MediaConstants;
+import org.apache.abdera.ext.media.MediaContent;
+import org.apache.abdera.ext.media.MediaDescription;
+import org.apache.abdera.ext.media.MediaGroup;
+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 {
+
+    private static final long serialVersionUID = 1L;
+
+    private String type;
+
+    @Override
+    public int doEndTag() throws JspException {
+        final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+
+        MediaDescription description;
+
+        if (request.getAttribute("content") != null
+            && request.getAttribute("content") instanceof MediaContent) {
+            description = ((MediaContent) request.getAttribute("content")).addExtension(MediaConstants.DESCRIPTION);
+        } else if (request.getAttribute("group") != null
+            && request.getAttribute("group") instanceof MediaGroup) {
+            description = ((MediaGroup) request.getAttribute("group")).addExtension(MediaConstants.DESCRIPTION);
+        } else if (request.getAttribute("entry") != null
+            && request.getAttribute("entry") instanceof Entry) {
+            description = ((Entry) request.getAttribute("entry")).addExtension(MediaConstants.DESCRIPTION);
+        } else {
+            description = ((Feed) request.getAttribute("feed")).addExtension(MediaConstants.DESCRIPTION);
+        }
+
+        // set the body content
+        description.setText(getBodyContent().getString());
+        // set the scheme
+        if (type != null) description.setType(Type.valueOf(type));
+
+        return super.doEndTag();
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public int doStartTag() {
+        return EVAL_BODY_BUFFERED;
+    }
+
+}

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaDescriptionTagHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaDescriptionTagHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev Url

Added: 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=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaGroupTagHandler.java (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaGroupTagHandler.java Mon Jun  8 14:01:19 2009
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.atom.taglib.media;
+
+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 {
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public int doEndTag() throws JspException {
+        final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+        // clear out the group
+        request.setAttribute("group", null);
+
+        return super.doEndTag();
+    }
+
+    @Override
+    public int doStartTag() {
+        Entry entry = getEntry();
+        // create the group element
+
+        getAbdera().getConfiguration().getExtensionFactories();
+        Object group = entry.addExtension(MediaConstants.GROUP);
+        final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+        request.setAttribute("group", group);
+
+        return EVAL_BODY_INCLUDE;
+    }
+
+}

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaGroupTagHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaGroupTagHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev Url

Added: 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=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaHashTagHandler.java (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaHashTagHandler.java Mon Jun  8 14:01:19 2009
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.atom.taglib.media;
+
+import javax.servlet.jsp.JspException;
+
+import org.apache.abdera.ext.media.MediaConstants;
+import org.apache.abdera.ext.media.MediaContent;
+import org.apache.abdera.ext.media.MediaGroup;
+import org.apache.abdera.ext.media.MediaHash;
+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 {
+
+    private static final long serialVersionUID = 1L;
+
+    private String algo;
+
+    @Override
+    public int doEndTag() throws JspException {
+        final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+
+        MediaHash hash;
+
+        if (request.getAttribute("content") != null
+            && request.getAttribute("content") instanceof MediaContent) {
+            hash = ((MediaContent) request.getAttribute("content")).addExtension(MediaConstants.HASH);
+        } else if (request.getAttribute("group") != null
+            && request.getAttribute("group") instanceof MediaGroup) {
+            hash = ((MediaGroup) request.getAttribute("group")).addExtension(MediaConstants.HASH);
+        } else if (request.getAttribute("entry") != null
+            && request.getAttribute("entry") instanceof Entry) {
+            hash = ((Entry) request.getAttribute("entry")).addExtension(MediaConstants.HASH);
+        } else {
+            hash = ((Feed) request.getAttribute("feed")).addExtension(MediaConstants.HASH);
+        }
+
+        // set the body content
+        hash.setText(getBodyContent().getString());
+        // set the scheme
+        if (algo != null) hash.setAlgorithm(Algo.valueOf(algo));
+
+        return super.doEndTag();
+    }
+
+    @Override
+    public int doStartTag() {
+        return EVAL_BODY_BUFFERED;
+    }
+
+}

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaHashTagHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaHashTagHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev Url

Added: 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=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaKeywordsTagHandler.java (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaKeywordsTagHandler.java Mon Jun  8 14:01:19 2009
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.atom.taglib.media;
+
+import javax.servlet.jsp.JspException;
+
+import org.apache.abdera.ext.media.MediaConstants;
+import org.apache.abdera.ext.media.MediaContent;
+import org.apache.abdera.ext.media.MediaGroup;
+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 {
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public int doEndTag() throws JspException {
+        final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+
+        MediaKeywords keywords;
+
+        if (request.getAttribute("content") != null
+            && request.getAttribute("content") instanceof MediaContent) {
+            keywords = ((MediaContent) request.getAttribute("content")).addExtension(MediaConstants.KEYWORDS);
+        } else if (request.getAttribute("group") != null
+            && request.getAttribute("group") instanceof MediaGroup) {
+            keywords = ((MediaGroup) request.getAttribute("group")).addExtension(MediaConstants.KEYWORDS);
+        } else if (request.getAttribute("entry") != null
+            && request.getAttribute("entry") instanceof Entry) {
+            keywords = ((Entry) request.getAttribute("entry")).addExtension(MediaConstants.KEYWORDS);
+        } else {
+            keywords = ((Feed) request.getAttribute("feed")).addExtension(MediaConstants.KEYWORDS);
+        }
+
+        // set the body content
+        keywords.setText(getBodyContent().getString());
+
+        return super.doEndTag();
+    }
+
+    @Override
+    public int doStartTag() {
+        return EVAL_BODY_BUFFERED;
+    }
+
+}

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaKeywordsTagHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaKeywordsTagHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev Url

Added: 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=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaPlayerTagHandler.java (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaPlayerTagHandler.java Mon Jun  8 14:01:19 2009
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.atom.taglib.media;
+
+import javax.servlet.jsp.JspException;
+
+import org.apache.abdera.ext.media.MediaConstants;
+import org.apache.abdera.ext.media.MediaContent;
+import org.apache.abdera.ext.media.MediaGroup;
+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 {
+
+    private static final long serialVersionUID = 1L;
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    private String url;
+
+    private int width;
+
+    private int height;
+
+    @Override
+    public int doEndTag() throws JspException {
+        final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+
+        MediaPlayer player;
+
+        if (request.getAttribute("content") != null
+            && request.getAttribute("content") instanceof MediaContent) {
+            player = ((MediaContent) request.getAttribute("content")).addExtension(MediaConstants.PLAYER);
+        } else if (request.getAttribute("group") != null
+            && request.getAttribute("group") instanceof MediaGroup) {
+            player = ((MediaGroup) request.getAttribute("group")).addExtension(MediaConstants.PLAYER);
+        } else if (request.getAttribute("entry") != null
+            && request.getAttribute("entry") instanceof Entry) {
+            player = ((Entry) request.getAttribute("entry")).addExtension(MediaConstants.PLAYER);
+        } else {
+            player = ((Feed) request.getAttribute("feed")).addExtension(MediaConstants.PLAYER);
+        }
+
+        // set the scheme
+        player.setUrl(url);
+        if (width != 0) player.setWidth(width);
+        if (height != 0) player.setHeight(height);
+
+        return super.doEndTag();
+    }
+
+    @Override
+    public int doStartTag() {
+        return EVAL_BODY_BUFFERED;
+    }
+
+}

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaPlayerTagHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaPlayerTagHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev Url

Added: 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=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRatingTagHandler.java (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRatingTagHandler.java Mon Jun  8 14:01:19 2009
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.atom.taglib.media;
+
+import javax.servlet.jsp.JspException;
+
+import org.apache.abdera.ext.media.MediaConstants;
+import org.apache.abdera.ext.media.MediaContent;
+import org.apache.abdera.ext.media.MediaGroup;
+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 {
+
+    private static final long serialVersionUID = 1L;
+
+    private String scheme;
+
+    @Override
+    public int doEndTag() throws JspException {
+        final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+
+        MediaRating rating;
+
+        if (request.getAttribute("content") != null
+            && request.getAttribute("content") instanceof MediaContent) {
+            rating = ((MediaContent) request.getAttribute("content")).addExtension(MediaConstants.RATING);
+        } else if (request.getAttribute("group") != null
+            && request.getAttribute("group") instanceof MediaGroup) {
+            rating = ((MediaGroup) request.getAttribute("group")).addExtension(MediaConstants.RATING);
+        } else if (request.getAttribute("entry") != null
+            && request.getAttribute("entry") instanceof Entry) {
+            rating = ((Entry) request.getAttribute("entry")).addExtension(MediaConstants.RATING);
+        } else {
+            rating = ((Feed) request.getAttribute("feed")).addExtension(MediaConstants.RATING);
+        }
+
+        // set the body content
+        rating.setText(getBodyContent().getString());
+        // set the scheme
+        if (scheme != null) rating.setScheme(scheme);
+
+        return super.doEndTag();
+    }
+
+    public String getScheme() {
+        return scheme;
+    }
+
+    public void setScheme(String scheme) {
+        this.scheme = scheme;
+    }
+
+    @Override
+    public int doStartTag() {
+        return EVAL_BODY_BUFFERED;
+    }
+
+}

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRatingTagHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRatingTagHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev Url

Added: 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=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRestrictionTagHandler.java (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRestrictionTagHandler.java Mon Jun  8 14:01:19 2009
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.atom.taglib.media;
+
+import javax.servlet.jsp.JspException;
+
+import org.apache.abdera.ext.media.MediaConstants;
+import org.apache.abdera.ext.media.MediaContent;
+import org.apache.abdera.ext.media.MediaGroup;
+import org.apache.abdera.ext.media.MediaRestriction;
+import org.apache.abdera.ext.media.MediaConstants.Relationship;
+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 {
+
+    private static final long serialVersionUID = 1L;
+
+    private String relationship;
+
+    private String type;
+
+    @Override
+    public int doEndTag() throws JspException {
+        final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+
+        MediaRestriction restriction;
+
+        if (request.getAttribute("content") != null
+            && request.getAttribute("content") instanceof MediaContent) {
+            restriction = ((MediaContent) request.getAttribute("content")).addExtension(MediaConstants.RESTRICTION);
+        } else if (request.getAttribute("group") != null
+            && request.getAttribute("group") instanceof MediaGroup) {
+            restriction = ((MediaGroup) request.getAttribute("group")).addExtension(MediaConstants.RESTRICTION);
+        } else if (request.getAttribute("entry") != null
+            && request.getAttribute("entry") instanceof Entry) {
+            restriction = ((Entry) request.getAttribute("entry")).addExtension(MediaConstants.RESTRICTION);
+        } else {
+            restriction = ((Feed) request.getAttribute("feed")).addExtension(MediaConstants.RESTRICTION);
+        }
+
+        // set the body content
+        restriction.setText(getBodyContent().getString());
+        // set the scheme
+        if (relationship != null)
+            restriction.setRelationship(Relationship.valueOf(relationship));
+        if (type != null) restriction.setType(RestrictionType.valueOf(type));
+
+        return super.doEndTag();
+    }
+
+    public String getRelationship() {
+        return relationship;
+    }
+
+    public void setRelationship(String relationship) {
+        this.relationship = relationship;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public int doStartTag() {
+        return EVAL_BODY_BUFFERED;
+    }
+
+}

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRestrictionTagHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaRestrictionTagHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev Url

Added: 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=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTextTagHandler.java (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTextTagHandler.java Mon Jun  8 14:01:19 2009
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.atom.taglib.media;
+
+import javax.servlet.jsp.JspException;
+
+import org.apache.abdera.ext.media.MediaConstants;
+import org.apache.abdera.ext.media.MediaContent;
+import org.apache.abdera.ext.media.MediaGroup;
+import org.apache.abdera.ext.media.MediaText;
+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 {
+
+    private static final long serialVersionUID = 1L;
+
+    public String getStart() {
+        return start;
+    }
+
+    public void setStart(String start) {
+        this.start = start;
+    }
+
+    public String getEnd() {
+        return end;
+    }
+
+    public void setEnd(String end) {
+        this.end = end;
+    }
+
+    public String getLang() {
+        return lang;
+    }
+
+    public void setLang(String lang) {
+        this.lang = lang;
+    }
+
+    private String start;
+
+    private String end;
+
+    private String lang;
+
+    private String type;
+
+    @Override
+    public int doEndTag() throws JspException {
+        final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+
+        MediaText text;
+
+        if (request.getAttribute("content") != null
+            && request.getAttribute("content") instanceof MediaContent) {
+            text = ((MediaContent) request.getAttribute("content")).addExtension(MediaConstants.TEXT);
+        } else if (request.getAttribute("group") != null
+            && request.getAttribute("group") instanceof MediaGroup) {
+            text = ((MediaGroup) request.getAttribute("group")).addExtension(MediaConstants.TEXT);
+        } else if (request.getAttribute("entry") != null
+            && request.getAttribute("entry") instanceof Entry) {
+            text = ((Entry) request.getAttribute("entry")).addExtension(MediaConstants.TEXT);
+        } else {
+            text = ((Feed) request.getAttribute("feed")).addExtension(MediaConstants.TEXT);
+        }
+
+        // set the body content
+        text.setText(getBodyContent().getString());
+        // set the scheme
+        if (start != null) text.setStart(start);
+        if (end != null) text.setEnd(end);
+        if (lang != null) text.setLang(lang);
+        if (type != null) text.setType(Type.valueOf(type));
+
+        return super.doEndTag();
+    }
+
+    @Override
+    public int doStartTag() {
+        return EVAL_BODY_BUFFERED;
+    }
+
+}

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTextTagHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTextTagHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev Url

Added: 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=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaThumbnailTagHandler.java (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaThumbnailTagHandler.java Mon Jun  8 14:01:19 2009
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.atom.taglib.media;
+
+import javax.servlet.jsp.JspException;
+
+import org.apache.abdera.ext.media.MediaConstants;
+import org.apache.abdera.ext.media.MediaContent;
+import org.apache.abdera.ext.media.MediaGroup;
+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 {
+
+    private static final long serialVersionUID = 1L;
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    private String url;
+
+    private int width;
+
+    private int height;
+
+    private String time;
+
+    @Override
+    public int doEndTag() throws JspException {
+        final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+
+        MediaThumbnail thumbnail;
+
+        if (request.getAttribute("content") != null
+            && request.getAttribute("content") instanceof MediaContent) {
+            thumbnail = ((MediaContent) request.getAttribute("content")).addExtension(MediaConstants.THUMBNAIL);
+        } else if (request.getAttribute("group") != null
+            && request.getAttribute("group") instanceof MediaGroup) {
+            thumbnail = ((MediaGroup) request.getAttribute("group")).addExtension(MediaConstants.THUMBNAIL);
+        } else if (request.getAttribute("entry") != null
+            && request.getAttribute("entry") instanceof Entry) {
+            thumbnail = ((Entry) request.getAttribute("entry")).addExtension(MediaConstants.THUMBNAIL);
+        } else {
+            thumbnail = ((Feed) request.getAttribute("feed")).addExtension(MediaConstants.THUMBNAIL);
+        }
+
+        // set the scheme
+        thumbnail.setUrl(url.replaceAll(" ", "%20"));
+        if (width != 0) thumbnail.setWidth(width);
+        if (height != 0) thumbnail.setHeight(height);
+        if (time != null) thumbnail.setTime(time);
+
+        return super.doEndTag();
+    }
+
+    @Override
+    public int doStartTag() {
+        return EVAL_BODY_BUFFERED;
+    }
+
+}

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaThumbnailTagHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaThumbnailTagHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev Url

Added: 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=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTitleTagHandler.java (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTitleTagHandler.java Mon Jun  8 14:01:19 2009
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.atom.taglib.media;
+
+import javax.servlet.jsp.JspException;
+
+import org.apache.abdera.ext.media.MediaConstants;
+import org.apache.abdera.ext.media.MediaContent;
+import org.apache.abdera.ext.media.MediaGroup;
+import org.apache.abdera.ext.media.MediaTitle;
+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 {
+
+    private static final long serialVersionUID = 1L;
+
+    private String type;
+
+    @Override
+    public int doEndTag() throws JspException {
+        final SlingHttpServletRequest request = TagUtil.getRequest(pageContext);
+
+        MediaTitle title;
+
+        if (request.getAttribute("content") != null
+            && request.getAttribute("content") instanceof MediaContent) {
+            title = ((MediaContent) request.getAttribute("content")).addExtension(MediaConstants.TITLE);
+        } else if (request.getAttribute("group") != null
+            && request.getAttribute("group") instanceof MediaGroup) {
+            title = ((MediaGroup) request.getAttribute("group")).addExtension(MediaConstants.TITLE);
+        } else if (request.getAttribute("entry") != null
+            && request.getAttribute("entry") instanceof Entry) {
+            title = ((Entry) request.getAttribute("entry")).addExtension(MediaConstants.TITLE);
+        } else {
+            title = ((Feed) request.getAttribute("feed")).addExtension(MediaConstants.TITLE);
+        }
+
+        // set the body content
+        title.setText(getBodyContent().getString());
+        // set the scheme
+        if (type != null) title.setType(Type.valueOf(type));
+
+        return super.doEndTag();
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public int doStartTag() {
+        return EVAL_BODY_BUFFERED;
+    }
+
+}

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTitleTagHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/java/org/apache/sling/atom/taglib/media/MediaTitleTagHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev Url

Added: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/DISCLAIMER?rev=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/DISCLAIMER (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/DISCLAIMER Mon Jun  8 14:01:19 2009
@@ -0,0 +1,7 @@
+Apache Sling is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Apache Jackrabbit PMC. Incubation is required of all newly accepted
+projects until a further review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner consistent with other
+successful ASF projects. While incubation status is not necessarily a reflection of
+the completeness or stability of the code, it does indicate that the project has yet
+to be fully endorsed by the ASF.
\ No newline at end of file

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/DISCLAIMER
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/LICENSE?rev=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/LICENSE (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/LICENSE Mon Jun  8 14:01:19 2009
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/NOTICE?rev=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/NOTICE (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/NOTICE Mon Jun  8 14:01:19 2009
@@ -0,0 +1,8 @@
+Apache Sling Atom Tag Library
+Copyright 2009 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Apache Sling is based on source code originally developed 
+by Day Software (http://www.day.com/).

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/atom.tld
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/atom.tld?rev=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/atom.tld (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/atom.tld Mon Jun  8 14:01:19 2009
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+    version="2.0">
+
+    <description>A supporting tab library for Apache Sling that creates Atom feeds using Apache Adbera</description>
+    <tlib-version>1.0</tlib-version>
+    <short-name>atom</short-name>
+    <uri>http://sling.apache.org/taglibs/atom/1.0</uri>
+
+
+    <tag>
+        <name>category</name>
+        <tag-class>org.apache.sling.atom.taglib.CategoryTagHandler</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <name>term</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>label</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scheme</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <tag>
+        <name>author</name>
+        <tag-class>org.apache.sling.atom.taglib.AuthorTagHandler</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <name>name</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>email</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>uri</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>title</name>
+        <tag-class>org.apache.sling.atom.taglib.TitleTagHandler</tag-class>
+        <body-content>JSP</body-content>
+    </tag>
+    
+    <tag>
+        <name>subtitle</name>
+        <tag-class>org.apache.sling.atom.taglib.SubtitleTagHandler</tag-class>
+        <body-content>JSP</body-content>
+    </tag>
+    
+    <tag>
+        <name>summary</name>
+        <tag-class>org.apache.sling.atom.taglib.SummaryTagHandler</tag-class>
+        <body-content>JSP</body-content>
+    </tag>
+    
+    <tag>
+        <name>content</name>
+        <tag-class>org.apache.sling.atom.taglib.ContentTagHandler</tag-class>
+        <body-content>JSP</body-content>
+    </tag>
+    
+    <tag>
+        <name>rights</name>
+        <tag-class>org.apache.sling.atom.taglib.SubtitleTagHandler</tag-class>
+        <body-content>JSP</body-content>
+    </tag>
+    
+    <tag>
+        <name>generator</name>
+        <tag-class>org.apache.sling.atom.taglib.GeneratorTagHandler</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>uri</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>version</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>entry</name>
+        <tag-class>org.apache.sling.atom.taglib.EntryTagHandler</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>draft</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>edited</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>id</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>published</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>updated</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>link</name>
+        <tag-class>org.apache.sling.atom.taglib.LinkTagHandler</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <name>href</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>rel</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>hreflang</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>length</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>contributor</name>
+        <tag-class>org.apache.sling.atom.taglib.ContributorTagHandler</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <name>name</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>email</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>uri</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <description>
+            Creates a feed
+        </description>
+        <name>feed</name>
+        <tag-class>
+            org.apache.sling.atom.taglib.FeedTagHandler
+        </tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>baseUri</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>icon</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>id</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>language</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>logo</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>updated</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    
+
+</taglib>

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/atom.tld
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/mediarss.tld
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/mediarss.tld?rev=782630&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/mediarss.tld (added)
+++ incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/mediarss.tld Mon Jun  8 14:01:19 2009
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+    version="2.0">
+
+    <description>A supporting tab library for Apache Sling that creates Atom feeds with MediaRSS using Apache Adbera</description>
+    <tlib-version>1.0</tlib-version>
+    <short-name>media</short-name>
+    <uri>http://sling.apache.org/taglibs/mediarss/1.0</uri>
+
+
+    <tag>
+	    <name>group</name>
+        <tag-class>org.apache.sling.atom.taglib.media.MediaGroupTagHandler</tag-class>
+        <body-content>JSP</body-content>
+    </tag>
+
+    <tag>
+        <name>content</name>
+        <tag-class>org.apache.sling.atom.taglib.media.MediaContentTagHandler</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>url</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>fileSize</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>medium</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>isDefault</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>expression</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>bitrate</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>framerate</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>samplingrate</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>channels</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>duration</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>height</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>width</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>rating</name>
+        <tag-class>org.apache.sling.atom.taglib.media.MediaRatingTagHandler</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>scheme</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>title</name>
+        <tag-class>org.apache.sling.atom.taglib.media.MediaTitleTagHandler</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    
+    <tag>
+        <name>description</name>
+        <tag-class>org.apache.sling.atom.taglib.media.MediaDescriptionTagHandler</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>hash</name>
+        <tag-class>org.apache.sling.atom.taglib.media.MediaHashTagHandler</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>algo</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>category</name>
+        <tag-class>org.apache.sling.atom.taglib.media.MediaCategoryTagHandler</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>scheme</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>label</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>credit</name>
+        <tag-class>org.apache.sling.atom.taglib.media.MediaCreditTagHandler</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>role</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>scheme</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>copyright</name>
+        <tag-class>org.apache.sling.atom.taglib.media.MediaCopyrightTagHandler</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>url</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>text</name>
+        <tag-class>org.apache.sling.atom.taglib.media.MediaTextTagHandler</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>start</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>end</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>lang</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>restriction</name>
+        <tag-class>org.apache.sling.atom.taglib.media.MediaRestrictionTagHandler</tag-class>
+        <body-content>JSP</body-content>
+        <attribute>
+            <name>type</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>relationship</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>player</name>
+        <tag-class>org.apache.sling.atom.taglib.media.MediaPlayerTagHandler</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <name>url</name>
+            <required>true</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>height</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>width</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>thumbnail</name>
+        <tag-class>org.apache.sling.atom.taglib.media.MediaThumbnailTagHandler</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <name>url</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>height</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>width</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>time</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    
+    <tag>
+        <name>keywords</name>
+        <tag-class>org.apache.sling.atom.taglib.media.MediaKeywordsTagHandler</tag-class>
+        <body-content>JSP</body-content>
+    </tag>
+
+</taglib>

Propchange: incubator/sling/trunk/contrib/scripting/jsp-taglib-atom/src/main/resources/META-INF/mediarss.tld
------------------------------------------------------------------------------
    svn:eol-style = native