incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r608799 - in /incubator/sling/trunk/sling/sample/src/main: resources/SLING-INF/content/apps/ resources/SLING-INF/content/apps/sling/ resources/SLING-INF/content/apps/sling/SampleContent/ resources/SLING-INF/content/apps/sling/SamplePage/ re...
Date Fri, 04 Jan 2008 11:05:19 GMT
Author: cziegeler
Date: Fri Jan  4 03:05:15 2008
New Revision: 608799

URL: http://svn.apache.org/viewvc?rev=608799&view=rev
Log:
Move scripts into apps folder where the resolver is searching.

Added:
    incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/
    incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/
    incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SampleContent/
    incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SampleContent/html.jsp
  (with props)
    incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SamplePage/
    incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SamplePage/html.jsp
  (with props)
    incubator/sling/trunk/sling/sample/src/main/scripts/sling/apps/
    incubator/sling/trunk/sling/sample/src/main/scripts/sling/apps/org/
    incubator/sling/trunk/sling/sample/src/main/scripts/sling/apps/org/apache/
    incubator/sling/trunk/sling/sample/src/main/scripts/sling/apps/org/apache/sling/
    incubator/sling/trunk/sling/sample/src/main/scripts/sling/apps/org/apache/sling/sample/
    incubator/sling/trunk/sling/sample/src/main/scripts/sling/apps/org/apache/sling/sample/html.jsp
  (with props)
Removed:
    incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/sling/
    incubator/sling/trunk/sling/sample/src/main/scripts/sling/scripts/

Added: incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SampleContent/html.jsp
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SampleContent/html.jsp?rev=608799&view=auto
==============================================================================
--- incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SampleContent/html.jsp
(added)
+++ incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SampleContent/html.jsp
Fri Jan  4 03:05:15 2008
@@ -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="org.apache.sling.sample.*" %>
+<%@page import="org.apache.sling.api.*" %>
+<%@page import="org.apache.sling.api.resource.Resource"%>
+<%@page import="java.util.Iterator"%>
+<%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %>
+
+<%-- Ensure the presence of the ComponentAPI objects --%>
+<sling:defineObjects mappedObjectName="sampleContent" mappedObjectClass="SampleContent"
/>
+
+<h1><%= sampleContent.getTitle() %></h1>
+<p><%= sampleContent.getText() %></p>
+<table border="1" cellpadding="3" cellspacing="0">
+<%
+	Iterator<Resource> ci = resourceResolver.listChildren(resource);
+	while (ci.hasNext()) {
+		Resource child = ci.next();
+		%><tr><td><sling:include resource="<%= child %>" /></td></tr><%
+	}
+%>
+</table>
\ No newline at end of file

Propchange: incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SampleContent/html.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SampleContent/html.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SamplePage/html.jsp
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SamplePage/html.jsp?rev=608799&view=auto
==============================================================================
--- incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SamplePage/html.jsp
(added)
+++ incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SamplePage/html.jsp
Fri Jan  4 03:05:15 2008
@@ -0,0 +1,56 @@
+<%--
+    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.sample.*"%>
+<%@page import="org.apache.sling.api.*"%>
+<%@page import="org.apache.sling.api.resource.Resource"%>
+<%@page import="org.apache.sling.jcr.resource.SyntheticResource"%>
+<%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0"%>
+
+<%-- Ensure the presence of the ComponentAPI objects --%>
+<sling:defineObjects mappedObjectName="samplePage" mappedObjectClass="SamplePage" />
+<%-- This is a top level component, so we have to draw the html and head tags --%>
+<html>
+<head>
+<title><%= samplePage.getTitle() %></title>
+</head>
+<body>
+<h1><%= samplePage.getTitle() %></h1>
+
+<table style="border: none; height: 90%;">
+	<tr valign="top">
+		<td
+			style="padding-top: 20px; padding-right: 20px; background-color: cornsilk">
+		<%
+		    final String naviRootPath = "/sample/content";
+		    Resource naviRoot = new SyntheticResource(naviRootPath,
+		        Navigation.RESOURCE_TYPE);
+		%> <sling:include resource="<%= naviRoot %>" /></td>
+		<td>
+		<table>
+			<tr>
+				<td><sling:include path="content" /></td>
+			</tr>
+		</table>
+		</td>
+	</tr>
+</table>
+
+</body>
+</html>
\ No newline at end of file

Propchange: incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SamplePage/html.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/sling/sample/src/main/resources/SLING-INF/content/apps/sling/SamplePage/html.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: incubator/sling/trunk/sling/sample/src/main/scripts/sling/apps/org/apache/sling/sample/html.jsp
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/sample/src/main/scripts/sling/apps/org/apache/sling/sample/html.jsp?rev=608799&view=auto
==============================================================================
--- incubator/sling/trunk/sling/sample/src/main/scripts/sling/apps/org/apache/sling/sample/html.jsp
(added)
+++ incubator/sling/trunk/sling/sample/src/main/scripts/sling/apps/org/apache/sling/sample/html.jsp
Fri Jan  4 03:05:15 2008
@@ -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="org.apache.sling.sample.*" %>
+<%@page import="java.util.*" %>
+<%@page import="org.apache.sling.api.resource.Resource"%>
+<%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %>
+
+<%-- Ensure the presence of the ComponentAPI objects --%>
+<sling:defineObjects mappedObjectName="sampleContent" mappedObjectClass="SampleContent"
/>
+
+<h1><%= sampleContent.getTitle() %></h1>
+<p><%= sampleContent.getText() %></p>
+<table border="1" cellpadding="3" cellspacing="0">
+<%
+	Iterator<Resource> ci = resourceResolver.listChildren(resource);
+	while (ci.hasNext()) {
+		Resource child = ci.next();
+		%><tr><td><sling:include resource="<%= child %>" /></td></tr><%
+	}
+%>
+</table>
\ No newline at end of file

Propchange: incubator/sling/trunk/sling/sample/src/main/scripts/sling/apps/org/apache/sling/sample/html.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/sling/sample/src/main/scripts/sling/apps/org/apache/sling/sample/html.jsp
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message