Author: cziegeler
Date: Tue Dec 18 06:28:16 2007
New Revision: 605214
URL: http://svn.apache.org/viewvc?rev=605214&view=rev
Log:
Fix javadocs.
Modified:
incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
Modified:
incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java?rev=605214&r1=605213&r2=605214&view=diff
==============================================================================
---
incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
(original)
+++
incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
Tue Dec 18 06:28:16 2007
@@ -23,7 +23,6 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.Properties;
import java.util.Set;
import javax.servlet.GenericServlet;
@@ -73,7 +72,7 @@
* <li>The <code>com/day/osgi/servlet/SlingServlet.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] #loadConfigProperties()} method.
* <li>Finally, web application init parameters are added to the properties and
* may overwrite existing properties of the same name(s).
* </ol>
@@ -247,6 +246,7 @@
props.put("sling.include.jcr-client", "jcr-client.properties");
// copy context init parameters
+ @SuppressWarnings("unchecked")
Enumeration<String> pe = getServletContext().getInitParameterNames();
while (pe.hasMoreElements()) {
String name = pe.nextElement();
