You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by kg...@apache.org on 2011/12/06 08:54:22 UTC
svn commit: r1210811 - in
/felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi:
HttpServiceImpl.java Logger.java ServiceRegistrationHandler.java
Author: kgilmer
Date: Tue Dec 6 07:54:22 2011
New Revision: 1210811
URL: http://svn.apache.org/viewvc?rev=1210811&view=rev
Log:
httplite: javadoc additions to public methods.
Modified:
felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java
felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/Logger.java
felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistrationHandler.java
Modified: felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java?rev=1210811&r1=1210810&r2=1210811&view=diff
==============================================================================
--- felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java (original)
+++ felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/HttpServiceImpl.java Tue Dec 6 07:54:22 2011
@@ -70,6 +70,7 @@ public class HttpServiceImpl implements
* Bundle that registered with the service
* @param logger
* instance of Logger
+ * @param servletMap Map of servlet instances.
* @throws IOException
*/
public HttpServiceImpl(final Bundle bundle, final Server server, final Logger logger, Map servletMap) throws IOException
Modified: felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/Logger.java
URL: http://svn.apache.org/viewvc/felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/Logger.java?rev=1210811&r1=1210810&r2=1210811&view=diff
==============================================================================
--- felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/Logger.java (original)
+++ felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/Logger.java Tue Dec 6 07:54:22 2011
@@ -50,9 +50,21 @@ import org.osgi.framework.ServiceReferen
**/
public class Logger implements ServiceListener
{
+ /**
+ * ERROR level
+ */
public static final int LOG_ERROR = 1;
+ /**
+ * WARNING level
+ */
public static final int LOG_WARNING = 2;
+ /**
+ * INFO level
+ */
public static final int LOG_INFO = 3;
+ /**
+ * DEBUG level
+ */
public static final int LOG_DEBUG = 4;
private int m_logLevel = 1;
@@ -63,15 +75,24 @@ public class Logger implements ServiceLi
private ServiceReference m_logRef = null;
private Object[] m_logger = null;
+ /**
+ *
+ */
public Logger()
{
}
+ /**
+ * @param i log level
+ */
public final synchronized void setLogLevel(int i)
{
m_logLevel = i;
}
+ /**
+ * @return current log level
+ */
public final synchronized int getLogLevel()
{
return m_logLevel;
@@ -83,31 +104,62 @@ public class Logger implements ServiceLi
startListeningForLogService();
}
+ /**
+ * @param level log level
+ * @param msg message to log
+ */
public final void log(int level, String msg)
{
_log(null, null, level, msg, null);
}
+ /**
+ * @param level log level
+ * @param msg message to log
+ * @param throwable error to log
+ */
public final void log(int level, String msg, Throwable throwable)
{
_log(null, null, level, msg, throwable);
}
+ /**
+ * @param sr service reference to log
+ * @param level level to log
+ * @param msg message to log
+ */
public final void log(ServiceReference sr, int level, String msg)
{
_log(null, sr, level, msg, null);
}
+ /**
+ * @param sr service reference to log
+ * @param level level to log
+ * @param msg message to log
+ * @param throwable error to log
+ */
public final void log(ServiceReference sr, int level, String msg, Throwable throwable)
{
_log(null, sr, level, msg, throwable);
}
+ /**
+ * @param bundle bundle to log
+ * @param level level to log
+ * @param msg message to log
+ */
public final void log(Bundle bundle, int level, String msg)
{
_log(bundle, null, level, msg, null);
}
+ /**
+ * @param bundle source of log event
+ * @param level level to log
+ * @param msg message to log
+ * @param throwable error to log
+ */
public final void log(Bundle bundle, int level, String msg, Throwable throwable)
{
_log(bundle, null, level, msg, throwable);
Modified: felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistrationHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistrationHandler.java?rev=1210811&r1=1210810&r2=1210811&view=diff
==============================================================================
--- felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistrationHandler.java (original)
+++ felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/ServiceRegistrationHandler.java Tue Dec 6 07:54:22 2011
@@ -32,6 +32,7 @@ public interface ServiceRegistrationHand
/**
* Process the request against the registered provider.
*
+ * @param closeConnection if true close connection after handling request
* @throws IOException on I/O error
* @throws ServletException on Servlet error
*/