Skip to Content.
Sympa Menu

notify-dpml - r1275 - in trunk/main: central/src/docs/about/download depot/core/src/main/net/dpml/depot planet/http/impl/src/main/net/dpml/http station/server/src/main/net/dpml/station/server

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1275 - in trunk/main: central/src/docs/about/download depot/core/src/main/net/dpml/depot planet/http/impl/src/main/net/dpml/http station/server/src/main/net/dpml/station/server
  • Date: Mon, 27 Mar 2006 17:38:36 +0200

Author: mcconnell
Date: 2006-03-27 17:38:31 +0200 (Mon, 27 Mar 2006)
New Revision: 1275

Modified:
trunk/main/central/src/docs/about/download/archive.xml
trunk/main/depot/core/src/main/net/dpml/depot/DepotHandler.java
trunk/main/depot/core/src/main/net/dpml/depot/LogStatement.java
trunk/main/depot/core/src/main/net/dpml/depot/Main.java
trunk/main/planet/http/impl/src/main/net/dpml/http/BoundedThreadPool.java
trunk/main/planet/http/impl/src/main/net/dpml/http/ConnectorContext.java

trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHandlerContext.java
trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHelper.java
trunk/main/planet/http/impl/src/main/net/dpml/http/HashUserRealm.java
trunk/main/planet/http/impl/src/main/net/dpml/http/LogAdapter.java
trunk/main/planet/http/impl/src/main/net/dpml/http/LoggerAdapter.java
trunk/main/planet/http/impl/src/main/net/dpml/http/NCSARequestLog.java

trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceContextHandler.java
trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceHandler.java

trunk/main/planet/http/impl/src/main/net/dpml/http/SelectChannelConnector.java
trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java

trunk/main/planet/http/impl/src/main/net/dpml/http/ServletContextHandler.java
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletEntry.java
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHandler.java
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHolder.java
trunk/main/planet/http/impl/src/main/net/dpml/http/SslSocketConnector.java

trunk/main/planet/http/impl/src/main/net/dpml/http/WebAppContextHandler.java

trunk/main/station/server/src/main/net/dpml/station/server/LoggingServer.java

trunk/main/station/server/src/main/net/dpml/station/server/RemoteApplication.java

trunk/main/station/server/src/main/net/dpml/station/server/RemoteStation.java

trunk/main/station/server/src/main/net/dpml/station/server/StationServerPlugin.java
Log:
checkstyle and general housekeeping

Modified: trunk/main/central/src/docs/about/download/archive.xml
===================================================================
--- trunk/main/central/src/docs/about/download/archive.xml 2006-03-27
14:09:15 UTC (rev 1274)
+++ trunk/main/central/src/docs/about/download/archive.xml 2006-03-27
15:38:31 UTC (rev 1275)
@@ -20,7 +20,26 @@
<subsection name="Build @VERSION@">

<p>
+ Enhancements include:
</p>
+ <ul>
+ <li>Resolves a bug related to application deployment within the
Station under the
+ Unix platform.</li>
+ <li>Rewrite of the multi-JVM log aggregation services eliminating
a low-level
+ issued raised by RMI log events during handler
establishement.</li>
+ <li>An improved implementation of the JVM process identification
model.</li>
+ <li>Resolution of a number of API inconsistencies.</li>
+ <li>Improved management of lifecycle policies (import, export,
type defaults, etc.).</li>
+ <li>Numerouse documentation updates.</li>
+ <li>Additional testcases.</li>
+ <li>Improved error handling in the Station console.</li>
+ <li>cleanup logging channel assignments to ensure that new
top-level components are
+ created under the station namespace when launched by the
station.</li>
+ <li>Update station shutdown semantic to formally decommision
Transit.</li>
+ <li>Improvements to symbol dereferencing logic.</li>
+ <li>Update feature task to handle resolution of link uris.</li>
+ <li>Update depot to reference links in preference to full
qualified artifacts.</li>
+ </ul>

<table>
<tr>

