You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2010/11/26 11:40:24 UTC
svn commit: r1039306 - in /sling/whiteboard/fmeschbe/milton/src/main:
java/org/apache/sling/whiteboard/fmeschbe/miltondav/impl/MiltonDavServlet.java
resources/ resources/ORG-INF/ resources/ORG-INF/metatype/
resources/ORG-INF/metatype/metatype.properties
Author: fmeschbe
Date: Fri Nov 26 10:40:24 2010
New Revision: 1039306
URL: http://svn.apache.org/viewvc?rev=1039306&view=rev
Log:
Improve Metatype descriptor support
Added:
sling/whiteboard/fmeschbe/milton/src/main/resources/
sling/whiteboard/fmeschbe/milton/src/main/resources/ORG-INF/
sling/whiteboard/fmeschbe/milton/src/main/resources/ORG-INF/metatype/
sling/whiteboard/fmeschbe/milton/src/main/resources/ORG-INF/metatype/metatype.properties (with props)
Modified:
sling/whiteboard/fmeschbe/milton/src/main/java/org/apache/sling/whiteboard/fmeschbe/miltondav/impl/MiltonDavServlet.java
Modified: sling/whiteboard/fmeschbe/milton/src/main/java/org/apache/sling/whiteboard/fmeschbe/miltondav/impl/MiltonDavServlet.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/milton/src/main/java/org/apache/sling/whiteboard/fmeschbe/miltondav/impl/MiltonDavServlet.java?rev=1039306&r1=1039305&r2=1039306&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/milton/src/main/java/org/apache/sling/whiteboard/fmeschbe/miltondav/impl/MiltonDavServlet.java (original)
+++ sling/whiteboard/fmeschbe/milton/src/main/java/org/apache/sling/whiteboard/fmeschbe/miltondav/impl/MiltonDavServlet.java Fri Nov 26 10:40:24 2010
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
* <li>Register with the Http Service</li>
* </ul>
*/
-@Component(metatype = true)
+@Component(metatype = true, name = "org.apache.sling.miltondav.impl.MiltonDavServlet", label = "miltondav.name", description = "miltondav.description")
public class MiltonDavServlet extends AbstractMiltonDavServlet {
// default location at which the service is registered
Added: sling/whiteboard/fmeschbe/milton/src/main/resources/ORG-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/milton/src/main/resources/ORG-INF/metatype/metatype.properties?rev=1039306&view=auto
==============================================================================
--- sling/whiteboard/fmeschbe/milton/src/main/resources/ORG-INF/metatype/metatype.properties (added)
+++ sling/whiteboard/fmeschbe/milton/src/main/resources/ORG-INF/metatype/metatype.properties Fri Nov 26 10:40:24 2010
@@ -0,0 +1,41 @@
+#
+# 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 Sling SCR plugin
+
+miltondav.name = Milton based WebDAV Servlet
+miltondav.description = Configuration for the standalone WebDAV servlet based \
+ on the Milton WebDAV library. It is directly accessible in its own URL space \
+ and requests to this servlet do not pass by the Sling Main Servlet and request \
+ processing.
+
+prefix.name = Root Path
+prefix.description = The root path at which the Milton WebDAV Servlet is \
+ accessible. The default value is "/dav".
+
+require.auth.name = Require Authentication
+require.auth.description = Configures whether (HTTP Basic) authentication is \
+ required or not. If this property is set to true (the default), all access \
+ to this WebDAV servlet must be HTTP Basic authenticated. Otherwise \
+ authentication is dicated by the Sling Authentication Infrastructure. It is \
+ strongly recommended to not set this value to false unless you know exactly \
+ what you are doing ;-)
Propchange: sling/whiteboard/fmeschbe/milton/src/main/resources/ORG-INF/metatype/metatype.properties
------------------------------------------------------------------------------
svn:eol-style = native