Author: rwesten
Date: Thu Jul 16 11:15:02 2015
New Revision: 1691360
URL: http://svn.apache.org/r1691360
Log:
merged implementation of STANBOL-1438 to trunk
Added:
stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/DirectoryDataFileProvider.java
- copied unchanged from r1691353,
stanbol/branches/release-0.12/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/DirectoryDataFileProvider.java
Modified:
stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java
stanbol/trunk/commons/stanboltools/datafileprovider/src/main/resources/OSGI-INF/metatype/metatype.properties
Modified:
stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java?rev=1691360&r1=1691359&r2=1691360&view=diff
==============================================================================
---
stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java
(original)
+++
stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java
Thu Jul 16 11:15:02 2015
@@ -135,7 +135,7 @@ public class MainDataFileProvider implem
}
@SuppressWarnings("unchecked")
- private <ResultType> ResultType requireProperty(Dictionary<?, ?> props,
String name, Class<ResultType> clazz)
+ static <ResultType> ResultType requireProperty(Dictionary<?, ?> props,
String name, Class<ResultType> clazz)
throws ConfigurationException {
final Object o = props.get(name);
if(o == null) {
Modified:
stanbol/trunk/commons/stanboltools/datafileprovider/src/main/resources/OSGI-INF/metatype/metatype.properties
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1691360&r1=1691359&r2=1691360&view=diff
==============================================================================
---
stanbol/trunk/commons/stanboltools/datafileprovider/src/main/resources/OSGI-INF/metatype/metatype.properties
(original)
+++
stanbol/trunk/commons/stanboltools/datafileprovider/src/main/resources/OSGI-INF/metatype/metatype.properties
Thu Jul 16 11:15:02 2015
@@ -18,8 +18,19 @@ org.apache.stanbol.commons.stanboltools.
read-only data files for Stanbol components. Delegates to other
DataFileProviders unless the requested \
file is found in its data files directory
+
+org.apache.stanbol.commons.stanboltools.datafileprovider.impl.DirectoryDataFileProvider.name=Directory
DataFileProvider
+org.apache.stanbol.commons.stanboltools.datafileprovider.impl.DirectoryDataFileProvider.description=\
+Provides data files from the configured directory.
+
data.files.folder.name = Data files folder
data.files.folder.description = Path (absolute or relative) where data files
can be found
max.events.name = Max. events
-max.events.description = Maximum number of DataFileProviderEvents to keep
\ No newline at end of file
+max.events.description = Maximum number of DataFileProviderEvents to keep
+
+service.ranking.name=Ranking
+service.ranking.description=The ranking of a DataFileProvider determines the
order \
+in that files are looked for. If two DataFileProvider can provide a requested
file \
+it will be returned from those with the higher ranking. Typically backup \
+DataFileProvider should use a negative ranking.
\ No newline at end of file