Modified: trunk/main/depot/core/src/main/net/dpml/depot/DepotHandler.java
===================================================================
--- trunk/main/depot/core/src/main/net/dpml/depot/DepotHandler.java
2006-03-27 14:09:15 UTC (rev 1274)
+++ trunk/main/depot/core/src/main/net/dpml/depot/DepotHandler.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -18,19 +18,16 @@

package net.dpml.depot;

+import java.io.OutputStream;
import java.io.IOException;
-import java.io.OutputStream;
import java.io.ObjectOutputStream;
import java.io.BufferedOutputStream;
-import java.io.Serializable;
import java.net.Socket;
import java.net.SocketException;
-import java.rmi.RemoteException;
import java.util.logging.Handler;
import java.util.logging.LogRecord;

import net.dpml.lang.PID;
-import net.dpml.lang.LoggingService;

/**
* Logging message handler that redirects log messages from a subprocess to
@@ -57,9 +54,11 @@

/**
* Creation of a new handler instance.
- * @exception Exception if an error occurs
+ * @param host the log server host
+ * @param port the port
+ * @exception IOException if an IO error occurs
*/
- public DepotHandler( String host, int port ) throws Exception
+ public DepotHandler( String host, int port ) throws IOException
{
m_socket = new Socket( host, port );
m_output = m_socket.getOutputStream();
@@ -97,8 +96,12 @@
}

/**
- * Publish a log record.
- * @param record the log record
+ * Publish a log record. The implementation packages the supplied log
+ * record under a LogStatement, binding the record with the associated
process
+ * identifier. The statement is subsequently writen to a socket
established
+ * within the instance constructor.
+ *
+ * @param record the log record to publish
*/
public void publish( LogRecord record )
{

Modified: trunk/main/depot/core/src/main/net/dpml/depot/LogStatement.java
===================================================================
--- trunk/main/depot/core/src/main/net/dpml/depot/LogStatement.java
2006-03-27 14:09:15 UTC (rev 1274)
+++ trunk/main/depot/core/src/main/net/dpml/depot/LogStatement.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -18,21 +18,16 @@

package net.dpml.depot;

-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.ObjectOutputStream;
import java.io.Serializable;
-import java.net.Socket;
-import java.rmi.RemoteException;
-import java.util.logging.Handler;
import java.util.logging.LogRecord;
-import java.util.logging.Level;

import net.dpml.lang.PID;
-import net.dpml.lang.LoggingService;

/**
- * Datastructure holding a log record and process identifier.
+ * Datastructure holding a log record and process identifier. The
datastructure
+ * is used to bind a PID value that identifies a source JVM with a log
record
+ * raised by the JVM.
+ *
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
@@ -46,22 +41,43 @@
private final PID m_pid;
private final LogRecord m_record;

+ /**
+ * Creation of a new log statement.
+ * @param pid the JVM process identifier
+ * @param record the log record
+ */
public LogStatement( PID pid, LogRecord record )
{
m_pid = pid;
m_record = record;
}

+ /**
+ * Get the process identifier identifying the source JVM.
+ * @return the process identifier
+ */
public PID getPID()
{
return m_pid;
}

+ /**
+ * Get the log record raised by the source JVM.
+ * @return the log record
+ */
public LogRecord getLogRecord()
{
return m_record;
}

+ /**
+ * Compare this object with a supplied object for equality.
+ * This function returns true if the supplied object is a
+ * LogStatement with an equivalent process identifier and
+ * log record.
+ * @param other the other object
+ * @return true if the supplied object is equal to this object
+ */
public boolean equals( Object other )
{
if( null == other )
@@ -86,6 +102,10 @@
}
}

