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:36:51 UTC
[sling-org-apache-sling-fsresource] annotated tag
org.apache.sling.fsresource-1.2.0 created (now 88f2ee9)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.fsresource-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git.
at 88f2ee9 (tag)
tagging 1150025e7356ead6ee8fd5c6920441cd8f000761 (commit)
by Carsten Ziegeler
on Tue Jan 3 08:58:59 2017 +0000
- Log -----------------------------------------------------------------
org.apache.sling.fsresource-1.2.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 c0d679e [maven-release-plugin] prepare for next development iteration
new feb2473 SLING-1516 Fixed by looking for a factory pid on activation.
new b109367 SLING-1516 A much better fix provided by Felix.
new 8df175a Use released parent pom.
new a30c588 SLING-1193 Fsresoruce and bundle resource implement the 2.0.8 API which means they cant be used with ResourceUtil, updated.
new c385893 SLING-1193 Have the bundle plugin set the correct import version range for the resource API implemented by the bundles
new 61509be SLING-1625 Check File.listFiles() result to prevent NullPointerException
new b5c493c Use latest Sling API release
new 8cd0450 Fix javadocs
new 26c5948 updating all modules to parent 10-SNAPSHOT in anticipation of emma additions to parent
new 9281408 fixing relativePaths
new a8d1b87 Update to recent snapshots
new 2979d42 Use latest releases.
new abcabe3 Remove obsolete licence and notice
new 4d518af [maven-release-plugin] prepare release org.apache.sling.fsresource-1.0.2
new 820f5c2 [maven-release-plugin] prepare for next development iteration
new 04c2091 SLING-2150 : Update plugins to use the latest available versions
new 15cc17a Update to recent snapshot
new 366633f Using latest released parent pom
new 630b18e SLING-2187 - adding new module to contain our custom notice file; adding remote-resources plugin configuration to parent pom and removing all existing appended-resources NOTICE files
new f4a2616 temporarily using snapshots during release vote
new 15c85c9 using latest releases
new 0aba830 SLING-2312 - adding adapter annotations for fsresource bundle
new 8309283 SLING-2314 - applying patch from Stefan Seifert to switch annotation style on FSResourceProvider. Thanks for the patch!
new 8318373 SLING-1081 : fsresource: allow to adapt to ValueMap
new cc90f52 using next snapshots during release process
new d3e5959 Use released adapter annotations.
new 7c14443 Use released maven sling plugin
new a30d734 SLING-2480 : Add config for maven-sling-plugin to m2e configuration
new 1c8b6ab SLING-2483 Use provide:=true instead of version macros to define the proper import version range. Also fix a small glitch in the parent pom relativePath of the framework-extension-ws bundle
new d61a155 Correctly increase resource package version and include latest resource providers.
new 9363ec0 Update to latest parent pom
new 28ecd71 Use released versions
new 195c76d SLING-2541 : General mechanism to chain resource providers
new e71601f Preparing release
new 5468aa2 [maven-release-plugin] prepare release org.apache.sling.fsresource-1.1.0
new 7b1b0a6 [maven-release-plugin] prepare for next development iteration
new f867347 Set dependencies to latest snapshots after release
new 747e4bb Update to released bundles
new d93f502 Use latest releases and update to new parent pom
new 94c55fa Update to latest parent pom and use latest releases in launchpad
new 2653bcb SLING-2739 : Add methods for handling the resource type hierarchy to the resource resolver
new 0e9dd0f Prepare for release
new a76cf10 [maven-release-plugin] prepare release org.apache.sling.fsresource-1.1.2
new 418479c [maven-release-plugin] prepare for next development iteration
new fb5221e Use latest snapshot
new 8cf1d4e Use released versions after release.
new b273649 Correct reactor pom and update to parent pom 16
new c9aca5b Update to latest parent pom
new 592bc1e SLING-2944 Revert Sling API dependency to 2.3.0 again
new d5588c1 Update to parent pom 18
new 0bb72cc SLING-3286 - Remove plugin version overrides from poms
new 2254ba3 Update to parent pom v19
new 9584f16 3804 : Fields for dynamic references must be volatile
new 07281a3 Updated to parent version 20
new 4392745 [maven-release-plugin] prepare release org.apache.sling.fsresource-1.1.4
new a4d1ae4 [maven-release-plugin] prepare for next development iteration
new 2b642b2 Update to Sling Parent POM 22 with baselining enabled
new 43259e6 SLING-4698 - Set parent.relativePath to empty for all modules
new be69e70 Update to Sling Parent 23
new b030d0c set parent version to 24 and add empty relativePath where missing
new 0320672 Update the main reactor to parent 25
new 9f877f5 SLING-5192 - FsResourceProvider should set webconsole.configurationFactory.nameHint
new a5f05c9 Switch to parent pom 26
new dde630e SLING-6279 : Switch from event admin to Sling Resource Observation API
new a0bc09c SLING-6279 : Switch from event admin to Sling Resource Observation API
new 741a449 SLING-6364 fix provider.roots config property name, and property labels/descriptions (patch provided by Sandro Boehme)
new c2b7f0c SLING-6364 rename config property back to provider.root because this is expected for an resource provider
new 566413e SLING-6364 make sure webconsole nameHint is included in metatype
new 57279b1 [maven-release-plugin] prepare release org.apache.sling.fsresource-1.2.0
new 1150025 [maven-release-plugin] copy for tag org.apache.sling.fsresource-1.2.0
The 112 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] 02/15: Update to Sling Parent
POM 22 with baselining enabled
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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 2b642b23fc164c413e72e7ed5bf98a37d80cfe6c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:57:44 2014 +0000
Update to Sling Parent POM 22 with baselining enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1628622 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5f4d3fd..8d0875e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>20</version>
+ <version>22</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] 09/15: SLING-6279 : Switch from
event admin to Sling Resource Observation API
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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit dde630e7617a0bbf696d76d043156d8248ba293c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Nov 13 11:07:45 2016 +0000
SLING-6279 : Switch from event admin to Sling Resource Observation API
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1769486 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 31 +---
.../sling/fsprovider/internal/FileMonitor.java | 54 +++----
.../fsprovider/internal/FsResourceProvider.java | 170 +++++++++++----------
3 files changed, 118 insertions(+), 137 deletions(-)
diff --git a/pom.xml b/pom.xml
index 896f9f8..0b84370 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath/>
</parent>
@@ -45,13 +45,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <configuration>
- <specVersion>1.1</specVersion>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
<executions>
@@ -68,25 +61,18 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <configuration>
- <instructions>
- <Private-Package>
- org.apache.sling.fsprovider.internal
- </Private-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.3.0</version>
+ <version>2.15.0</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -95,11 +81,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -115,10 +97,5 @@
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java b/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
index 336f1c1..5729b7c 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
@@ -19,13 +19,14 @@
package org.apache.sling.fsprovider.internal;
import java.io.File;
-import java.util.Dictionary;
-import java.util.Hashtable;
+import java.util.Collections;
import java.util.Timer;
import java.util.TimerTask;
-import org.apache.sling.api.SlingConstants;
-import org.osgi.service.event.EventAdmin;
+import org.apache.sling.api.resource.observation.ResourceChange;
+import org.apache.sling.api.resource.observation.ResourceChange.ChangeType;
+import org.apache.sling.spi.resource.provider.ObservationReporter;
+import org.apache.sling.spi.resource.provider.ObserverConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -91,6 +92,7 @@ public class FileMonitor extends TimerTask {
/**
* @see java.util.TimerTask#run()
*/
+ @Override
public void run() {
synchronized (timer) {
stopped = false;
@@ -102,10 +104,10 @@ public class FileMonitor extends TimerTask {
}
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);
+ // if we don't have an observation reporter, we just skip the check
+ final ObservationReporter reporter = this.provider.getObservationReporter();
+ if ( reporter != null ) {
+ this.check(this.root, reporter);
}
} catch (Exception e) {
// ignore this
@@ -120,9 +122,9 @@ public class FileMonitor extends TimerTask {
/**
* Check the monitorable
* @param monitorable The monitorable to check
- * @param localEA The event admin
+ * @param reporter The ObservationReporter
*/
- private void check(final Monitorable monitorable, final EventAdmin localEA) {
+ private void check(final Monitorable monitorable, final ObservationReporter reporter) {
logger.debug("Checking {}", monitorable.file);
// if the file is non existing, check if it has been readded
if ( monitorable.status instanceof NonExistingStatus ) {
@@ -130,16 +132,16 @@ public class FileMonitor extends TimerTask {
// new file and reset status
createStatus(monitorable);
sendEvents(monitorable,
- SlingConstants.TOPIC_RESOURCE_ADDED,
- localEA);
+ ChangeType.ADDED,
+ reporter);
}
} else {
// check if the file has been removed
if ( !monitorable.file.exists() ) {
// removed file and update status
sendEvents(monitorable,
- SlingConstants.TOPIC_RESOURCE_REMOVED,
- localEA);
+ ChangeType.REMOVED,
+ reporter);
monitorable.status = NonExistingStatus.SINGLETON;
} else {
// check for changes
@@ -149,15 +151,15 @@ public class FileMonitor extends TimerTask {
fs.lastModified = monitorable.file.lastModified();
// changed
sendEvents(monitorable,
- SlingConstants.TOPIC_RESOURCE_CHANGED,
- localEA);
+ ChangeType.CHANGED,
+ reporter);
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);
+ check(ds.children[i], reporter);
}
// if the dir changed we have to update
if ( changed ) {
@@ -178,7 +180,7 @@ public class FileMonitor extends TimerTask {
monitorable.path + '/'
+ files[i].getName(), files[i]);
children[i].status = NonExistingStatus.SINGLETON;
- check(children[i], localEA);
+ check(children[i], reporter);
}
}
ds.children = children;
@@ -194,17 +196,17 @@ public class FileMonitor extends TimerTask {
/**
* Send the event async via the event admin.
*/
- private void sendEvents(final Monitorable monitorable, final String topic, final EventAdmin localEA) {
+ private void sendEvents(final Monitorable monitorable, final ChangeType changeType, final ObservationReporter reporter) {
if ( logger.isDebugEnabled() ) {
- logger.debug("Detected change for resource {} : {}", monitorable.path, topic);
+ logger.debug("Detected change for resource {} : {}", monitorable.path, changeType);
}
- 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));
+ for(final ObserverConfiguration config : reporter.getObserverConfigurations()) {
+ if ( config.matches(monitorable.path) ) {
+ final ResourceChange change = new ResourceChange(changeType, monitorable.path, false);
+ reporter.reportChanges(config, Collections.singleton(change), false);
+ }
+ }
}
/**
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 4b96f05..ef30e3d 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
@@ -21,28 +21,28 @@ package org.apache.sling.fsprovider.internal;
import java.io.File;
import java.util.Collections;
import java.util.Iterator;
-import java.util.Map;
import java.util.NoSuchElementException;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.ConfigurationPolicy;
-import org.apache.felix.scr.annotations.Properties;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.apache.felix.scr.annotations.ReferencePolicy;
-import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.spi.resource.provider.ObservationReporter;
+import org.apache.sling.spi.resource.provider.ProviderContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
+import org.apache.sling.spi.resource.provider.ResourceContext;
+import org.apache.sling.spi.resource.provider.ResourceProvider;
import org.osgi.framework.BundleContext;
-import org.osgi.service.event.EventAdmin;
+import org.osgi.framework.Constants;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
/**
* The <code>FsResourceProvider</code> is a resource provider which maps
- * filesystem files and folders into the virtual resource tree. The provider is
+ * file system files and folders into the virtual resource tree. The provider is
* implemented in terms of a component factory, that is multiple instances of
* this provider may be created by creating respective configuration.
* <p>
@@ -51,40 +51,49 @@ import org.osgi.service.event.EventAdmin;
* and the file system path from where files and folders are mapped into the
* resource ({@link #PROP_PROVIDER_FILE}).
*/
-@Component(
- name="org.apache.sling.fsprovider.internal.FsResourceProvider",
- label="%resource.resolver.name",
- description="%resource.resolver.description",
- configurationFactory=true,
- policy=ConfigurationPolicy.REQUIRE,
- metatype=true
- )
-@Service(ResourceProvider.class)
-@Properties({
- @Property(name="service.description", value="Sling Filesystem Resource Provider"),
- @Property(name="service.vendor", value="The Apache Software Foundation"),
- @Property(name=ResourceProvider.ROOTS),
- @Property(name = "webconsole.configurationFactory.nameHint",
- value = "Root paths: {" + ResourceProvider.ROOTS + "}")
-})
-public class FsResourceProvider implements ResourceProvider {
-
- /**
- * The name of the configuration property providing file system path of
- * files and folders mapped into the resource tree (value is
- * "provider.file").
- */
- @Property
- 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").
- */
- @Property(longValue=FsResourceProvider.DEFAULT_CHECKINTERVAL)
- public static final String PROP_PROVIDER_CHECKINTERVAL = "provider.checkinterval";
-
- public static final long DEFAULT_CHECKINTERVAL = 1000;
+@Component(name="org.apache.sling.fsprovider.internal.FsResourceProvider",
+ service=ResourceProvider.class,
+ configurationPolicy=ConfigurationPolicy.REQUIRE,
+ property={
+ Constants.SERVICE_DESCRIPTION + "=Sling Filesystem Resource Provider",
+ Constants.SERVICE_VENDOR + "=The Apache Software Foundation",
+ "webconsole.configurationFactory.nameHint=Root paths: {" + ResourceProvider.PROPERTY_ROOT + "}"
+ })
+@Designate(ocd=FsResourceProvider.Config.class, factory=true)
+public class FsResourceProvider extends ResourceProvider<Object> {
+
+ @ObjectClassDefinition(name = "Apache Sling Filesystem Resource Provider",
+ description = "Configure an instance of the filesystem " +
+ "resource provider in terms of provider root and filesystem location")
+ public @interface Config {
+ /**
+ * The name of the configuration property providing file system path of
+ * files and folders mapped into the resource tree (value is
+ * "provider.file").
+ */
+ @AttributeDefinition(name = "Provider Root",
+ description = "Location in the virtual resource tree where the " +
+ "filesystem resources are mapped in. This property must not be an empty string.")
+ String provider_file();
+
+ /**
+ * The name of the configuration property providing the check interval
+ * for file changes (value is "provider.checkinterval").
+ */
+ @AttributeDefinition(name = "Check Interval",
+ 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.")
+ long provider_checkinterval() default 1000;
+
+ @AttributeDefinition(name = "Filesystem Root",
+ description = "Filesystem directory mapped to the virtual " +
+ "resource tree. This property must not be an empty string. If the path is " +
+ "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.")
+ String provider_root();
+ }
// The location in the resource tree where the resources are mapped
private String providerRoot;
@@ -98,22 +107,8 @@ public class FsResourceProvider implements ResourceProvider {
/** The monitor to detect file changes. */
private FileMonitor monitor;
- @Reference(cardinality=ReferenceCardinality.OPTIONAL_UNARY, policy=ReferencePolicy.DYNAMIC)
- private volatile EventAdmin eventAdmin;
-
- /**
- * Same as {@link #getResource(ResourceResolver, String)}, i.e. the
- * <code>request</code> parameter is ignored.
- *
- * @see #getResource(ResourceResolver, String)
- */
- public Resource getResource(ResourceResolver resourceResolver,
- HttpServletRequest request, String path) {
- return getResource(resourceResolver, path);
- }
-
/**
- * Returns a resource wrapping a filesystem file or folder for the given
+ * Returns a resource wrapping a file system file or folder for the given
* path. If the <code>path</code> is equal to the configured resource tree
* location of this provider, the configured file system file or folder is
* used for the resource. Otherwise the configured resource tree location
@@ -121,14 +116,19 @@ public class FsResourceProvider implements ResourceProvider {
* to access the file or folder. If no such file or folder exists, this
* method returns <code>null</code>.
*/
- public Resource getResource(ResourceResolver resourceResolver, String path) {
- return getResource(resourceResolver, path, getFile(path));
+ @Override
+ public Resource getResource(final ResolveContext<Object> ctx,
+ final String path,
+ final ResourceContext resourceContext,
+ final Resource parent) {
+ return getResource(ctx.getResourceResolver(), path, getFile(path));
}
/**
* Returns an iterator of resources.
*/
- public Iterator<Resource> listChildren(Resource parent) {
+ @Override
+ public Iterator<Resource> listChildren(final ResolveContext<Object> ctx, final Resource parent) {
File parentFile = parent.adaptTo(File.class);
// not a FsResource, try to create one from the resource
@@ -171,10 +171,12 @@ public class FsResourceProvider implements ResourceProvider {
Resource next = seek();
+ @Override
public boolean hasNext() {
return next != null;
}
+ @Override
public Resource next() {
if (!hasNext()) {
throw new NoSuchElementException();
@@ -185,6 +187,7 @@ public class FsResourceProvider implements ResourceProvider {
return result;
}
+ @Override
public void remove() {
throw new UnsupportedOperationException("remove");
}
@@ -210,33 +213,28 @@ public class FsResourceProvider implements ResourceProvider {
}
// ---------- SCR Integration
-
- protected void activate(BundleContext bundleContext, Map<?, ?> props) {
- String providerRoot = (String) props.get(ROOTS);
+ @Activate
+ protected void activate(BundleContext bundleContext, final Config config) {
+ String providerRoot = config.provider_root();
if (providerRoot == null || providerRoot.length() == 0) {
- throw new IllegalArgumentException(ROOTS + " property must be set");
+ throw new IllegalArgumentException("provider.root property must be set");
}
- String providerFileName = (String) props.get(PROP_PROVIDER_FILE);
+ String providerFileName = config.provider_file();
if (providerFileName == null || providerFileName.length() == 0) {
- throw new IllegalArgumentException(PROP_PROVIDER_FILE
- + " property must be set");
+ throw new IllegalArgumentException("provider.file property must be set");
}
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);
+ if ( config.provider_checkinterval() > 100 ) {
+ this.monitor = new FileMonitor(this, config.provider_checkinterval());
}
}
+ @Deactivate
protected void deactivate() {
if ( this.monitor != null ) {
this.monitor.stop();
@@ -247,10 +245,6 @@ public class FsResourceProvider implements ResourceProvider {
this.providerFile = null;
}
- EventAdmin getEventAdmin() {
- return this.eventAdmin;
- }
-
File getRootFile() {
return this.providerFile;
}
@@ -325,4 +319,12 @@ public class FsResourceProvider implements ResourceProvider {
// not applicable or not an existing file path
return null;
}
+
+ public ObservationReporter getObservationReporter() {
+ final ProviderContext ctx = this.getProviderContext();
+ if ( ctx != null ) {
+ return ctx.getObservationReporter();
+ }
+ 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] 08/15: Switch to parent pom 26
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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit a5f05c93d1636083d025254f0de8f8e1db0aa1b9
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 3 14:07:46 2016 +0000
Switch to parent pom 26
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1722720 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d4df64e..896f9f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>25</version>
+ <version>26</version>
<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] 07/15: SLING-5192 -
FsResourceProvider should set webconsole.configurationFactory.nameHint
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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 9f877f5aeb16fc7737997f78ac601cde2e409561
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Oct 23 14:36:20 2015 +0000
SLING-5192 - FsResourceProvider should set
webconsole.configurationFactory.nameHint
Update FsResourceProvider properties to include
webconsole.configurationFactory.nameHint.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1710224 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/fsprovider/internal/FsResourceProvider.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 bf4ba66..4b96f05 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
@@ -63,7 +63,9 @@ import org.osgi.service.event.EventAdmin;
@Properties({
@Property(name="service.description", value="Sling Filesystem Resource Provider"),
@Property(name="service.vendor", value="The Apache Software Foundation"),
- @Property(name=ResourceProvider.ROOTS)
+ @Property(name=ResourceProvider.ROOTS),
+ @Property(name = "webconsole.configurationFactory.nameHint",
+ value = "Root paths: {" + ResourceProvider.ROOTS + "}")
})
public class FsResourceProvider implements ResourceProvider {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 13/15: SLING-6364 make sure
webconsole nameHint is included in metatype
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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 566413ef59a264b1424ce70e7c925b4db15f7a7e
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Dec 6 23:05:16 2016 +0000
SLING-6364 make sure webconsole nameHint is included in metatype
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1772995 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/fsprovider/internal/FsResourceProvider.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
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 b952668..d68ad3a 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
@@ -56,8 +56,7 @@ import org.osgi.service.metatype.annotations.ObjectClassDefinition;
configurationPolicy=ConfigurationPolicy.REQUIRE,
property={
Constants.SERVICE_DESCRIPTION + "=Sling Filesystem Resource Provider",
- Constants.SERVICE_VENDOR + "=The Apache Software Foundation",
- "webconsole.configurationFactory.nameHint=Root paths: {" + ResourceProvider.PROPERTY_ROOT + "}"
+ Constants.SERVICE_VENDOR + "=The Apache Software Foundation"
})
@Designate(ocd=FsResourceProvider.Config.class, factory=true)
public class FsResourceProvider extends ResourceProvider<Object> {
@@ -93,6 +92,11 @@ public class FsResourceProvider extends ResourceProvider<Object> {
description = "Location in the virtual resource tree where the " +
"filesystem resources are mapped in. This property must not be an empty string.")
String provider_root();
+
+ /**
+ * Internal Name hint for web console.
+ */
+ String webconsole_configurationFactory_nameHint() default "Root path: {" + ResourceProvider.PROPERTY_ROOT + "}";
}
// The location in the resource tree where the resources are mapped
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 06/15: Update the main reactor
to parent 25
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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 0320672cf6e831cf4931b8a71518fd8e26f3d4f1
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:03:45 2015 +0000
Update the main reactor to parent 25
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1706780 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9cf87e9..d4df64e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>24</version>
+ <version>25</version>
<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/15: SLING-6364 rename config
property back to provider.root because this is expected for an resource
provider
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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit c2b7f0ccceef521435b6724b0db33e180b95205c
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Dec 6 23:02:24 2016 +0000
SLING-6364 rename config property back to provider.root because this is expected for an resource provider
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1772994 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/fsprovider/internal/FsResourceProvider.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 ef49b77..b952668 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
@@ -92,7 +92,7 @@ public class FsResourceProvider extends ResourceProvider<Object> {
@AttributeDefinition(name = "Provider Root",
description = "Location in the virtual resource tree where the " +
"filesystem resources are mapped in. This property must not be an empty string.")
- String provider_roots();
+ String provider_root();
}
// The location in the resource tree where the resources are mapped
@@ -215,7 +215,7 @@ public class FsResourceProvider extends ResourceProvider<Object> {
// ---------- SCR Integration
@Activate
protected void activate(BundleContext bundleContext, final Config config) {
- String providerRoot = config.provider_roots();
+ String providerRoot = config.provider_root();
if (providerRoot == null || providerRoot.length() == 0) {
throw new IllegalArgumentException("provider.root property must be set");
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 15/15: [maven-release-plugin]
copy for tag org.apache.sling.fsresource-1.2.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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 1150025e7356ead6ee8fd5c6920441cd8f000761
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 3 08:58:59 2017 +0000
[maven-release-plugin] copy for tag org.apache.sling.fsresource-1.2.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.2.0@1777095 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] 01/15: [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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit a4d1ae42f25001f5858e654abf8bb4caaa6a6f73
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 2 14:03:25 2014 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1622003 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index dd0d8a1..5f4d3fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>org.apache.sling.fsresource</artifactId>
<packaging>bundle</packaging>
- <version>1.1.4</version>
+ <version>1.1.5-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/sling/tags/org.apache.sling.fsresource-1.1.4</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.1.4</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.fsresource-1.1.4</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] 11/15: SLING-6364 fix
provider.roots config property name,
and property labels/descriptions (patch provided by Sandro Boehme)
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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 741a449584e28fd00794a7180a17efff891f08d0
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Dec 6 22:43:21 2016 +0000
SLING-6364 fix provider.roots config property name, and property labels/descriptions (patch provided by Sandro Boehme)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1772990 13f79535-47bb-0310-9956-ffa450edef68
---
.../fsprovider/internal/FsResourceProvider.java | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
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 ef30e3d..ef49b77 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
@@ -71,9 +71,12 @@ public class FsResourceProvider extends ResourceProvider<Object> {
* files and folders mapped into the resource tree (value is
* "provider.file").
*/
- @AttributeDefinition(name = "Provider Root",
- description = "Location in the virtual resource tree where the " +
- "filesystem resources are mapped in. This property must not be an empty string.")
+ @AttributeDefinition(name = "Filesystem Root",
+ description = "Filesystem directory mapped to the virtual " +
+ "resource tree. This property must not be an empty string. If the path is " +
+ "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.")
String provider_file();
/**
@@ -86,13 +89,10 @@ public class FsResourceProvider extends ResourceProvider<Object> {
"(the default is 1000). If a change is detected, resource events are sent through the event admin.")
long provider_checkinterval() default 1000;
- @AttributeDefinition(name = "Filesystem Root",
- description = "Filesystem directory mapped to the virtual " +
- "resource tree. This property must not be an empty string. If the path is " +
- "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.")
- String provider_root();
+ @AttributeDefinition(name = "Provider Root",
+ description = "Location in the virtual resource tree where the " +
+ "filesystem resources are mapped in. This property must not be an empty string.")
+ String provider_roots();
}
// The location in the resource tree where the resources are mapped
@@ -215,7 +215,7 @@ public class FsResourceProvider extends ResourceProvider<Object> {
// ---------- SCR Integration
@Activate
protected void activate(BundleContext bundleContext, final Config config) {
- String providerRoot = config.provider_root();
+ String providerRoot = config.provider_roots();
if (providerRoot == null || providerRoot.length() == 0) {
throw new IllegalArgumentException("provider.root property must be set");
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 05/15: set parent version to 24
and add empty relativePath where missing
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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit b030d0c1896c20b1498767112199cde59f94cb4c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 7 08:09:17 2015 +0000
set parent version to 24 and add empty relativePath where missing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1689593 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 525a58f..9cf87e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>23</version>
+ <version>24</version>
<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] 03/15: SLING-4698 - Set
parent.relativePath to empty for all modules
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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 43259e6b599c1a0d1e4bcba3287c29fe61d5f634
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 7 10:14:40 2015 +0000
SLING-4698 - Set parent.relativePath to empty for all modules
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1678154 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8d0875e..167abec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>22</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <relativePath/>
</parent>
<artifactId>org.apache.sling.fsresource</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-fsresource] 10/15: SLING-6279 : Switch from
event admin to Sling Resource Observation API
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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit a0bc09c0da094e6288effa4e47ea6a9b4ce19b0c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Nov 14 15:12:03 2016 +0000
SLING-6279 : Switch from event admin to Sling Resource Observation API
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1769646 13f79535-47bb-0310-9956-ffa450edef68
---
.../OSGI-INF/metatype/metatype.properties | 45 ----------------------
1 file changed, 45 deletions(-)
diff --git a/src/main/resources/OSGI-INF/metatype/metatype.properties b/src/main/resources/OSGI-INF/metatype/metatype.properties
deleted file mode 100644
index 03f9ecf..0000000
--- a/src/main/resources/OSGI-INF/metatype/metatype.properties
+++ /dev/null
@@ -1,45 +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.
-#
-
-
-#
-# This file contains localization strings for configuration labels and
-# descriptions as used in the metatype.xml descriptor generated by the
-# the SCR plugin
-
-#
-# Localizations for FsResourceProvider configuration
-resource.resolver.name = Apache Sling Filesystem Resource Provider
-resource.resolver.description = Configure an instance of the filesystem \
- resource provider in terms of provider root and filesystem location
-
-provider.roots.name = Provider Root
-provider.roots.description = Location in the virtual resource tree where the \
- filesystem resources are mapped in. This property must not be an empty string.
-provider.file.name = Filesystem Root
-provider.file.description = Filesystem directory mapped to the virtual \
- resource tree. This property must not be an empty string. If the path is \
- 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] 04/15: Update to Sling Parent 23
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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit be69e700596a55f377dcf3b141fd73b752287f82
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:08:16 2015 +0000
Update to Sling Parent 23
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1687500 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 167abec..525a58f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>22</version>
+ <version>23</version>
<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/15: [maven-release-plugin]
prepare release org.apache.sling.fsresource-1.2.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.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 57279b1743f7569a3bc558dd2028712534cf32c8
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 3 08:58:46 2017 +0000
[maven-release-plugin] prepare release org.apache.sling.fsresource-1.2.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1777094 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0b84370..926755a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>29</version>
- <relativePath/>
+ <relativePath />
</parent>
<artifactId>org.apache.sling.fsresource</artifactId>
<packaging>bundle</packaging>
- <version>1.1.5-SNAPSHOT</version>
+ <version>1.2.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.2.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.2.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.fsresource-1.2.0</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.