Author: cziegeler
Date: Mon Dec 10 07:05:14 2007
New Revision: 602923
URL: http://svn.apache.org/viewvc?rev=602923&view=rev
Log:
Fix some javadocs.
Modified:
incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java
Modified:
incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java?rev=602923&r1=602922&r2=602923&view=diff
==============================================================================
---
incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java
(original)
+++
incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java
Mon Dec 10 07:05:14 2007
@@ -80,7 +80,7 @@
* <li>The <code>com/day/osgi/servlet/Sling.properties</code> is read from
* the servlet class path. This properties file contains default settings.</li>
* <li>Extensions of this servlet may provide additional properties to be
- * loaded overwriting the [EMAIL PROTECTED]
#loadPropertiesOverride(Properties)} method.
+ * loaded overwriting the [EMAIL PROTECTED] #loadPropertiesOverride(Map)}
method.
* <li>Finally, web application init parameters are added to the properties and
* may overwrite existing properties of the same name(s).
* </ol>
@@ -168,7 +168,7 @@
* Felix framework properties (value is "sling.ignoreSystemProperties"). If
* this is property is set to <code>true</code> (case does not matter),
* the system properties will not be used by
- * [EMAIL PROTECTED] #loadConfigProperties(Properties)}.
+ * [EMAIL PROTECTED] #loadConfigProperties(Map)}.
*/
public static final String SLING_IGNORE_SYSTEM_PROPERTIES =
"sling.ignoreSystemProperties";
@@ -207,7 +207,7 @@
* system bundle context and the <code>Felix</code> instance as servlet
* context attributes.
*
- * @throws ServletException if the framework cannot be initialized.
+ * @throws BundleException if the framework cannot be initialized.
*/
public Sling(Logger logger, ResourceProvider resourceProvider,
Map<String, String> propOverwrite) throws BundleException {