+ /**
+ * Get the hascode for this instance.
+ * @return the instance hash value
+ */
public int hashCode()
{
int hash = m_pid.hashCode();

Modified: trunk/main/depot/core/src/main/net/dpml/depot/Main.java
===================================================================
--- trunk/main/depot/core/src/main/net/dpml/depot/Main.java 2006-03-27
14:09:15 UTC (rev 1274)
+++ trunk/main/depot/core/src/main/net/dpml/depot/Main.java 2006-03-27
15:38:31 UTC (rev 1275)
@@ -24,7 +24,6 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
-import java.util.Enumeration;

import net.dpml.transit.Disposable;
import net.dpml.transit.Transit;

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/BoundedThreadPool.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/BoundedThreadPool.java
2006-03-27 14:09:15 UTC (rev 1274)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/BoundedThreadPool.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -17,6 +17,8 @@

/**
* Thread pool implementation.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class BoundedThreadPool extends org.mortbay.thread.BoundedThreadPool
{

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ConnectorContext.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/ConnectorContext.java
2006-03-27 14:09:15 UTC (rev 1274)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/ConnectorContext.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -17,6 +17,8 @@

/**
* Common connector context contract.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public interface ConnectorContext
{

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHandlerContext.java
===================================================================
---
trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHandlerContext.java
2006-03-27 14:09:15 UTC (rev 1274)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHandlerContext.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -21,6 +21,8 @@

/**
* Common http context handler context contract.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public interface ContextHandlerContext
{

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHelper.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHelper.java
2006-03-27 14:09:15 UTC (rev 1274)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHelper.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -25,6 +25,8 @@

/**
* Utility class that provides support for parameterization of a Jetty
context instance.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
class ContextHelper
{

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/HashUserRealm.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/HashUserRealm.java
2006-03-27 14:09:15 UTC (rev 1274)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/HashUserRealm.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -19,6 +19,8 @@

/**
* Hash user realm with enhanced keystore resolution semantics.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class HashUserRealm extends org.mortbay.jetty.security.HashUserRealm
{

Modified: trunk/main/planet/http/impl/src/main/net/dpml/http/LogAdapter.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/LogAdapter.java
2006-03-27 14:09:15 UTC (rev 1274)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/LogAdapter.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -20,26 +20,45 @@

/**
* Wrapper to redirect Jetty logging to standard JVM logging.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class LogAdapter implements org.mortbay.log.Logger
{
private final Logger m_logger;
-
+
+ /**
+ * Creation of a new log adapter.
+ */
public LogAdapter()
{
this( Logger.getLogger( "org.mortbay" ) );
}
-
+
+ /**
+ * Creation of a new log adapter.
+ * @param logger the underlying logging channel
+ */
LogAdapter( Logger logger )
{
m_logger = logger;
}
-
+
+ /**
+ * Get the debug enabled status.
+ * @return true if debug is enabled
+ */
public boolean isDebugEnabled()
{
return m_logger.isLoggable( Level.FINE );
}
-
+
+ /**
+ * Publish an info level log message.
+ * @param msg the message
+ * @param arg0 an intial argument
+ * @param arg1 a subsequent argument
+ */
public void info( String msg, Object arg0, Object arg1 )
{
if( m_logger.isLoggable( Level.INFO ) )
@@ -49,6 +68,11 @@
}
}

+ /**
+ * Publish an debug level log message.
+ * @param message the message
+ * @param cause an exception
+ */
public void debug( String message, Throwable cause )
{
if( isDebugEnabled() )
@@ -57,6 +81,12 @@
}
}

+ /**
+ * Publish an debug level log message.
+ * @param msg the message
+ * @param arg0 an intial argument
+ * @param arg1 a subsequent argument
+ */
public void debug( String msg, Object arg0, Object arg1 )
{
if( isDebugEnabled() )
@@ -66,6 +96,12 @@
}
}

+ /**
+ * Publish an warning level log message.
+ * @param msg the message
+ * @param arg0 an intial argument
+ * @param arg1 a subsequent argument
+ */
public void warn( String msg,Object arg0, Object arg1 )
{
if( m_logger.isLoggable( Level.WARNING ) )
@@ -75,6 +111,11 @@
}
}

