Skip to Content.
Sympa Menu

notify-dpml - r1006 - in trunk/main: metro/station/server/src/main/net/dpml/station/server planet/http/demo/src/main/net/dpml/http/demo planet/web planet/web/server/src/main/net/dpml/web/server transit/core/src/main/net/dpml/transit

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: r1006 - in trunk/main: metro/station/server/src/main/net/dpml/station/server planet/http/demo/src/main/net/dpml/http/demo planet/web planet/web/server/src/main/net/dpml/web/server transit/core/src/main/net/dpml/transit
  • Date: Wed, 1 Feb 2006 07:44:55 +0100

Author: mcconnell
Date: 2006-02-01 07:44:41 +0100 (Wed, 01 Feb 2006)
New Revision: 1006

Modified:

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

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

trunk/main/metro/station/server/src/main/net/dpml/station/server/UnicastEventSource.java
trunk/main/planet/http/demo/src/main/net/dpml/http/demo/Demo.java

trunk/main/planet/http/demo/src/main/net/dpml/http/demo/ManagementOperations.java
trunk/main/planet/web/module.xml

trunk/main/planet/web/server/src/main/net/dpml/web/server/HashUserRealm.java
trunk/main/transit/core/src/main/net/dpml/transit/StandardClassLoader.java
Log:
update jetty 6 component to use hdk logging channel

Modified:
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplication.java
===================================================================
---
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplication.java
2006-01-31 14:34:49 UTC (rev 1005)
+++
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplication.java
2006-02-01 06:44:41 UTC (rev 1006)
@@ -24,7 +24,6 @@
import java.io.InputStreamReader;
import java.rmi.ConnectException;
import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
import java.util.Enumeration;
import java.util.ArrayList;
import java.util.Properties;
@@ -384,10 +383,6 @@
"Application shutdown error.";
getLogger().warn( error, e );
}
- finally
- {
- //UnicastRemoteObject.unexportObject( this, true ); // handled
in station
- }
}

private void handleStop( boolean check ) throws ApplicationException

Modified:
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteStation.java
===================================================================
---
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteStation.java
2006-01-31 14:34:49 UTC (rev 1005)
+++
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteStation.java
2006-02-01 06:44:41 UTC (rev 1006)
@@ -259,7 +259,7 @@
{
public void run()
{
- RemoteStation.m_dispatch.dispose();
+ RemoteStation.m_DISPATCH.dispose();
System.exit( 0 );
}
}
@@ -482,7 +482,7 @@
}
}

- private static EventDispatchThread m_dispatch = null;
+ private static EventDispatchThread m_DISPATCH = null;

/**
* This method starts the event dispatch thread the first time it
@@ -491,12 +491,12 @@
*/
private synchronized void startEventDispatchThread()
{
- if( m_dispatch == null )
+ if( m_DISPATCH == null )
{
Logger logger = getLogger().getChildLogger( "event" );
- m_dispatch = new EventDispatchThread( logger );
- m_dispatch.setDaemon( true );
- m_dispatch.start();
+ m_DISPATCH = new EventDispatchThread( logger );
+ m_DISPATCH.setDaemon( true );
+ m_DISPATCH.start();
}
}


Modified:
trunk/main/metro/station/server/src/main/net/dpml/station/server/UnicastEventSource.java
===================================================================
---
trunk/main/metro/station/server/src/main/net/dpml/station/server/UnicastEventSource.java
2006-01-31 14:34:49 UTC (rev 1005)
+++
trunk/main/metro/station/server/src/main/net/dpml/station/server/UnicastEventSource.java
2006-02-01 06:44:41 UTC (rev 1006)
@@ -20,13 +20,10 @@

import java.util.EventObject;
import java.util.EventListener;
-import java.util.List;
-import java.util.LinkedList;
import java.rmi.server.UnicastRemoteObject;
import java.rmi.RemoteException;

import net.dpml.transit.Logger;
-import net.dpml.transit.util.ExceptionHelper;


