Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 55010 invoked from network); 29 Dec 2009 10:37:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Dec 2009 10:37:31 -0000 Received: (qmail 81065 invoked by uid 500); 29 Dec 2009 10:37:31 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 81011 invoked by uid 500); 29 Dec 2009 10:37:31 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 81002 invoked by uid 99); 29 Dec 2009 10:37:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Dec 2009 10:37:30 +0000 X-ASF-Spam-Status: No, hits=-4.1 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Dec 2009 10:37:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 592B223889FD; Tue, 29 Dec 2009 10:36:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r894342 - in /sling/trunk/samples: ./ slingshot/ slingshot/src/ slingshot/src/main/ slingshot/src/main/java/ slingshot/src/main/java/org/ slingshot/src/main/java/org/apache/ slingshot/src/main/java/org/apache/sling/ slingshot/src/main/java/... Date: Tue, 29 Dec 2009 10:36:58 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091229103659.592B223889FD@eris.apache.org> Author: cziegeler Date: Tue Dec 29 10:36:56 2009 New Revision: 894342 URL: http://svn.apache.org/viewvc?rev=894342&view=rev Log: Add new Slingshot sample application. Added: sling/trunk/samples/slingshot/ sling/trunk/samples/slingshot/LICENSE (with props) sling/trunk/samples/slingshot/NOTICE (with props) sling/trunk/samples/slingshot/README.txt (with props) sling/trunk/samples/slingshot/pom.xml (with props) sling/trunk/samples/slingshot/src/ sling/trunk/samples/slingshot/src/main/ sling/trunk/samples/slingshot/src/main/java/ sling/trunk/samples/slingshot/src/main/java/org/ sling/trunk/samples/slingshot/src/main/java/org/apache/ sling/trunk/samples/slingshot/src/main/java/org/apache/sling/ sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/ sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/ sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/Constants.java (with props) sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/impl/ sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/impl/ResourceTypeConversionServlet.java (with props) sling/trunk/samples/slingshot/src/main/resources/ sling/trunk/samples/slingshot/src/main/resources/META-INF/ sling/trunk/samples/slingshot/src/main/resources/META-INF/LICENSE (with props) sling/trunk/samples/slingshot/src/main/resources/META-INF/NOTICE (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album.json (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/html.jsp (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/photolist.html.jsp (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tags.html.jsp (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/trail.html.jsp (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tree.html.jsp (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/treeentry.html.jsp (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo.json (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/html.jsp (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/main.html.jsp (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Tag/ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Tag/html.jsp (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot.json (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums.json (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel.json (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/ApacheCon/ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/ApacheCon.json (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/Europe/ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/Europe.json (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/tags.json (with props) sling/trunk/samples/slingshot/src/main/resources/SLING-INF/nodetypes/ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/nodetypes/slingshot.cnd (with props) Modified: sling/trunk/samples/pom.xml Modified: sling/trunk/samples/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/samples/pom.xml?rev=894342&r1=894341&r2=894342&view=diff ============================================================================== --- sling/trunk/samples/pom.xml (original) +++ sling/trunk/samples/pom.xml Tue Dec 29 10:36:56 2009 @@ -62,6 +62,7 @@ path-based-rtp post-servlet-extensions simple-demo + slingshot webloader/service webloader/ui Added: sling/trunk/samples/slingshot/LICENSE URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/LICENSE?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/LICENSE (added) +++ sling/trunk/samples/slingshot/LICENSE Tue Dec 29 10:36:56 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: sling/trunk/samples/slingshot/LICENSE ------------------------------------------------------------------------------ svn:eol-style = native Added: sling/trunk/samples/slingshot/NOTICE URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/NOTICE?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/NOTICE (added) +++ sling/trunk/samples/slingshot/NOTICE Tue Dec 29 10:36:56 2009 @@ -0,0 +1,9 @@ +Apache Sling Slingshot Sample +Copyright 2009 The Apache Software Foundation + +Apache Sling is based on source code originally developed +by Day Software (http://www.day.com/). + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + Propchange: sling/trunk/samples/slingshot/NOTICE ------------------------------------------------------------------------------ svn:eol-style = native Added: sling/trunk/samples/slingshot/README.txt URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/README.txt?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/README.txt (added) +++ sling/trunk/samples/slingshot/README.txt Tue Dec 29 10:36:56 2009 @@ -0,0 +1,29 @@ +Apache Sling Slingshot Sample + +This bundle provides a sample application for Apache Sling. +Slingshot privdes a basic gallery application presenting folders as albums +and files as photos. + +Getting Started +=============== + +This component uses a Maven 2 (http://maven.apache.org/) build +environment. It requires a Java 5 JDK (or higher) and Maven (http://maven.apache.org/) +2.0.10 or later. We recommend to use the latest Maven version. + +If you have Maven 2 installed, you can compile and +package the jar using the following command: + + mvn package + +See the Maven 2 documentation for other build features. + +The latest source code for this component is available in the +Subversion (http://subversion.tigris.org/) source repository of +the Apache Software Foundation. If you have Subversion installed, +you can checkout the latest source using the following command: + + svn checkout http://svn.apache.org/repos/asf/sling/trunk/samples/simple-demo + +See the Subversion documentation for other source control features. + Propchange: sling/trunk/samples/slingshot/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/README.txt ------------------------------------------------------------------------------ svn:keywords = Id Propchange: sling/trunk/samples/slingshot/README.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: sling/trunk/samples/slingshot/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/pom.xml?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/pom.xml (added) +++ sling/trunk/samples/slingshot/pom.xml Tue Dec 29 10:36:56 2009 @@ -0,0 +1,106 @@ + + + + 4.0.0 + + org.apache.sling + sling + 8 + + + org.apache.sling.sample.slingshot + 0.8.0-SNAPSHOT + bundle + + Apache Sling - Slingshot Demo + + + + + false + + + + + + + org.apache.felix + maven-scr-plugin + + + + org.apache.felix + maven-bundle-plugin + true + + + + + SLING-INF/nodetypes/slingshot.cnd + + + + + SLING-INF/content/slingshot;overwrite:=true;path:=/slingshot;maven:mount:=false, + SLING-INF/content/libs/slingshot;overwrite:=true;path:=/libs/slingshot;maven:mount:=true + + + + + + org.apache.sling + maven-sling-plugin + + + install-bundle + + validate + install + + + ${fileMount} + + + + + + + + + + org.apache.felix + org.apache.felix.scr.annotations + 1.2.0 + compile + + + org.apache.sling + org.apache.sling.api + 2.0.8 + provided + + + org.apache.sling + org.apache.sling.scripting.jsp.taglib + 2.0.6 + provided + + + Propchange: sling/trunk/samples/slingshot/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/pom.xml ------------------------------------------------------------------------------ svn:keywords = Id Propchange: sling/trunk/samples/slingshot/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/Constants.java URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/Constants.java?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/Constants.java (added) +++ sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/Constants.java Tue Dec 29 10:36:56 2009 @@ -0,0 +1,44 @@ +/* + * 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.sample.slingshot; + +public interface Constants { + + /** This is the resource path for the root of our application. */ + String APP_ROOT = "/slingshot"; + + /** This is the resource path for the root album. */ + String ALBUMS_ROOT = APP_ROOT + "/albums"; + + /** The resource type of a folder (= album) */ + String RESOURCETYPE_FOLDER = "nt:folder"; + + /** The resource type of an extended folder (= album) */ + String RESOURCETYPE_EXT_FOLDER = "sling:Folder"; + + /** The resource type for an album. */ + String RESOURCETYPE_ALBUM = "slingshot/Album"; + + /** The resource type of a file (= photo) */ + String RESOURCETYPE_FILE = "nt:file"; + + /** The resource type for a photo. */ + String RESOURCETYPE_PHOTO = "slingshot/Photo"; + + /** The property containing the tags. */ + String PROPERTY_SLINGSHOT_TAGS = "slingshot:tags"; +} Propchange: sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/Constants.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/Constants.java ------------------------------------------------------------------------------ svn:keywords = author date id revision rev url Propchange: sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/Constants.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/impl/ResourceTypeConversionServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/impl/ResourceTypeConversionServlet.java?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/impl/ResourceTypeConversionServlet.java (added) +++ sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/impl/ResourceTypeConversionServlet.java Tue Dec 29 10:36:56 2009 @@ -0,0 +1,96 @@ +/* + * 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.sample.slingshot.impl; + +import java.io.IOException; + +import javax.servlet.ServletException; + +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Properties; +import org.apache.felix.scr.annotations.Property; +import org.apache.felix.scr.annotations.Service; +import org.apache.sling.api.SlingHttpServletRequest; +import org.apache.sling.api.SlingHttpServletResponse; +import org.apache.sling.api.request.RequestDispatcherOptions; +import org.apache.sling.api.resource.Resource; +import org.apache.sling.api.resource.ResourceUtil; +import org.apache.sling.api.servlets.OptingServlet; +import org.apache.sling.api.servlets.SlingAllMethodsServlet; +import org.apache.sling.sample.slingshot.Constants; + +/** + * This opting servlet "converts" the standard resource types + * nt:file, sling:Folder and nt:filder to the resource types used inside + * Slingshot. + * + * We only accept requests to those resource types and only + * if the resource is within the Slingshot albums folder. + * The selector needs to be "slingshot" + * + */ +@SuppressWarnings("serial") +@Component(metatype=false) +@Service(value=javax.servlet.Servlet.class) +@Properties({ + @Property(name="sling.servlet.resourceTypes",value={Constants.RESOURCETYPE_FILE, + Constants.RESOURCETYPE_FOLDER, + Constants.RESOURCETYPE_EXT_FOLDER}), + @Property(name="service.description", + value="Apache Sling - Slingshot Resource Type Conversion Servlet") +}) +public class ResourceTypeConversionServlet + extends SlingAllMethodsServlet + implements OptingServlet { + + @Property(name="sling.servlet.extensions") + protected static final String EXTENSION = "html"; + + @Property(name="sling.servlet.selectors") + protected static final String SELECTOR = "slingshot"; + + /** + * @see org.apache.sling.api.servlets.OptingServlet#accepts(org.apache.sling.api.SlingHttpServletRequest) + */ + public boolean accepts(SlingHttpServletRequest request) { + // check everything again (except the resource type) + return request.getResource().getPath().startsWith(Constants.ALBUMS_ROOT) + && EXTENSION.equals(request.getRequestPathInfo().getExtension()) + && SELECTOR.equals(request.getRequestPathInfo().getSelectorString()); + } + + private String getResourceType(final Resource resource) { + if ( ResourceUtil.isA(resource, Constants.RESOURCETYPE_FILE) ) { + return Constants.RESOURCETYPE_PHOTO; + } + return Constants.RESOURCETYPE_ALBUM; + } + + /** + * @see org.apache.sling.api.servlets.SlingSafeMethodsServlet#doGet(org.apache.sling.api.SlingHttpServletRequest, org.apache.sling.api.SlingHttpServletResponse) + */ + protected void doGet(SlingHttpServletRequest request, + SlingHttpServletResponse response) + throws ServletException, IOException { + final RequestDispatcherOptions options = new RequestDispatcherOptions(); + // force new resource type + options.setForceResourceType(this.getResourceType(request.getResource())); + // remove all selectors + options.setReplaceSelectors(""); + request.getRequestDispatcher(request.getResource(), options).forward(request, response); + } +} Propchange: sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/impl/ResourceTypeConversionServlet.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/impl/ResourceTypeConversionServlet.java ------------------------------------------------------------------------------ svn:keywords = author date id revision rev url Propchange: sling/trunk/samples/slingshot/src/main/java/org/apache/sling/sample/slingshot/impl/ResourceTypeConversionServlet.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: sling/trunk/samples/slingshot/src/main/resources/META-INF/LICENSE URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/META-INF/LICENSE?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/META-INF/LICENSE (added) +++ sling/trunk/samples/slingshot/src/main/resources/META-INF/LICENSE Tue Dec 29 10:36:56 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: sling/trunk/samples/slingshot/src/main/resources/META-INF/LICENSE ------------------------------------------------------------------------------ svn:eol-style = native Added: sling/trunk/samples/slingshot/src/main/resources/META-INF/NOTICE URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/META-INF/NOTICE?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/META-INF/NOTICE (added) +++ sling/trunk/samples/slingshot/src/main/resources/META-INF/NOTICE Tue Dec 29 10:36:56 2009 @@ -0,0 +1,9 @@ +Apache Sling Slingshot Sample +Copyright 2009 The Apache Software Foundation + +Apache Sling is based on source code originally developed +by Day Software (http://www.day.com/). + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + Propchange: sling/trunk/samples/slingshot/src/main/resources/META-INF/NOTICE ------------------------------------------------------------------------------ svn:eol-style = native Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album.json URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album.json?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album.json (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album.json Tue Dec 29 10:36:56 2009 @@ -0,0 +1,4 @@ +{ + "jcr:mixinTypes":["sling:ResourceSuperType"], + "sling:resourceSuperType":"nt:folder" +} \ No newline at end of file Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album.json ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album.json ------------------------------------------------------------------------------ svn:keywords = Id Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/html.jsp URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/html.jsp?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/html.jsp (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/html.jsp Tue Dec 29 10:36:56 2009 @@ -0,0 +1,82 @@ +<%-- + 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. +--%><%@page session="false" %><% +%><%@page import="java.util.ArrayList, + java.util.Iterator, + java.util.List, + org.apache.sling.api.resource.Resource, + org.apache.sling.api.resource.ResourceUtil, + org.apache.sling.api.resource.ValueMap, + org.apache.sling.sample.slingshot.Constants" %><% +%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><% +%><% + +final ValueMap attributes = resource.adaptTo(ValueMap.class); +final String albumName = attributes.get("jcr:title", ResourceUtil.getName(resource)); +%> + + Album <%= albumName %> + + + +