+ /**
+ * Publish an warning level log message.
+ * @param message the message
+ * @param error an exception
+ */
public void warn( String message, Throwable error )
{
if( m_logger.isLoggable( Level.WARNING ) )
@@ -107,13 +148,18 @@
if( ( arg0 != null ) && ( i0 >= 0 ) )
{
msg =
- msg.substring( 0,i0 )
+ msg.substring( 0, i0 )
+ arg0
+ msg.substring( i0 + 2 );
}
return msg;
}

+ /**
+ * Create a logger matching the supplied category.
+ * @param category the category name
+ * @return the logging channel
+ */
public org.mortbay.log.Logger getLogger( String category )
{
if( ( null == category ) || "org.mortbay".equals( category ) )
@@ -143,7 +189,11 @@
return path;
}
}
-
+
+ /**
+ * Return a string representation of this logger.
+ * @return the string value
+ */
public String toString()
{
return "java.util.logging.Logger/" + m_logger.getName();

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/LoggerAdapter.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/LoggerAdapter.java
2006-03-27 14:09:15 UTC (rev 1274)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/LoggerAdapter.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -21,6 +21,8 @@

/**
* Wrapper to redirect Jetty logging to DPML logging.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class LoggerAdapter implements org.mortbay.log.Logger
{
@@ -41,7 +43,10 @@
}

private final Logger m_logger;
-
+
+ /**
+ * Creation of a new logger adapter.
+ */
public LoggerAdapter()
{
if( null == m_LOGGER )
@@ -54,16 +59,30 @@
}
}

+ /**
+ * Creation of a new logger adapter.
+ * @param logger the underlying log channel
+ */
LoggerAdapter( Logger logger )
{
m_logger = logger;
}

+ /**
+ * Get the debug enabled status.
+ * @return true if debug is enabled
+ */
public boolean isDebugEnabled()
{
return m_logger.isDebugEnabled();
}

+ /**
+ * Publish an info level log message.
+ * @param msg the message
+ * @param arg0 an intial argument
+ * @param arg1 a subsequent argument
+ */
public void info( String msg, Object arg0, Object arg1 )
{
if( m_logger.isInfoEnabled() )
@@ -73,6 +92,11 @@
}
}

+ /**
+ * Publish an debug level log message.
+ * @param message the message
+ * @param cause an exception
+ */
public void debug( String message, Throwable cause )
{
if( isDebugEnabled() )
@@ -89,6 +113,12 @@
}
}

+ /**
+ * Publish an debug level log message.
+ * @param msg the message
+ * @param arg0 an intial argument
+ * @param arg1 a subsequent argument
+ */
public void debug( String msg, Object arg0, Object arg1 )
{
if( isDebugEnabled() )
@@ -98,6 +128,12 @@
}
}

+ /**
+ * Publish an warning level log message.
+ * @param msg the message
+ * @param arg0 an intial argument
+ * @param arg1 a subsequent argument
+ */
public void warn( String msg,Object arg0, Object arg1 )
{
if( m_logger.isWarnEnabled() )
@@ -107,6 +143,11 @@
}
}

+ /**
+ * Publish an warning level log message.
+ * @param message the message
+ * @param error an exception
+ */
public void warn( String message, Throwable error )
{
if( m_logger.isWarnEnabled() )
@@ -146,6 +187,11 @@
return msg;
}

+ /**
+ * Create a logger matching the supplied category.
+ * @param category the category name
+ * @return the logging channel
+ */
public org.mortbay.log.Logger getLogger( String category )
{
Logger logger = m_LOGGER.getChildLogger( category );
@@ -168,6 +214,10 @@
}
}