/**

Modified: trunk/main/planet/http/demo/src/main/net/dpml/http/demo/Demo.java
===================================================================
--- trunk/main/planet/http/demo/src/main/net/dpml/http/demo/Demo.java
2006-01-31 14:34:49 UTC (rev 1005)
+++ trunk/main/planet/http/demo/src/main/net/dpml/http/demo/Demo.java
2006-02-01 06:44:41 UTC (rev 1006)
@@ -27,8 +27,6 @@
import net.dpml.metro.ComponentHandler;
import net.dpml.metro.PartsManager;

-import net.dpml.part.Controller;
-import net.dpml.part.Directive;
import net.dpml.part.Disposable;

import net.dpml.http.spi.SocketListenerService;
@@ -94,6 +92,7 @@
* @param logger the assigned logging channel
* @param context the public component context
* @param parts the internal parts manager
+ * @exception Exception if an error occurs
*/
public Demo( Logger logger, Context context, Parts parts ) throws
Exception
{
@@ -125,6 +124,7 @@
* the primary object here is to test dynamic component loading.
* @param base the http resource base
* @param path the http context path
+ * @exception Exception if an error occurs
*/
public void addContext( String base, String path ) throws Exception
{
@@ -152,6 +152,7 @@
/**
* Add a new http content handler to a http context.
* @param path the http context path
+ * @exception Exception if an error occurs
*/
public void addResourceHandler( String path ) throws Exception
{

Modified:
trunk/main/planet/http/demo/src/main/net/dpml/http/demo/ManagementOperations.java
===================================================================
---
trunk/main/planet/http/demo/src/main/net/dpml/http/demo/ManagementOperations.java
2006-01-31 14:34:49 UTC (rev 1005)
+++
trunk/main/planet/http/demo/src/main/net/dpml/http/demo/ManagementOperations.java
2006-02-01 06:44:41 UTC (rev 1006)
@@ -24,12 +24,14 @@
* Add a new http context to the application.
* @param base the resource base path
* @param path the context path
+ * @exception Exception if an error occurs
*/
void addContext( String base, String path ) throws Exception;

/**
* Add a new http content handler to a http context.
* @param path the http context path
+ * @exception Exception if an error occurs
*/
void addResourceHandler( String path ) throws Exception;


Modified: trunk/main/planet/web/module.xml
===================================================================
--- trunk/main/planet/web/module.xml 2006-01-31 14:34:49 UTC (rev 1005)
+++ trunk/main/planet/web/module.xml 2006-02-01 06:44:41 UTC (rev 1006)
@@ -19,7 +19,7 @@
<include urn="artifact:jar:tomcat/jasper-compiler-jdt#5.5.12"/>
<include urn="artifact:jar:jetty/jetty#6.0.0-20060131"/>
<include urn="artifact:jar:org/slf4j/jcl104-over-slf4j#1.0-rc5"/>
- <include urn="artifact:jar:org/slf4j/slf4j-simple#1.0-rc5"/>
+ <include urn="artifact:jar:org/slf4j/slf4j-jdk14#1.0-rc5"/>
<include urn="artifact:jar:commons-el/commons-el#1.0"/>
<include ref="dpml/transit/dpml-transit-main"/>
</dependencies>

Modified:
trunk/main/planet/web/server/src/main/net/dpml/web/server/HashUserRealm.java
===================================================================
---
trunk/main/planet/web/server/src/main/net/dpml/web/server/HashUserRealm.java
2006-01-31 14:34:49 UTC (rev 1005)
+++
trunk/main/planet/web/server/src/main/net/dpml/web/server/HashUserRealm.java
2006-02-01 06:44:41 UTC (rev 1006)
@@ -31,10 +31,9 @@
* an optional comma separated list of role names.
*
* @param config Filename or url of user properties file.
- * @exception IOException
+ * @exception IOException is an IO error occurs
*/
- public void setConfig( String config )
- throws IOException
+ public void setConfig( String config ) throws IOException
{
String resolved = PropertyResolver.resolve( config );
if( resolved.startsWith( "local:" ) )
@@ -42,7 +41,7 @@
try
{
URI uri = new URI( resolved );
- File file = (File) uri.toURL().getContent( new Class[]{
File.class } );
+ File file = (File) uri.toURL().getContent( new
Class[]{File.class} );
super.setConfig( file.getCanonicalPath() );
}
catch( Exception e )

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/StandardClassLoader.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/StandardClassLoader.java
2006-01-31 14:34:49 UTC (rev 1005)
+++
trunk/main/transit/core/src/main/net/dpml/transit/StandardClassLoader.java
2006-02-01 06:44:41 UTC (rev 1006)
@@ -131,6 +131,18 @@
return buffer.toString().trim();
}

+ /**
+ * Return a string representing of the classloader.
+ * @param expanded if true return an expanded representation of the
classloader
+ * @return the string representation
+ */
+ public String toString( boolean expanded )
+ {
+ StringBuffer buffer = new StringBuffer();
+ listClasspath( buffer );
+ return buffer.toString();
+ }
+
//--------------------------------------------------------------------
// Object
//--------------------------------------------------------------------
@@ -141,9 +153,11 @@
*/
public String toString()
{
- StringBuffer buffer = new StringBuffer();
- listClasspath( buffer );
- return buffer.toString();
+ final String label =
+ getClass().getName()
+ + "#"
+ + System.identityHashCode( this );
+ return label;
}

/**




  • r1006 - in trunk/main: metro/station/server/src/main/net/dpml/station/server planet/http/demo/src/main/net/dpml/http/demo planet/web planet/web/server/src/main/net/dpml/web/server transit/core/src/main/net/dpml/transit, mcconnell at BerliOS, 02/01/2006

Archive powered by MHonArc 2.6.24.

Top of Page