Author: fmeschbe Date: Thu Jan 15 05:46:24 2009 New Revision: 734704 URL: http://svn.apache.org/viewvc?rev=734704&view=rev Log: SLING-829 Ensure Apache Sling prefix on all configuration names
Modified: incubator/sling/trunk/commons/log/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/engine/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/extensions/httpauth/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/extensions/i18n/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/extensions/jcrinstall/service/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/jcr/classloader/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/jcr/resource/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/jcr/webdav/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/samples/fsresource/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/samples/path-based-rtp/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/scripting/java/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/scripting/jsp/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/servlets/get/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/servlets/post/src/main/resources/OSGI-INF/metatype/metatype.properties incubator/sling/trunk/servlets/resolver/src/main/resources/OSGI-INF/metatype/metatype.properties Modified: incubator/sling/trunk/commons/log/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/log/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/commons/log/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/commons/log/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -17,7 +17,7 @@ # under the License. # -log.name = Sling Logging Configuration +log.name = Apache Sling Logging Configuration log.description = Global configuration setup for the Sling OSGi LogService \ implementation log.level.name = Log Level @@ -46,10 +46,10 @@ {5} the actual debug message. If the log call includes a Throwable, the \ stacktrace is just appended to the message. -log.factory.writer.name = Sling Logging Writer Configuration +log.factory.writer.name = Apache Sling Logging Writer Configuration log.factory.writer.description = Configure a Logger Writer for Sling Logging -log.factory.config.name = Sling Logging Logger Configuration +log.factory.config.name = Apache Sling Logging Logger Configuration log.factory.config.description = Configure Loggers with levels, pattern and \ destination log.loggers.name = Categories @@ -57,4 +57,4 @@ configuration. Each category applies for any child category unless configured \ otherwise. E.g. a category of org.apache.sling applies to category \ org.apache.sling.commons unless there is a different configuration for \ - org.apache.sling.commons. \ No newline at end of file + org.apache.sling.commons. Modified: incubator/sling/trunk/engine/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/engine/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/engine/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -26,7 +26,7 @@ # # Request Authenticator. Uses AuthenticationHandlers for the # actual work of extracting user details from the request. -auth.name = Request Authenticator +auth.name = Apache Sling Request Authenticator auth.description = Extracts user authentication details from the request with \ the help of authentication handlers registered as separate services. One \ example of such an authentication handler is the handler HTTP Authorization \ @@ -49,7 +49,7 @@ # # Request Loggger Filter -request.log.name = Request Logger +request.log.name = Apache Sling Request Logger request.log.description = Configures the main loggers of the request logger, \ namely the request log and the access log. Further loggers may be configured \ by creating configurations for the Request Logger Service. @@ -83,7 +83,7 @@ # # RequestLoggerService (factory) -request.log.service.name = Customizable Request Data Logger +request.log.service.name = Apache Sling Customizable Request Data Logger request.log.service.description = This configuration creates customizable \ loggers for request content. Each configuration results in a logger writing \ the requested data. Deleting an existing configuration removes the respective \ Modified: incubator/sling/trunk/extensions/httpauth/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/httpauth/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/extensions/httpauth/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/extensions/httpauth/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -25,7 +25,7 @@ # # Authentication handler for HTTP Authorization header -auth.http.name = Authorization Header Authenticator +auth.http.name = Apache Sling Authorization Header Authenticator auth.http.description = This handler extracts user name and password information \ from the HTTP Authorization header auth.http.realm.name = Realm Modified: incubator/sling/trunk/extensions/i18n/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/i18n/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/extensions/i18n/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/extensions/i18n/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -17,7 +17,7 @@ # under the License. # -provider.name = JCR ResourceBundle Provider +provider.name = Apache Sling JCR ResourceBundle Provider provider.description = ResourceBundleProvider service which loads the messages \ from the repository. If the user name field is left empty, the provider will \ log into the repository as the administrative user. Otherwise the given user \ Modified: incubator/sling/trunk/extensions/jcrinstall/service/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/service/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/extensions/jcrinstall/service/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/extensions/jcrinstall/service/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -23,7 +23,7 @@ # descriptions as used in the metatype.xml descriptor generated by the # the SCR plugin -jcrinstall.name = jcrinstall +jcrinstall.name = Apache Sling JCR Install jcrinstall.description = Installs OSGi bundles and configurations found \ in the JCR Repository. @@ -32,4 +32,4 @@ to this OSGi start level, which should be higher than the start level \ of the jcrinstall bundle. The default start level of the framework should \ be equal or higher to the configured value, so that installed bundles are \ - started right after being installed by jcrinstall. \ No newline at end of file + started right after being installed by jcrinstall. Modified: incubator/sling/trunk/jcr/classloader/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/classloader/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/jcr/classloader/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/jcr/classloader/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -22,7 +22,7 @@ # descriptions as used in the metatype.xml descriptor generated by the # the Sling SCR plugin -loader.name = Repository Class Loader Factory +loader.name = Apache Sling Repository Class Loader Factory loader.description = Configuration for the Repository Class Loader Factory. This \ configuration applies to all clients of the factory even though each Bundle \ using the factory retrieves its own factory. The class path of the created \ Modified: incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -22,7 +22,7 @@ # descriptions as used in the metatype.xml descriptor generated by the # the Sling SCR plugin -repository.name = Foreign JCR Repository +repository.name = Apache Sling Remote JCR Repository repository.description = Configuration to access an existing JCR Repository \ and provide it as a SlingRepository, standard JCR Repository and CRXRepository. @@ -96,4 +96,4 @@ name.name = Repository Name name.description = The name under which the repository will be looked up in \ the JNDI or RMI. For RMI, this must be a standard RMI URL of the \ - form "rmi://host[:port]/name". \ No newline at end of file + form "rmi://host[:port]/name". Modified: incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -22,7 +22,7 @@ # descriptions as used in the metatype.xml descriptor generated by the # the Sling SCR plugin -repository.name = Embedded JCR Repository +repository.name = Apache Sling Embedded JCR Repository repository.description = Configuration to launch an embedded JCR Repository \ and provide it as a SlingRepository, standard JCR Repository and CRXRepository. \ In addition, if the registration URL is not empty, the repository is registered \ @@ -116,7 +116,7 @@ # # JNDI Registration Support -jndi.name = Embedded JCR Repository JNDI Registrar +jndi.name = Apache Sling Embedded JCR Repository JNDI Registrar jndi.description = The JNDI Registrar listens for CRX embedded repositories \ to be registered as services and registers them in the JNDI context under the \ name specified in the "name" service property. @@ -131,7 +131,7 @@ # # RMI Registration Support -rmi.name = Embedded JCR Repository RMI Registrar +rmi.name = Apache Sling Embedded JCR Repository RMI Registrar rmi.description = The RMI Registrar listens for CRX embedded repositories \ to be registered as services and registers them in an RMI registry under the \ name specified in the "name" service property. Modified: incubator/sling/trunk/jcr/resource/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/jcr/resource/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/jcr/resource/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -25,7 +25,7 @@ # # Localizations for JcrResourceResolverFactoryImpl configuration -resource.resolver.name = Resource Resolver +resource.resolver.name = Apache Sling Resource Resolver resource.resolver.description = Configures the Resource Resolver for request \ URL and resource path rewriting. @@ -89,4 +89,4 @@ containing colons, even though they are perfectly valid characters in the \ path part of URI references with a scheme. The default value of this property \ if no configuration is provided is "true". This configuration setting is only \ - used by the New Resource Resolver. \ No newline at end of file + used by the New Resource Resolver. Modified: incubator/sling/trunk/jcr/webdav/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/webdav/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/jcr/webdav/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/jcr/webdav/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -27,7 +27,7 @@ # SimpleWebDavServlet # (This servlet is directly registered with the HttpService besides the # SlingMainServlet. Requests to this servlet do not pass by Sling) -dav.name = Simple WebDAV Servlet +dav.name = Apache Sling Simple WebDAV Servlet dav.description = The Simple WebDAV Servlet allows direct access to the \ complete Repository. It is directly accessible in its own URL space and \ requests to this servlet do not pass by the Sling Main Servlet and request \ @@ -98,4 +98,4 @@ type is allowed to be created as the jcr:content child node of the node type \ defined by the Non-Collection Primary Type. In addition the node type must \ allow at least the following properties: jcr:data (binary), jcr:lastModified \ - (date), and jcr:mimeType (string). \ No newline at end of file + (date), and jcr:mimeType (string). Modified: incubator/sling/trunk/samples/fsresource/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/samples/fsresource/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/samples/fsresource/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/samples/fsresource/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -25,7 +25,7 @@ # # Localizations for FsResourceProvider configuration -resource.resolver.name = Filesystem Resource Provider +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 @@ -37,4 +37,4 @@ 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. \ No newline at end of file + file or folder, an empty folder is created. Modified: incubator/sling/trunk/samples/path-based-rtp/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/samples/path-based-rtp/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/samples/path-based-rtp/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/samples/path-based-rtp/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -23,11 +23,11 @@ # descriptions as used in the metatype.xml descriptor generated by the # the Sling SCR plugin -defaultRtp.name = Sling default resource type provider +defaultRtp.name = Apache Sling Sling Default Resource Type Provider defaultRtp.description = Defines the resource type for Nodes which do not \ have an explicit sling:resourceType property path.mapping.name = Path mappings path.mapping.description = List of paths for which path-based default resource \ types are active. For example, /content:2 means "use the second path component \ -as the default resource type for nodes stored under /content". \ No newline at end of file +as the default resource type for nodes stored under /content". Modified: incubator/sling/trunk/scripting/java/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/java/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/scripting/java/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/scripting/java/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -22,7 +22,7 @@ # descriptions as used in the metatype.xml descriptor generated by the # the Sling SCR plugin -javahandler.name = Java Script Handler +javahandler.name = Apache Sling Java Script Handler javahandler.description The Java Script Handler supports development of Java Servlets \ to render response content. @@ -55,4 +55,4 @@ java.outputPath.name = Compilation Location java.outputPath.description = What directory should we use when \ compiling Java files? Default is /var/classes. - \ No newline at end of file + Modified: incubator/sling/trunk/scripting/jsp/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jsp/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/scripting/jsp/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/scripting/jsp/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -22,7 +22,7 @@ # descriptions as used in the metatype.xml descriptor generated by the # the Sling SCR plugin -jsphandler.name = JSP Script Handler +jsphandler.name = Apache Sling JSP Script Handler jsphandler.description The JSP Script Handler supports development of JSP \ scripts to render response content on behalf of ScriptComponents. Internally \ Jasper 5.5.20 JSP Engine is used together with the Eclipse Java Compiler to \ @@ -86,4 +86,4 @@ jasper.displaySourceFragments.name = Display Source Fragments jasper.displaySourceFragments.description = Should we include a source fragment \ - in exception messages, which could be displayed to the developer \ No newline at end of file + in exception messages, which could be displayed to the developer Modified: incubator/sling/trunk/servlets/get/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/get/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/servlets/get/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/servlets/get/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -23,7 +23,7 @@ # descriptions as used in the metatype.xml descriptor generated by the # the Sling SCR plugin -servlet.get.name = Sling GET Servlet +servlet.get.name = Apache Sling GET Servlet servlet.get.description = The Sling GET Servlet is registered as the default \ servlet to handle GET requests in Sling. Modified: incubator/sling/trunk/servlets/post/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/post/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/servlets/post/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/servlets/post/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -23,7 +23,7 @@ # descriptions as used in the metatype.xml descriptor generated by the # the Sling SCR plugin -servlet.post.name = Sling POST Servlet +servlet.post.name = Apache Sling POST Servlet servlet.post.description = The Sling POST Servlet is registered as the default \ servlet to handle POST requests in Sling. servlet.post.dateFormats.name = Date Format @@ -43,4 +43,4 @@ servlet.post.nodeNameMaxLength.description = Maximum number of characters to \ use for automatically generated node names. The default value is 20. Note, \ that actual node names may be generated with at most 4 more characters if the \ - numeric suffixes must be appended to make the name unique. \ No newline at end of file + numeric suffixes must be appended to make the name unique. Modified: incubator/sling/trunk/servlets/resolver/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=734704&r1=734703&r2=734704&view=diff ============================================================================== --- incubator/sling/trunk/servlets/resolver/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/sling/trunk/servlets/resolver/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Jan 15 05:46:24 2009 @@ -23,7 +23,7 @@ # descriptions as used in the metatype.xml descriptor generated by the # the Sling SCR plugin -servletresolver.name = Sling Servlet/Script Resolver and Error Handler +servletresolver.name = Apache Sling Servlet/Script Resolver and Error Handler servletresolver.description = The Sling Servlet and Script Resolver has \ multiple tasks: One it is used as the ServletResolver to select the Servlet \ or Script to call to handle the request. Second it acts as the \ @@ -37,4 +37,4 @@ registering a Servlet whose Servlet registration properties define a relative \ path. The default value is "/apps". This path should be part of the search \ path configured in the Resource Resolver Factory otherwise a thus registered \ - servlet may not be found. \ No newline at end of file + servlet may not be found.