+ /**
+ * Return a string representation of this logger.
+ * @return the string value
+ */
public String toString()
{
return "net.dpml.logging.Logger";

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/NCSARequestLog.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/NCSARequestLog.java
2006-03-27 14:09:15 UTC (rev 1274)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/NCSARequestLog.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -24,6 +24,8 @@

/**
* Wrapper for the Jetty NCSA request logger.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class NCSARequestLog extends org.mortbay.jetty.NCSARequestLog
{

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceContextHandler.java
===================================================================
---
trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceContextHandler.java
2006-03-27 14:09:15 UTC (rev 1274)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceContextHandler.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -19,6 +19,8 @@

/**
* Context handler with enhanced support for symbolic property
dereferencing.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class ResourceContextHandler extends
org.mortbay.jetty.handler.ContextHandler
{

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceHandler.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceHandler.java
2006-03-27 14:09:15 UTC (rev 1274)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceHandler.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -20,6 +20,8 @@

/**
* Default implementation of a static resource handler.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class ResourceHandler extends org.mortbay.jetty.servlet.ServletHandler
{

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/SelectChannelConnector.java
===================================================================
---
trunk/main/planet/http/impl/src/main/net/dpml/http/SelectChannelConnector.java
2006-03-27 14:09:15 UTC (rev 1274)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/SelectChannelConnector.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -17,6 +17,8 @@

/**
* Thread pool implementation.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class SelectChannelConnector extends
org.mortbay.jetty.nio.SelectChannelConnector
{

Modified: trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
2006-03-27 14:09:15 UTC (rev 1274)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -33,6 +33,8 @@

/**
* HTTP server implementation.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class Server extends org.mortbay.jetty.Server
{

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletContextHandler.java
===================================================================
---
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletContextHandler.java
2006-03-27 14:09:15 UTC (rev 1274)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletContextHandler.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -19,6 +19,8 @@

/**
* Servlet context handler.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class ServletContextHandler extends
org.mortbay.jetty.handler.ContextHandler
{

Modified: trunk/main/planet/http/impl/src/main/net/dpml/http/ServletEntry.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/ServletEntry.java
2006-03-27 14:09:15 UTC (rev 1274)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/ServletEntry.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -17,6 +17,8 @@

/**
* A ServletEntry maintains a mapping between a servlet name and a relative
path.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class ServletEntry
{

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHandler.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHandler.java
2006-03-27 14:09:15 UTC (rev 1274)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHandler.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -21,6 +21,8 @@
/**
* A ServletHandler maintains a collection of servlets and a collection
* servlet name to context mappings.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class ServletHandler extends org.mortbay.jetty.servlet.ServletHandler
{

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHolder.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHolder.java
2006-03-27 14:09:15 UTC (rev 1274)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHolder.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -17,6 +17,8 @@

/**
* Servlet classname to name binding.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class ServletHolder extends org.mortbay.jetty.servlet.ServletHolder
{

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/SslSocketConnector.java
===================================================================
---
trunk/main/planet/http/impl/src/main/net/dpml/http/SslSocketConnector.java
2006-03-27 14:09:15 UTC (rev 1274)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/SslSocketConnector.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -19,6 +19,8 @@

/**
* SSL socket connector.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class SslSocketConnector extends
org.mortbay.jetty.security.SslSocketConnector
{

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/WebAppContextHandler.java
===================================================================
---
trunk/main/planet/http/impl/src/main/net/dpml/http/WebAppContextHandler.java
2006-03-27 14:09:15 UTC (rev 1274)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/WebAppContextHandler.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -28,6 +28,8 @@

/**
* Servlet context handler.
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class WebAppContextHandler extends
org.mortbay.jetty.webapp.WebAppContext
{

Modified:
trunk/main/station/server/src/main/net/dpml/station/server/LoggingServer.java
===================================================================
---
trunk/main/station/server/src/main/net/dpml/station/server/LoggingServer.java
2006-03-27 14:09:15 UTC (rev 1274)
+++
trunk/main/station/server/src/main/net/dpml/station/server/LoggingServer.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -27,15 +27,10 @@
import java.net.SocketException;
import java.util.logging.Logger;
import java.util.logging.LogRecord;
-import java.util.logging.Formatter;
-import java.util.logging.Level;

-import net.dpml.lang.PID;
-
import net.dpml.depot.LogStatement;

-import net.dpml.transit.util.ExceptionHelper;
-import net.dpml.transit.util.StandardFormatter;
+import net.dpml.lang.PID;

/**
* The LoggingServer is a remote service that handles the aggregation of
@@ -54,7 +49,8 @@

/**
* Creation of a new logging service instance.
- * @exception RemoteException if a remote exception occurs
+ * @param port the log server port
+ * @exception IOException if an IO exception occurs
*/
public LoggingServer( int port ) throws IOException
{
@@ -88,15 +84,25 @@
return m_count;
}

+ /**
+ * Internal utility class to handle a client connection.
+ */
class RequestHandler implements Runnable
{
private final Socket m_socket;

+ /**
+ * Creation of a new request handler.
+ * @param socket the socket
+ */
private RequestHandler( Socket socket )
{
m_socket = socket;
}

+ /**
+ * Run the process.
+ */
public void run()
{
try

Modified:
trunk/main/station/server/src/main/net/dpml/station/server/RemoteApplication.java
===================================================================
---
trunk/main/station/server/src/main/net/dpml/station/server/RemoteApplication.java
2006-03-27 14:09:15 UTC (rev 1274)
+++
trunk/main/station/server/src/main/net/dpml/station/server/RemoteApplication.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -18,7 +18,6 @@

package net.dpml.station.server;

-import java.io.File;
import java.io.IOException;
import java.rmi.ConnectException;
import java.rmi.RemoteException;
@@ -41,8 +40,6 @@
import net.dpml.station.ApplicationListener;
import net.dpml.station.ApplicationEvent;

-import net.dpml.transit.Transit;
-
import net.dpml.lang.Logger;
import net.dpml.lang.PID;


Modified:
trunk/main/station/server/src/main/net/dpml/station/server/RemoteStation.java
===================================================================
---
trunk/main/station/server/src/main/net/dpml/station/server/RemoteStation.java
2006-03-27 14:09:15 UTC (rev 1274)
+++
trunk/main/station/server/src/main/net/dpml/station/server/RemoteStation.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -26,7 +26,6 @@
import java.net.URL;
import java.util.Map;
import java.util.Hashtable;
-import java.util.logging.LogRecord;
import java.util.LinkedList;
import java.util.List;
import java.util.EventObject;
@@ -42,8 +41,6 @@
import net.dpml.station.ApplicationRegistry;

import net.dpml.lang.Logger;
-import net.dpml.lang.PID;
-import net.dpml.transit.monitor.LoggingAdapter;
import net.dpml.transit.model.TransitModel;
import net.dpml.transit.Disposable;

@@ -74,11 +71,14 @@
* Creation of a station instance.
*
* @param logger the assigned logging channel
+ * @param model the transit model
* @param port the station port
* @param registryStorageUrl uri defining the registry backing store
* @exception Exception if a exception occurs during establishment
*/
- public RemoteStation( Logger logger, TransitModel model, int port, URL
registryStorageUrl ) throws Exception
+ public RemoteStation(
+ Logger logger, TransitModel model, int port, URL registryStorageUrl )
+ throws Exception
{
super();


Modified:
trunk/main/station/server/src/main/net/dpml/station/server/StationServerPlugin.java
===================================================================
---
trunk/main/station/server/src/main/net/dpml/station/server/StationServerPlugin.java
2006-03-27 14:09:15 UTC (rev 1274)
+++
trunk/main/station/server/src/main/net/dpml/station/server/StationServerPlugin.java
2006-03-27 15:38:31 UTC (rev 1275)
@@ -61,6 +61,7 @@
* Creation of a new station server plugin for station commandline
* handling.
* @param logger the assigned logging channel
+ * @param model the transit model
* @param args the command line arguments array
* @exception Exception if an error occurs
*/




  • r1275 - in trunk/main: central/src/docs/about/download depot/core/src/main/net/dpml/depot planet/http/impl/src/main/net/dpml/http station/server/src/main/net/dpml/station/server, mcconnell at BerliOS, 03/27/2006

Archive powered by MHonArc 2.6.24.

Top of Page