<%= albumName %>

+ + +
+ + + + \ No newline at end of file Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/html.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/html.jsp ------------------------------------------------------------------------------ svn:keywords = Id Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/html.jsp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/photolist.html.jsp URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/photolist.html.jsp?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/photolist.html.jsp (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/photolist.html.jsp Tue Dec 29 10:36:56 2009 @@ -0,0 +1,39 @@ +<%-- + 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. +--%><%@page session="false" %><% +%><%@page import="java.util.Iterator, + java.util.List, + org.apache.sling.api.resource.Resource, + org.apache.sling.api.resource.ResourceUtil, + org.apache.sling.sample.slingshot.Constants" %><% +%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><% +%><% +%>
+ <% + int i = 0; + final Iterator fi = ResourceUtil.listChildren(resource); + while ( fi.hasNext()) { + final Resource current = fi.next(); + if ( ResourceUtil.isA(current, Constants.RESOURCETYPE_FILE) ) { + %> + + <% + } + } + %> +
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/photolist.html.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/photolist.html.jsp ------------------------------------------------------------------------------ svn:keywords = Id Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/photolist.html.jsp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tags.html.jsp URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tags.html.jsp?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tags.html.jsp (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tags.html.jsp Tue Dec 29 10:36:56 2009 @@ -0,0 +1,38 @@ +<%-- + 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. +--%><%@page session="false" %><% +%><%@page import="java.util.Iterator, + org.apache.sling.api.resource.Resource, + org.apache.sling.api.resource.ResourceUtil, + org.apache.sling.api.resource.ValueMap" %><% +%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><% +%><% +%>
+
Tags:
+ <% + final Resource tags = resource.getResourceResolver().getResource("/slingshot/tags"); + if ( tags != null ) { + final Iterator ni = tags.getResourceResolver().listChildren(tags); + while ( ni.hasNext() ) { + final Resource current = ni.next(); + final ValueMap attr = ResourceUtil.getValueMap(current); + %>
<%=ResourceUtil.getName(current) %>
<% + } + } + %> +
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tags.html.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tags.html.jsp ------------------------------------------------------------------------------ svn:keywords = Id Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tags.html.jsp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/trail.html.jsp URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/trail.html.jsp?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/trail.html.jsp (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/trail.html.jsp Tue Dec 29 10:36:56 2009 @@ -0,0 +1,51 @@ +<%-- + 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. +--%><%@page session="false" %><% +%><%@page import="java.util.ArrayList, + java.util.List, + org.apache.sling.api.resource.Resource, + org.apache.sling.api.resource.ResourceUtil, + org.apache.sling.api.resource.ValueMap, + org.apache.sling.sample.slingshot.Constants" %><% +%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><% +%><% +%>
Trail:
+ <% + final ValueMap attributes = ResourceUtil.getValueMap(resource); + // let's create the trail + final List parents = new ArrayList(); + if ( resource.getPath().startsWith(Constants.ALBUMS_ROOT + '/') ) { + Resource parent = ResourceUtil.getParent(resource); + String prefix = "../"; + boolean continueProcessing = true; + do { + final ValueMap parentAttr = ResourceUtil.getValueMap(parent); + final String parentName = ResourceUtil.getName(parent); + parents.add(new Object[] {prefix + parentName, parentAttr.get("jcr:title", parentName)}); + parent = ResourceUtil.getParent(parent); + prefix = prefix + "../"; + if ( parent.getPath().equals(Constants.APP_ROOT) ) { + continueProcessing = false; + } + } while ( continueProcessing); + } + for(int k=parents.size()-1;k>=0;k--) { + %>
<%=parents.get(k)[1] %>
<% + } + %> +
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/trail.html.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/trail.html.jsp ------------------------------------------------------------------------------ svn:keywords = Id Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/trail.html.jsp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tree.html.jsp URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tree.html.jsp?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tree.html.jsp (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tree.html.jsp Tue Dec 29 10:36:56 2009 @@ -0,0 +1,38 @@ +<%-- + 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. +--%><%@page session="false" %><% +%><%@page import="java.util.Iterator, + org.apache.sling.api.resource.Resource, + org.apache.sling.api.resource.ResourceUtil, + org.apache.sling.sample.slingshot.Constants" %><% +%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><% +%><% +%>
+
+

Contained Albums

+ <% + final Iterator ri = ResourceUtil.listChildren(resource); + while ( ri.hasNext()) { + final Resource current = ri.next(); + if ( ResourceUtil.isA(current, Constants.RESOURCETYPE_FOLDER) ) { + %><% + } + } + %> +
+
\ No newline at end of file Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tree.html.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tree.html.jsp ------------------------------------------------------------------------------ svn:keywords = Id Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/tree.html.jsp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/treeentry.html.jsp URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/treeentry.html.jsp?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/treeentry.html.jsp (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/treeentry.html.jsp Tue Dec 29 10:36:56 2009 @@ -0,0 +1,27 @@ +<%-- + 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. +--%><%@page session="false" %><% +%><%@page import="org.apache.sling.api.resource.Resource, + org.apache.sling.api.resource.ResourceUtil, + org.apache.sling.api.resource.ValueMap" %><% +%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><% +%><% + ValueMap attributes = ResourceUtil.getValueMap(resource); + Resource parent = ResourceUtil.getParent(resource); + String name = ResourceUtil.getName(resource); +%>- <%=attributes.get("jcr:title", name) %>
\ No newline at end of file Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/treeentry.html.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/treeentry.html.jsp ------------------------------------------------------------------------------ svn:keywords = Id Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Album/treeentry.html.jsp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo.json URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo.json?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo.json (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo.json Tue Dec 29 10:36:56 2009 @@ -0,0 +1,4 @@ +{ + "jcr:mixinTypes":["sling:ResourceSuperType"], + "sling:resourceSuperType":"nt:file" +} \ No newline at end of file Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo.json ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo.json ------------------------------------------------------------------------------ svn:keywords = Id Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/html.jsp URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/html.jsp?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/html.jsp (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/html.jsp Tue Dec 29 10:36:56 2009 @@ -0,0 +1,48 @@ +<%-- + 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. +--%><%@page session="false" %><% +%><%@page import="java.util.Map" %><% +%><%@page import="org.apache.sling.api.resource.ResourceUtil, + org.apache.sling.api.resource.ValueMap"%><% +%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><% +%><% +final ValueMap attributes = ResourceUtil.getValueMap(resource); +final String photoName = attributes.get("jcr:title", ResourceUtil.getName(resource)); +%> + + <%= photoName %> + + +

<%= photoName %>

+ +

Description: <%=attributes.get("jcr:description", "")%>

+

Location: <%=attributes.get("slingshot:location", "")%>

+

Tags:  +<% + String[] values = attributes.get("slingshot:tags", String[].class); + if (values != null ) { + for(int k=0;k0) out.write(", "); + out.write(values[k]); + } + + } +%> +

+ + \ No newline at end of file Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/html.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/html.jsp ------------------------------------------------------------------------------ svn:keywords = Id Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/html.jsp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/main.html.jsp URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/main.html.jsp?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/main.html.jsp (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/main.html.jsp Tue Dec 29 10:36:56 2009 @@ -0,0 +1,46 @@ +<%-- + 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. +--%><%@page session="false" %><% +%><%@page import="org.apache.sling.api.resource.Resource, + org.apache.sling.api.resource.ResourceUtil, + org.apache.sling.api.resource.ValueMap" %><% +%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><% +%><% +%>
+<% +final ValueMap attr = ResourceUtil.getValueMap(resource); + final String albumName = ResourceUtil.getName(ResourceUtil.getParent(resource)); + final String photoName = attr.get("jcr:title", ResourceUtil.getName(resource)); + final String relPath = resource.getPath(); + +%> +
+

<%= photoName %>

+

Tags:  +<% +String[] values = attr.get("slingshot:tags", String[].class); +if (values != null ) { + for(int k=0;k0) out.write(", "); + out.write(values[k]); + } + +} +%> +

+
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/main.html.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/main.html.jsp ------------------------------------------------------------------------------ svn:keywords = Id Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Photo/main.html.jsp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Tag/html.jsp URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Tag/html.jsp?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Tag/html.jsp (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Tag/html.jsp Tue Dec 29 10:36:56 2009 @@ -0,0 +1,48 @@ +<%-- + 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. +--%><%@page session="false" %><% +%><%@page import="org.apache.sling.api.resource.Resource, + org.apache.sling.api.resource.ResourceResolver, + org.apache.sling.api.resource.ResourceUtil, + org.apache.sling.api.resource.ValueMap, + java.util.Iterator"%><% +%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><% +%><% + final ValueMap attributes = resource.adaptTo(ValueMap.class); + final String name = ResourceUtil.getName(resource); + final ResourceResolver resolver = resource.getResourceResolver(); +%> + + Tag <%= name %> + + +

Tag <%=name %>

+
+<% + int i = 0; + final Iterator fi = resolver.findResources("SELECT * FROM nt:file WHERE jcr:path LIKE '/slingshot/albums/%' AND slingshot:tags='" + name + "'", "sql"); + while ( fi.hasNext()) { + final Resource current = fi.next(); + %> + + <% + } +%> +
+ + \ No newline at end of file Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Tag/html.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Tag/html.jsp ------------------------------------------------------------------------------ svn:keywords = Id Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/libs/slingshot/Tag/html.jsp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot.json URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot.json?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot.json (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot.json Tue Dec 29 10:36:56 2009 @@ -0,0 +1,3 @@ +{ + "jcr:primaryType":"sling:Folder" +} Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot.json ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot.json ------------------------------------------------------------------------------ svn:keywords = Id Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums.json URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums.json?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums.json (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums.json Tue Dec 29 10:36:56 2009 @@ -0,0 +1,7 @@ +{ + "jcr:primaryType":"sling:Folder", + "jcr:mixinTypes":["slingshot:Album","sling:Resource"], + "sling:resourceType":"slingshot:Album", + "jcr:description":"This is the slingshot root album.", + "jcr:title":"Root Album" +} \ No newline at end of file Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums.json ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums.json ------------------------------------------------------------------------------ svn:keywords = Id Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel.json URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel.json?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel.json (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel.json Tue Dec 29 10:36:56 2009 @@ -0,0 +1,6 @@ +{ + "jcr:primaryType":"nt:folder", + "jcr:mixinTypes":["slingshot:Album"], + "jcr:title":"Travel", + "jcr:description":"All travel related albums." +} \ No newline at end of file Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel.json ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel.json ------------------------------------------------------------------------------ svn:keywords = Id Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/ApacheCon.json URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/ApacheCon.json?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/ApacheCon.json (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/ApacheCon.json Tue Dec 29 10:36:56 2009 @@ -0,0 +1,6 @@ +{ + "jcr:primaryType":"nt:folder", + "jcr:mixinTypes":["slingshot:Album"], + "jcr:title":"Travel ApacheCon", + "jcr:description":"Everything from the various Apache Conferences." +} \ No newline at end of file Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/ApacheCon.json ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/ApacheCon.json ------------------------------------------------------------------------------ svn:keywords = Id Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/Europe.json URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/Europe.json?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/Europe.json (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/Europe.json Tue Dec 29 10:36:56 2009 @@ -0,0 +1,6 @@ +{ + "jcr:primaryType":"sling:Folder", + "jcr:mixinTypes":["slingshot:Album"], + "jcr:title":"Travel Europe", + "jcr:description":"All travels around Europe." +} \ No newline at end of file Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/Europe.json ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/albums/travel/Europe.json ------------------------------------------------------------------------------ svn:keywords = Id Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/tags.json URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/tags.json?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/tags.json (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/tags.json Tue Dec 29 10:36:56 2009 @@ -0,0 +1,15 @@ +{ + "jcr:primaryType":"sling:Folder", + "ApacheCon" : { + "jcr:primaryType":"slingshot:Tag", + "jcr:description":"Photos from the ApacheCons." + }, + "Vacation" : { + "jcr:primaryType":"slingshot:Tag", + "jcr:description":"Photos shot during vacations." + }, + "Cool" : { + "jcr:primaryType":"slingshot:Tag", + "jcr:description":"Very cool photos." + } +} \ No newline at end of file Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/tags.json ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/tags.json ------------------------------------------------------------------------------ svn:keywords = Id Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/nodetypes/slingshot.cnd URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/nodetypes/slingshot.cnd?rev=894342&view=auto ============================================================================== --- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/nodetypes/slingshot.cnd (added) +++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/nodetypes/slingshot.cnd Tue Dec 29 10:36:56 2009 @@ -0,0 +1,16 @@ + + + + +[slingshot:Album] > mix:title mixin +- slingshot:date (date) + +[slingshot:Photo] > mix:title mixin +- slingshot:location (string) +- slingshot:tags (string) multiple + +[slingshot:Tag] > mix:title, nt:base + +[mix:title] mixin + - jcr:title (string) + - jcr:description (string) Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/nodetypes/slingshot.cnd ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/nodetypes/slingshot.cnd ------------------------------------------------------------------------------ svn:keywords = Id