You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:35:20 UTC
[sling-org-apache-sling-fsresource] annotated tag
org.apache.sling.fsresource-1.0.0 created (now a9919ab)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git.
at a9919ab (tag)
tagging 967d98d2a5ae9acd63186dc2e6a23f71ff8af2f6 (commit)
by Carsten Ziegeler
on Tue Feb 23 12:56:48 2010 +0000
- Log -----------------------------------------------------------------
org.apache.sling.fsresource-1.0.0
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 0c33118 SLING-583 Initial implementation of a filesystem resource provider
new fd8bbdc Code formatting
new 6f617dc SLING-583 Fix FsResourceProvider.listChildren if the provider root is to be return as the single entry in the iterator
new fc83e32 SLING-583 Latest change introduces dependency on JCR API (because a directory is not returned any more as a resource if a repository item with the same name exists)
new 7ab3c81 SLING-583 Cleanup to consistently not return FsResource instances for directories "hiding" existing repository items.
new a46c284 Remove redundant null check
new c361d2a SLING-808 : Increase version to 5-incubator-SNAPSHOT
new a284078 SLING-829 Cosmetics to the bundle/project names
new 6ec1315 SLING-829 Ensure Apache Sling prefix on all configuration names
new 4d89314 SLING-865 - Correct location
new 48e6a1d SLING-865 - Correct pom and svn reference.
new 5150158 SLING-916 move non-exported packages to internal packages and remove javadoc configuration which will be inherited from parent pom
new 19d32c4 Fix fsresource provider and sling plugin after recent refactorings.
new 6799d74 Use release parent pom
new bee824c [maven-release-plugin] prepare release org.apache.sling.fsresource-0.9.0-incubator
new fe60fe1 [maven-release-plugin] prepare for next development iteration
new 8958da0 Use next dev version of parent pom
new 36ccd05 Add missing licence, notice etc.
new 6bcf253 Prepare new release.
new 16644cd [maven-release-plugin] prepare release org.apache.sling.fsresource-0.9.2-incubator
new 746e1d1 [maven-release-plugin] prepare for next development iteration
new 16ecaa5 Use next parent pom for development.
new f943311 Set parent pom to released version.
new ab2cf0f Move Sling to new TLP location
new 501bb88 SLING-1011 : Remove disclaimer file.
new b47fdc9 SLING-1011 : Adjust svn location
new 40f9091 SLING-1011 : Remove disclaimer from readme's, adjust links to webite, fix versions in poms.
new 164dbcf SLING-1033 Upgrade to Sling parent POM 6 (and ensure web app has the leglize stuff, too)
new 2f0cded Use official release instead of incubator release.
new 10c9088 Update to latest Sling releases.
new a8b5bdf Update to latest release.
new 2d2ef3d SLING-1186 Upgrade to Sling Parent POM 8-SNAPSHOT (to use SCR plugin 1.4.0), set DS specification version of components to 1.1, convert component into a regular (non-ComponentFactory) component and ensure meta type descriptor is generated with factoryPid set to the same value as the PID to have factory configuration support.
new 3111d96 SLING-1186 Parent POM 7 is good enough (no need for 8-SNAPSHOT)
new 2051b5f SLING-1187 Remove FsProviderConstants (moved constants to FsResource) and FsFolderServlet (duplicate code from default GET Servlet)
new 3a95821 SLING-1192 use nt:file and nt:folder for files and folders and drop the special resource super type
new a78ef39 SLING-1205 Upgrade all projects to parent POM 8 and use OSGi provided OSGi libraries
new 5137b7e Just code cleanup - no functional changes.
new 71d0b66 Check whether the abstract file is a directory before trying to open the FileInputStream on it (to prevent a nasty log message)
new 93cda71 SLING-1387 : File system provider should send resource events
new 38aa5a1 SLING-1387 : File system provider should send resource events
new 5d6630a [maven-release-plugin] prepare release org.apache.sling.fsresource-1.0.0
new 967d98d [maven-scm] copy for tag org.apache.sling.fsresource-1.0.0
The 42 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-fsresource] 05/25: Use next parent pom for
development.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 16ecaa5d5f7fdf2a31a461d1c8b87e29b2ab5c39
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu May 7 12:04:44 2009 +0000
Use next parent pom for development.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/extensions/fsresource@772627 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5938461..93bf07c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>5-incubator</version>
+ <version>6-incubator-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 22/25: SLING-1387 : File system
provider should send resource events
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 93cda71b4356d387c52bb9a1947117b76cf551e3
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Feb 19 10:37:26 2010 +0000
SLING-1387 : File system provider should send resource events
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@911777 13f79535-47bb-0310-9956-ffa450edef68
---
NOTICE | 2 +-
pom.xml | 4 +
.../sling/fsprovider/internal/FileMonitor.java | 256 +++++++++++++++++++++
.../sling/fsprovider/internal/FsResource.java | 4 +-
.../fsprovider/internal/FsResourceProvider.java | 43 +++-
src/main/resources/META-INF/NOTICE | 2 +-
6 files changed, 306 insertions(+), 5 deletions(-)
diff --git a/NOTICE b/NOTICE
index 7a727bf..9d9af52 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Sling File System Resource Provider
-Copyright 2008-2009 The Apache Software Foundation
+Copyright 2008-2010 The Apache Software Foundation
Apache Sling is based on source code originally developed
by Day Software (http://www.day.com/).
diff --git a/pom.xml b/pom.xml
index ed57ad1..89aaae9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,10 @@
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java b/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
new file mode 100644
index 0000000..5e03ea9
--- /dev/null
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
@@ -0,0 +1,256 @@
+/*
+ * 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.fsprovider.internal;
+
+import java.io.File;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.apache.sling.api.SlingConstants;
+import org.osgi.service.event.EventAdmin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This class is a monitor for the file system
+ * that periodically checks for changes.
+ */
+public class FileMonitor extends TimerTask {
+
+ /** The logger. */
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ private final Timer timer = new Timer();
+ private boolean stop = false;
+ private boolean stopped = true;
+
+ private final Monitorable root;
+
+ private final FsResourceProvider provider;
+
+ /**
+ * Creates a new instance of this class.
+ * @param provider The resource provider.
+ * @param interval The interval between executions of the task, in milliseconds.
+ */
+ public FileMonitor(final FsResourceProvider provider, final long interval) {
+ this.provider = provider;
+ this.root = new Monitorable(this.provider.getProviderRoot(), this.provider.getRootFile());
+ createStatus(this.root);
+ logger.debug("Starting file monitor for {} with an interval of {}ms", this.root.file, interval);
+ timer.schedule(this, 0, interval);
+ }
+
+ /**
+ * Stop periodically executing this task. If the task is currently executing it
+ * will never be run again after the current execution, otherwise it will simply
+ * never run (again).
+ */
+ void stop() {
+ synchronized (timer) {
+ if (!stop) {
+ stop = true;
+ cancel();
+ timer.cancel();
+ }
+
+ boolean interrupted = false;
+ while (!stopped) {
+ try {
+ timer.wait();
+ }
+ catch (InterruptedException e) {
+ interrupted = true;
+ }
+ }
+ if (interrupted) {
+ Thread.currentThread().interrupt();
+ }
+ }
+ logger.debug("Stopped file monitor for {}", this.root.file);
+ }
+
+ /**
+ * @see java.util.TimerTask#run()
+ */
+ public void run() {
+ synchronized (timer) {
+ stopped = false;
+ if (stop) {
+ stopped = true;
+ timer.notifyAll();
+ return;
+ }
+ }
+ synchronized ( this ) {
+ try {
+ // if we don't have an event admin, we just skip the check
+ final EventAdmin localEA = this.provider.getEventAdmin();
+ if ( localEA != null ) {
+ this.check(this.root, localEA);
+ }
+ } catch (Exception e) {
+ // ignore this
+ }
+ }
+ synchronized (timer) {
+ stopped = true;
+ timer.notifyAll();
+ }
+ }
+
+ /**
+ * Check the monitorable
+ * @param monitorable The monitorable to check
+ * @param localEA The event admin
+ */
+ private void check(final Monitorable monitorable, final EventAdmin localEA) {
+ logger.debug("Checking {}", monitorable.file);
+ // if the file is non existing, check if it has been readded
+ if ( monitorable.status instanceof NonExistingStatus ) {
+ if ( monitorable.file.exists() ) {
+ // new file and reset status
+ createStatus(monitorable);
+ sendEvents(monitorable,
+ SlingConstants.TOPIC_RESOURCE_ADDED,
+ localEA);
+ }
+ } else {
+ // check if the file has been removed
+ if ( !monitorable.file.exists() ) {
+ // removed file and update status
+ sendEvents(monitorable,
+ SlingConstants.TOPIC_RESOURCE_REMOVED,
+ localEA);
+ monitorable.status = NonExistingStatus.SINGLETON;
+ } else {
+ // check for changes
+ final FileStatus fs = (FileStatus)monitorable.status;
+ boolean changed = false;
+ if ( fs.lastModified < monitorable.file.lastModified() ) {
+ fs.lastModified = monitorable.file.lastModified();
+ // changed
+ sendEvents(monitorable,
+ SlingConstants.TOPIC_RESOURCE_CHANGED,
+ localEA);
+ changed = true;
+ }
+ if ( fs instanceof DirStatus ) {
+ // directory
+ final DirStatus ds = (DirStatus)fs;
+ for(int i=0; i<ds.children.length; i++) {
+ check(ds.children[i], localEA);
+ }
+ // if the dir changed we have to update
+ if ( changed ) {
+ // and now update
+ final File[] files = monitorable.file.listFiles();
+ final Monitorable[] children = new Monitorable[files.length];
+ for(int i=0; i<files.length; i++) {
+ // search in old list
+ for(int m=0;m<ds.children.length;m++) {
+ if ( ds.children[m].file.equals(files[i]) ) {
+ children[i] = ds.children[m];
+ break;
+ }
+ }
+ if ( children[i] == null ) {
+ children[i] = new Monitorable(monitorable.path + '/' + files[i].getName(), files[i]);
+ children[i].status = NonExistingStatus.SINGLETON;
+ check(children[i], localEA);
+ }
+ }
+ ds.children = children;
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Send the event async via the event admin.
+ */
+ private void sendEvents(final Monitorable monitorable, final String topic, final EventAdmin localEA) {
+ if ( logger.isDebugEnabled() ) {
+ logger.debug("Detected change for resource {} : {}", monitorable.path, topic);
+ }
+
+ final Dictionary<String, String> properties = new Hashtable<String, String>();
+ properties.put(SlingConstants.PROPERTY_PATH, monitorable.path);
+ final String type = monitorable.status instanceof FileStatus ?
+ FsResource.RESOURCE_TYPE_FILE : FsResource.RESOURCE_TYPE_FOLDER;
+ properties.put(SlingConstants.PROPERTY_RESOURCE_TYPE, type);
+ localEA.postEvent(new org.osgi.service.event.Event(topic, properties));
+ }
+
+ /**
+ * Create a status object for the monitorable
+ */
+ private static void createStatus(final Monitorable monitorable) {
+ if ( !monitorable.file.exists() ) {
+ monitorable.status = NonExistingStatus.SINGLETON;
+ } else if ( monitorable.file.isFile() ) {
+ monitorable.status = new FileStatus(monitorable.file);
+ } else {
+ monitorable.status = new DirStatus(monitorable.file, monitorable.path);
+ }
+ }
+
+ /** The monitorable to hold the resource path, the file and the status. */
+ private static final class Monitorable {
+ public final String path;
+ public final File file;
+ public Object status;
+
+ public Monitorable(final String path, final File file) {
+ this.path = path;
+ this.file = file;
+ }
+ }
+
+ /** Status for files. */
+ private static class FileStatus {
+ public long lastModified;
+ public FileStatus(final File file) {
+ this.lastModified = file.lastModified();
+ }
+ }
+
+ /** Status for directories. */
+ private static final class DirStatus extends FileStatus {
+ public Monitorable[] children;
+
+ public DirStatus(final File dir, final String path) {
+ super(dir);
+ final File[] files = dir.listFiles();
+ this.children = new Monitorable[files.length];
+ for(int i=0; i<files.length; i++) {
+ this.children[i] = new Monitorable(path + '/' + files[i].getName(), files[i]);
+ FileMonitor.createStatus(this.children[i]);
+ }
+ }
+ }
+
+ /** Status for non existing files. */
+ private static final class NonExistingStatus {
+ public static NonExistingStatus SINGLETON = new NonExistingStatus();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java b/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
index 372d499..7ecd8bc 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
@@ -42,13 +42,13 @@ public class FsResource extends SlingAdaptable implements Resource {
* The resource type for file system files mapped into the resource tree by
* the {@link FsResourceProvider} (value is "nt:file").
*/
- private static final String RESOURCE_TYPE_FILE = "nt:file";
+ static final String RESOURCE_TYPE_FILE = "nt:file";
/**
* The resource type for file system folders mapped into the resource tree
* by the {@link FsResourceProvider} (value is "nt:folder").
*/
- private static final String RESOURCE_TYPE_FOLDER = "nt:folder";
+ static final String RESOURCE_TYPE_FOLDER = "nt:folder";
// default log, assigned on demand
private Logger log;
diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
index 1cc0e18..dd7b740 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
@@ -32,6 +32,7 @@ import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceResolver;
import org.osgi.framework.BundleContext;
+import org.osgi.service.event.EventAdmin;
/**
* The <code>FsResourceProvider</code> is a resource provider which maps
@@ -48,12 +49,13 @@ import org.osgi.framework.BundleContext;
* label="%resource.resolver.name"
* description="%resource.resolver.description"
* configurationFactory="true"
- * @scr.service
+ * @scr.service interface="ResourceProvider"
* @scr.property name="service.description" value="Sling Filesystem Resource
* Provider"
* @scr.property name="service.vendor" value="The Apache Software Foundation"
* @scr.property nameRef="ResourceProvider.ROOTS"
* @scr.property nameRef="PROP_PROVIDER_FILE"
+ * @scr.property nameRef="PROP_PROVIDER_CHECKINTERVAL" valueRef="DEFAULT_CHECKINTERVAL"
*/
public class FsResourceProvider implements ResourceProvider {
@@ -64,6 +66,14 @@ public class FsResourceProvider implements ResourceProvider {
*/
public static final String PROP_PROVIDER_FILE = "provider.file";
+ /**
+ * The name of the configuration property providing the check interval
+ * for file changes (value is "provider.checkinterval").
+ */
+ public static final String PROP_PROVIDER_CHECKINTERVAL = "provider.checkinterval";
+
+ public static long DEFAULT_CHECKINTERVAL = 1000;
+
// The location in the resource tree where the resources are mapped
private String providerRoot;
@@ -73,6 +83,12 @@ public class FsResourceProvider implements ResourceProvider {
// The "root" file or folder in the file system
private File providerFile;
+ /** The monitor to detect file changes. */
+ private FileMonitor monitor;
+
+ /** @scr.reference cardinality="0..1" policy="dynamic" */
+ private EventAdmin eventAdmin;
+
/**
* Same as {@link #getResource(ResourceResolver, String)}, i.e. the
* <code>request</code> parameter is ignored.
@@ -199,14 +215,39 @@ public class FsResourceProvider implements ResourceProvider {
this.providerRoot = providerRoot;
this.providerRootPrefix = providerRoot.concat("/");
this.providerFile = getProviderFile(providerFileName, bundleContext);
+ // start background monitor if check interval is higher than 100
+ long checkInterval = DEFAULT_CHECKINTERVAL;
+ final Object interval = props.get(PROP_PROVIDER_CHECKINTERVAL);
+ if ( interval != null && interval instanceof Long ) {
+ checkInterval = (Long)interval;
+ }
+ if ( checkInterval > 100 ) {
+ this.monitor = new FileMonitor(this, checkInterval);
+ }
}
protected void deactivate() {
+ if ( this.monitor != null ) {
+ this.monitor.stop();
+ this.monitor = null;
+ }
this.providerRoot = null;
this.providerRootPrefix = null;
this.providerFile = null;
}
+ EventAdmin getEventAdmin() {
+ return this.eventAdmin;
+ }
+
+ File getRootFile() {
+ return this.providerFile;
+ }
+
+ String getProviderRoot() {
+ return this.providerRoot;
+ }
+
// ---------- internal
private File getProviderFile(String providerFileName,
diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE
index 7a727bf..9d9af52 100644
--- a/src/main/resources/META-INF/NOTICE
+++ b/src/main/resources/META-INF/NOTICE
@@ -1,5 +1,5 @@
Apache Sling File System Resource Provider
-Copyright 2008-2009 The Apache Software Foundation
+Copyright 2008-2010 The Apache Software Foundation
Apache Sling is based on source code originally developed
by Day Software (http://www.day.com/).
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 16/25: SLING-1186 Parent POM 7
is good enough (no need for 8-SNAPSHOT)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 3111d96cb391ab635981d114f829b78342225f64
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Sat Nov 14 21:48:19 2009 +0000
SLING-1186 Parent POM 7 is good enough (no need for 8-SNAPSHOT)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@836269 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4be6355..b6826fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>8-SNAPSHOT</version>
+ <version>7</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 14/25: Update to latest release.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit a8b5bdf36ffc6c7afa9227fa91d3a61ebe660113
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 14 06:39:29 2009 +0000
Update to latest release.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@825023 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c5e9bb2..5033bbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.adapter</artifactId>
- <version>2.0.2-incubator</version>
+ <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 09/25: SLING-1011 : Adjust svn
location
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit b47fdc94ea5df39fe5ac9ee7ce9150dd1a884107
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jun 18 10:26:35 2009 +0000
SLING-1011 : Adjust svn location
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@786008 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5938461..4beb36b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/extensions/fsresource</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/extensions/fsresource</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/extensions/fsresource</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 10/25: SLING-1011 : Remove
disclaimer from readme's, adjust links to webite, fix versions in poms.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 40f90919758c5ca0ad58ab74c9e05f6724b64a78
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jun 18 10:47:55 2009 +0000
SLING-1011 : Remove disclaimer from readme's, adjust links to webite, fix versions in poms.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@786012 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4beb36b..7d0e228 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>org.apache.sling.fsresource</artifactId>
<packaging>bundle</packaging>
- <version>0.9.3-incubator-SNAPSHOT</version>
+ <version>0.9.3-SNAPSHOT</version>
<name>Apache Sling Filesystem Resource Provider</name>
<description>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 11/25: SLING-1033 Upgrade to
Sling parent POM 6 (and ensure web app has the leglize stuff, too)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 164dbcf445a772e526f6e480ddec9c12552eb106
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Sun Jul 5 11:27:40 2009 +0000
SLING-1033 Upgrade to Sling parent POM 6 (and ensure web app has the leglize stuff, too)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@791223 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7d0e228..cdc9d25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>5-incubator</version>
+ <version>6</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 23/25: SLING-1387 : File system
provider should send resource events
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 38aa5a1ce603256faf6f8a1dd5f48ce559895f55
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Feb 19 10:45:19 2010 +0000
SLING-1387 : File system provider should send resource events
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@911779 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/resources/OSGI-INF/metatype/metatype.properties | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/main/resources/OSGI-INF/metatype/metatype.properties b/src/main/resources/OSGI-INF/metatype/metatype.properties
index 06ec635..03f9ecf 100644
--- a/src/main/resources/OSGI-INF/metatype/metatype.properties
+++ b/src/main/resources/OSGI-INF/metatype/metatype.properties
@@ -38,3 +38,8 @@ provider.file.description = Filesystem directory mapped to the virtual \
relative it is resolved against sling.home or the current working directory. \
The path may be a file or folder. If the path does not address an existing \
file or folder, an empty folder is created.
+
+provider.checkinterval.name = Check Interval
+provider.checkinterval.description = If the interval has a value higher than 100, the provider will \
+ check the file system for changes periodically. This interval defines the period in milliseconds \
+ (the default is 1000). If a change is detected, resource events are sent through the event admin.
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 15/25: SLING-1186 Upgrade to
Sling Parent POM 8-SNAPSHOT (to use SCR plugin 1.4.0),
set DS specification version of components to 1.1,
convert component into a regular (non-ComponentFactory) component and ensure
meta type descriptor is generated with factoryPid set to the same value as
the PID to have factory configuration support.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 2d2ef3d2593dbe2e57271d58dd6b746c9bbd8aef
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Sat Nov 14 15:51:46 2009 +0000
SLING-1186 Upgrade to Sling Parent POM 8-SNAPSHOT (to use SCR plugin 1.4.0), set
DS specification version of components to 1.1, convert component into a regular
(non-ComponentFactory) component and ensure meta type descriptor is generated
with factoryPid set to the same value as the PID to have factory configuration
support.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@836196 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 11 +++++------
.../sling/fsprovider/internal/FsResourceProvider.java | 13 +++++--------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5033bbc..4be6355 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -47,6 +47,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
+ <configuration>
+ <specVersion>1.1</specVersion>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -82,14 +85,10 @@
<version>2.0.4</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
index 0bc19e5..1cc0e18 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
@@ -20,8 +20,8 @@ package org.apache.sling.fsprovider.internal;
import java.io.File;
import java.util.Collections;
-import java.util.Dictionary;
import java.util.Iterator;
+import java.util.Map;
import java.util.NoSuchElementException;
import javax.jcr.RepositoryException;
@@ -32,7 +32,6 @@ import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceResolver;
import org.osgi.framework.BundleContext;
-import org.osgi.service.component.ComponentContext;
/**
* The <code>FsResourceProvider</code> is a resource provider which maps
@@ -48,7 +47,7 @@ import org.osgi.service.component.ComponentContext;
* @scr.component name="org.apache.sling.fsprovider.internal.FsResourceProvider"
* label="%resource.resolver.name"
* description="%resource.resolver.description"
- * factory="org.apache.sling.fsprovider.internal.FsResourceProviderFactory"
+ * configurationFactory="true"
* @scr.service
* @scr.property name="service.description" value="Sling Filesystem Resource
* Provider"
@@ -184,8 +183,7 @@ public class FsResourceProvider implements ResourceProvider {
// ---------- SCR Integration
- protected void activate(ComponentContext context) {
- Dictionary<?, ?> props = context.getProperties();
+ protected void activate(BundleContext bundleContext, Map<?, ?> props) {
String providerRoot = (String) props.get(ROOTS);
if (providerRoot == null || providerRoot.length() == 0) {
@@ -200,11 +198,10 @@ public class FsResourceProvider implements ResourceProvider {
this.providerRoot = providerRoot;
this.providerRootPrefix = providerRoot.concat("/");
- this.providerFile = getProviderFile(providerFileName,
- context.getBundleContext());
+ this.providerFile = getProviderFile(providerFileName, bundleContext);
}
- protected void deactivate(ComponentContext context) {
+ protected void deactivate() {
this.providerRoot = null;
this.providerRootPrefix = null;
this.providerFile = null;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 07/25: Move Sling to new TLP
location
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit ab2cf0f8c49130bfeac7a4298d01607792dc056f
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Thu Jun 18 09:21:02 2009 +0000
Move Sling to new TLP location
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@785979 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 03/25: [maven-release-plugin]
prepare release org.apache.sling.fsresource-0.9.2-incubator
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 16644cdb526469f22a73e91972c1897b19ba630f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed May 6 13:08:08 2009 +0000
[maven-release-plugin] prepare release org.apache.sling.fsresource-0.9.2-incubator
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/extensions/fsresource@772207 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 28fe575..87d1d03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>org.apache.sling.fsresource</artifactId>
<packaging>bundle</packaging>
- <version>0.9.1-incubator-SNAPSHOT</version>
+ <version>0.9.2-incubator</version>
<name>Apache Sling Filesystem Resource Provider</name>
<description>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/extensions/fsresource</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/extensions/fsresource</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/extensions/fsresource</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.fsresource-0.9.2-incubator</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.fsresource-0.9.2-incubator</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/sling/tags/org.apache.sling.fsresource-0.9.2-incubator</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 04/25: [maven-release-plugin]
prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 746e1d1c98583b93c8b01b1e6b10e8f381422948
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed May 6 13:08:31 2009 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/extensions/fsresource@772209 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 87d1d03..5938461 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>org.apache.sling.fsresource</artifactId>
<packaging>bundle</packaging>
- <version>0.9.2-incubator</version>
+ <version>0.9.3-incubator-SNAPSHOT</version>
<name>Apache Sling Filesystem Resource Provider</name>
<description>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.fsresource-0.9.2-incubator</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.fsresource-0.9.2-incubator</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/sling/tags/org.apache.sling.fsresource-0.9.2-incubator</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/extensions/fsresource</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/extensions/fsresource</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/extensions/fsresource</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 02/25: Prepare new release.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 6bcf25364b02bbc71071d53a6e8d897c149e3448
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed May 6 12:55:51 2009 +0000
Prepare new release.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/extensions/fsresource@772191 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ac38fa5..28fe575 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6-incubator-SNAPSHOT</version>
+ <version>5-incubator</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 12/25: Use official release
instead of incubator release.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 2f0cded5dff8b1f906bc1560c4554ee73c4f99eb
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Aug 17 14:28:27 2009 +0000
Use official release instead of incubator release.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@804997 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index cdc9d25..b4a6ff5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.2-incubator</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 17/25: SLING-1187 Remove
FsProviderConstants (moved constants to FsResource) and FsFolderServlet
(duplicate code from default GET Servlet)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 2051b5fe42720f7167c6024761b2abd508fbf46c
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Sun Nov 15 15:07:00 2009 +0000
SLING-1187 Remove FsProviderConstants (moved constants to FsResource) and FsFolderServlet (duplicate code from default GET Servlet)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@836370 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/fsprovider/internal/FsFolderServlet.java | 161 ---------------------
.../fsprovider/internal/FsProviderConstants.java | 46 ------
.../sling/fsprovider/internal/FsResource.java | 28 +++-
3 files changed, 24 insertions(+), 211 deletions(-)
diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsFolderServlet.java b/src/main/java/org/apache/sling/fsprovider/internal/FsFolderServlet.java
deleted file mode 100644
index 784e9cf..0000000
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsFolderServlet.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * 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.fsprovider.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceNotFoundException;
-import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
-
-/**
- * The <code>FsFolderServlet</code> lists the files and folders of a folder
- * mapped into the Sling resource tree. The listing produced is similar to the
- * default index listing produced by Apache httpd.
- *
- * @scr.component immediate="true" metatype="no"
- * @scr.service interface="javax.servlet.Servlet"
- * @scr.property name="service.description" value="FileSystem Folder Servlet"
- * @scr.property name="service.vendor" value="The Apache Software Foundation"
- * @scr.property name="sling.servlet.methods" value="GET"
- * @scr.property name="sling.servlet.resourceTypes"
- * valueRef="FsProviderConstants.RESOURCE_TYPE_FOLDER"
- */
-public class FsFolderServlet extends SlingSafeMethodsServlet {
-
- // a number of blanks used to format the listing of folder entries
- private static final String NAME_BLANKS = " ";
-
- @Override
- protected void doGet(SlingHttpServletRequest request,
- SlingHttpServletResponse response) throws IOException {
-
- // if the request URL is not terminated with a slash, redirect to the
- // same URL with a trailing slash (this makes preparing the response
- // easier
- if (!request.getRequestURI().endsWith("/")) {
- response.sendRedirect(request.getRequestURL() + "/");
- return;
- }
-
- // ensure the resource adapts to a filesystem folder; generally
- // this should be the case, but we never know whether someone really
- // creates a JCR resource with the fs provider folder resource type
- Resource res = request.getResource();
- File file = res.adaptTo(File.class);
- if (file == null || !file.isDirectory()) {
- throw new ResourceNotFoundException(
- request.getResource().getPath(),
- "Resource is not a file system folder");
- }
-
- response.setContentType("text/html");
- response.setCharacterEncoding("UTF-8");
- PrintWriter pw = response.getWriter();
-
- pw.println("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\"> <html>");
-
- pw.printf("<head><title>Index of %s</title></head><body>%n",
- res.getPath());
- pw.printf("<h1>Index of %s</h1>%n", res.getPath());
-
- pw.println("<pre>");
- pw.println("Name Last modified Size Description");
- pw.println("<hr>");
-
- // only draw parent link if the parent is also a fs resource
- Resource parent = ResourceUtil.getParent(res);
- if (parent != null && parent.adaptTo(File.class) != null) {
- pw.println("<a href='..'>Parent Directory</a>");
- }
-
- // render the children
- renderChildren(pw, file);
-
- pw.println("</pre>");
- pw.println("</body></html>");
- }
-
- // ---------- internal
-
- /**
- * Renders the children of the <code>parent</code> folder to the output.
- */
- private void renderChildren(PrintWriter pw, File parent) {
- File[] children = parent.listFiles();
- if (children != null && children.length > 0) {
- Arrays.sort(children, FileNameComparator.INSTANCE);
-
- for (File child : children) {
-
- String name = child.getName();
- if (child.isDirectory()) {
- name = name.concat("/");
- }
-
- String displayName = name;
- if (displayName.length() >= 32) {
- displayName = displayName.substring(0, 29).concat("...");
- pw.printf("<a href='%s'>%s</a>", name, displayName);
- } else {
- String blanks = NAME_BLANKS.substring(0,
- 32 - displayName.length());
- pw.printf("<a href='%s'>%s</a>%s", name, displayName,
- blanks);
- }
-
- pw.print(" " + new Date(child.lastModified()));
-
- pw.print(" ");
- if (child.isFile()) {
- pw.print(child.length());
- } else {
- pw.print("-");
- }
-
- pw.println();
- }
- }
- }
-
- // order files by type (folder before files) and name (case insensitive)
- private static class FileNameComparator implements Comparator<File> {
-
- public static final FileNameComparator INSTANCE = new FileNameComparator();
-
- public int compare(File f1, File f2) {
- if (f1.isDirectory() && !f2.isDirectory()) {
- return -1;
- } else if (!f1.isDirectory() && f2.isDirectory()) {
- return 1;
- }
-
- return f1.getName().compareToIgnoreCase(f2.getName());
- }
- }
-
-}
diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsProviderConstants.java b/src/main/java/org/apache/sling/fsprovider/internal/FsProviderConstants.java
deleted file mode 100644
index 96e3db6..0000000
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsProviderConstants.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.fsprovider.internal;
-
-/**
- * The <code>FsProviderConstants</code> interface defines public constants for
- * the {@link FsResourceProvider}.
- */
-public interface FsProviderConstants {
-
- /**
- * The common resource super type for files and folders mapped into the
- * resource tree by the {@link FsResourceProvider} (value is
- * "sling/fs/resource").
- */
- static final String RESOURCE_TYPE_ROOT = "sling/fs/resource";
-
- /**
- * The resource type for file system files mapped into the resource tree by
- * the {@link FsResourceProvider} (value is "sling/fs/file").
- */
- static final String RESOURCE_TYPE_FILE = "sling/fs/file";
-
- /**
- * The resource type for file system folders mapped into the resource tree
- * by the {@link FsResourceProvider} (value is "sling/fs/folder").
- */
- static final String RESOURCE_TYPE_FOLDER = "sling/fs/folder";
-
-}
diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java b/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
index ee3d567..6d2d424 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
@@ -38,6 +38,26 @@ import org.slf4j.LoggerFactory;
*/
public class FsResource extends SlingAdaptable implements Resource {
+
+ /**
+ * The common resource super type for files and folders mapped into the
+ * resource tree by the {@link FsResourceProvider} (value is
+ * "sling/fs/resource").
+ */
+ private static final String RESOURCE_TYPE_ROOT = "sling/fs/resource";
+
+ /**
+ * The resource type for file system files mapped into the resource tree by
+ * the {@link FsResourceProvider} (value is "sling/fs/file").
+ */
+ private static final String RESOURCE_TYPE_FILE = "sling/fs/file";
+
+ /**
+ * The resource type for file system folders mapped into the resource tree
+ * by the {@link FsResourceProvider} (value is "sling/fs/folder").
+ */
+ private static final String RESOURCE_TYPE_FOLDER = "sling/fs/folder";
+
// default log, assigned on demand
private Logger log;
@@ -58,7 +78,7 @@ public class FsResource extends SlingAdaptable implements Resource {
/**
* Creates an instance of this Filesystem resource.
- *
+ *
* @param resolver The owning resource resolver
* @param resourcePath The resource path in the resource tree
* @param file The wrapped file
@@ -103,7 +123,7 @@ public class FsResource extends SlingAdaptable implements Resource {
* Returns {@link FsProviderConstants#RESOURCE_TYPE_ROOT}
*/
public String getResourceSuperType() {
- return FsProviderConstants.RESOURCE_TYPE_ROOT;
+ return RESOURCE_TYPE_ROOT;
}
/**
@@ -114,8 +134,8 @@ public class FsResource extends SlingAdaptable implements Resource {
public String getResourceType() {
if (resourceType == null) {
resourceType = file.isFile()
- ? FsProviderConstants.RESOURCE_TYPE_FILE
- : FsProviderConstants.RESOURCE_TYPE_FOLDER;
+ ? RESOURCE_TYPE_FILE
+ : RESOURCE_TYPE_FOLDER;
}
return resourceType;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 24/25: [maven-release-plugin]
prepare release org.apache.sling.fsresource-1.0.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 5d6630a914b0970ca60fcdb6c5b8aea20b5768bd
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Feb 23 12:55:37 2010 +0000
[maven-release-plugin] prepare release org.apache.sling.fsresource-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@915318 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 89aaae9..b6c54e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>org.apache.sling.fsresource</artifactId>
<packaging>bundle</packaging>
- <version>0.9.3-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>Apache Sling Filesystem Resource Provider</name>
<description>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.0.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.fsresource-1.0.0</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 06/25: Set parent pom to
released version.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit f9433112e36a7d51bac2934331705d790ef66c59
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu May 14 14:49:51 2009 +0000
Set parent pom to released version.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/extensions/fsresource@774798 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 93bf07c..5938461 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>6-incubator-SNAPSHOT</version>
+ <version>5-incubator</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 13/25: Update to latest Sling
releases.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 10c908811fe9c81ad338c956fbdb3f3ec3f5df84
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 6 06:19:55 2009 +0000
Update to latest Sling releases.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@822144 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b4a6ff5..c5e9bb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.6</version>
+ <version>2.0.8</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 25/25: [maven-scm] copy for tag
org.apache.sling.fsresource-1.0.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 967d98d2a5ae9acd63186dc2e6a23f71ff8af2f6
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Feb 23 12:56:48 2010 +0000
[maven-scm] copy for tag org.apache.sling.fsresource-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.0.0@915319 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 20/25: Just code cleanup - no
functional changes.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 5137b7ef26c7b81b2f6a5d26886a491f9baf0ff7
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Dec 29 14:19:35 2009 +0000
Just code cleanup - no functional changes.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@894397 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/fsprovider/internal/FsResource.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java b/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
index 4cdce18..f214c7f 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
@@ -112,15 +112,15 @@ public class FsResource extends SlingAdaptable implements Resource {
}
/**
- * Returns {@link FsProviderConstants#RESOURCE_TYPE_ROOT}
+ * Returns <code>null</code>}
*/
public String getResourceSuperType() {
return null;
}
/**
- * Returns {@link FsProviderConstants#RESOURCE_TYPE_FILE} if this resource
- * wraps a file. Otherwise {@link FsProviderConstants#RESOURCE_TYPE_FOLDER}
+ * Returns {@link #RESOURCE_TYPE_FILE} if this resource
+ * wraps a file. Otherwise {@link #RESOURCE_TYPE_FOLDER}
* is returned.
*/
public String getResourceType() {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 19/25: SLING-1205 Upgrade all
projects to parent POM 8 and use OSGi provided OSGi libraries
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit a78ef3964f3310505def5b9788f5e9cd027990e0
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Tue Dec 1 07:32:34 2009 +0000
SLING-1205 Upgrade all projects to parent POM 8 and use OSGi provided OSGi libraries
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@885680 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b6826fc..ed57ad1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 21/25: Check whether the
abstract file is a directory before trying to open the FileInputStream on
it (to prevent a nasty log message)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 71d0b661f343fc6dc465b2f091e9dcf49e1d617a
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Thu Jan 21 12:06:45 2010 +0000
Check whether the abstract file is a directory before trying to open the FileInputStream on it (to prevent a nasty log message)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@901668 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/fsprovider/internal/FsResource.java | 24 ++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java b/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
index f214c7f..372d499 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
@@ -144,12 +144,22 @@ public class FsResource extends SlingAdaptable implements Resource {
return (AdapterType) file;
- } else if (type == InputStream.class && file.canRead()) {
+ } else if (type == InputStream.class) {
+
+ if (!file.isDirectory() && file.canRead()) {
+
+ try {
+ return (AdapterType) new FileInputStream(file);
+ } catch (IOException ioe) {
+ getLog().info(
+ "adaptTo: Cannot open a stream on the file " + file,
+ ioe);
+ }
+
+ } else {
+
+ getLog().debug("adaptTo: File {} is not a readable file", file);
- try {
- return (AdapterType) new FileInputStream(file);
- } catch (IOException ioe) {
- getLog().info("Cannot open a stream on the file " + file, ioe);
}
} else if (type == URL.class) {
@@ -158,8 +168,10 @@ public class FsResource extends SlingAdaptable implements Resource {
return (AdapterType) file.toURI().toURL();
} catch (MalformedURLException mue) {
getLog().info(
- "Cannot convert the file path " + file + " to an URL", mue);
+ "adaptTo: Cannot convert the file path " + file
+ + " to an URL", mue);
}
+
}
return super.adaptTo(type);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 18/25: SLING-1192 use nt:file
and nt:folder for files and folders and drop the special resource super
type
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 3a95821654fc8c9c261fe61ed1a576c7726cffac
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Tue Nov 17 20:27:39 2009 +0000
SLING-1192 use nt:file and nt:folder for files and folders and drop the special resource super type
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@881492 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/fsprovider/internal/FsResource.java | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java b/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
index 6d2d424..4cdce18 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java
@@ -38,25 +38,17 @@ import org.slf4j.LoggerFactory;
*/
public class FsResource extends SlingAdaptable implements Resource {
-
- /**
- * The common resource super type for files and folders mapped into the
- * resource tree by the {@link FsResourceProvider} (value is
- * "sling/fs/resource").
- */
- private static final String RESOURCE_TYPE_ROOT = "sling/fs/resource";
-
/**
* The resource type for file system files mapped into the resource tree by
- * the {@link FsResourceProvider} (value is "sling/fs/file").
+ * the {@link FsResourceProvider} (value is "nt:file").
*/
- private static final String RESOURCE_TYPE_FILE = "sling/fs/file";
+ private static final String RESOURCE_TYPE_FILE = "nt:file";
/**
* The resource type for file system folders mapped into the resource tree
- * by the {@link FsResourceProvider} (value is "sling/fs/folder").
+ * by the {@link FsResourceProvider} (value is "nt:folder").
*/
- private static final String RESOURCE_TYPE_FOLDER = "sling/fs/folder";
+ private static final String RESOURCE_TYPE_FOLDER = "nt:folder";
// default log, assigned on demand
private Logger log;
@@ -123,7 +115,7 @@ public class FsResource extends SlingAdaptable implements Resource {
* Returns {@link FsProviderConstants#RESOURCE_TYPE_ROOT}
*/
public String getResourceSuperType() {
- return RESOURCE_TYPE_ROOT;
+ return null;
}
/**
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 01/25: Add missing licence,
notice etc.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 36ccd05f33c40dabba7831c01198be6a54178c5e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed May 6 12:46:19 2009 +0000
Add missing licence, notice etc.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/extensions/fsresource@772183 13f79535-47bb-0310-9956-ffa450edef68
---
LICENSE | 202 +++++++++++++++++++++++++++++++++
NOTICE | 8 ++
src/main/resources/META-INF/DISCLAIMER | 7 ++
src/main/resources/META-INF/LICENSE | 202 +++++++++++++++++++++++++++++++++
src/main/resources/META-INF/NOTICE | 8 ++
5 files changed, 427 insertions(+)
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE
@@ -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.
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..7a727bf
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,8 @@
+Apache Sling File System Resource Provider
+Copyright 2008-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/).
diff --git a/src/main/resources/META-INF/DISCLAIMER b/src/main/resources/META-INF/DISCLAIMER
new file mode 100644
index 0000000..90850c2
--- /dev/null
+++ b/src/main/resources/META-INF/DISCLAIMER
@@ -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
diff --git a/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/src/main/resources/META-INF/LICENSE
@@ -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.
diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..7a727bf
--- /dev/null
+++ b/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,8 @@
+Apache Sling File System Resource Provider
+Copyright 2008-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/).
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 08/25: SLING-1011 : Remove
disclaimer file.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 501bb8815150f04af85cd33c2a4316406279738e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jun 18 09:57:04 2009 +0000
SLING-1011 : Remove disclaimer file.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@785993 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/resources/META-INF/DISCLAIMER | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/main/resources/META-INF/DISCLAIMER b/src/main/resources/META-INF/DISCLAIMER
deleted file mode 100644
index 90850c2..0000000
--- a/src/main/resources/META-INF/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-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
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.