notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1264 - in trunk/main: depot/core/src/main/net/dpml/depot metro/component/src/main/net/dpml/component station/console/src/main/net/dpml/station/console station/server/src/main/net/dpml/station/server transit/core/src/main/net/dpml/lang transit/core/src/main/net/dpml/transit transit/core/src/main/net/dpml/transit/registry
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1264 - in trunk/main: depot/core/src/main/net/dpml/depot metro/component/src/main/net/dpml/component station/console/src/main/net/dpml/station/console station/server/src/main/net/dpml/station/server transit/core/src/main/net/dpml/lang transit/core/src/main/net/dpml/transit transit/core/src/main/net/dpml/transit/registry
- Date: Fri, 24 Mar 2006 09:15:44 +0100
Author: mcconnell
Date: 2006-03-24 09:15:19 +0100 (Fri, 24 Mar 2006)
New Revision: 1264
Modified:
trunk/main/depot/core/src/main/net/dpml/depot/DepotHandler.java
trunk/main/depot/core/src/main/net/dpml/depot/DepotLoggingConfiguration.java
trunk/main/metro/component/src/main/net/dpml/component/InitialContext.java
trunk/main/station/console/src/main/net/dpml/station/console/StationPlugin.java
trunk/main/station/server/src/main/net/dpml/station/server/ErrorStreamReader.java
trunk/main/station/server/src/main/net/dpml/station/server/OutputStreamReader.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/transit/core/src/main/net/dpml/lang/LoggingService.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
trunk/main/transit/core/src/main/net/dpml/transit/registry/RegistryURLConnection.java
Log:
housekeeping
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-24 05:11:59 UTC (rev 1263)
+++ trunk/main/depot/core/src/main/net/dpml/depot/DepotHandler.java
2006-03-24 08:15:19 UTC (rev 1264)
@@ -84,8 +84,8 @@
try
{
String key = "registry:" + LoggingService.LOGGING_KEY;
- String remote = System.getProperty( "net.dpml.logging.service",
key );
- URL url = new URL( remote );
+ String remote = System.getProperty( "dpml.logging.service", key
);
+ URL url = new URL( null, remote, new
net.dpml.transit.registry.Handler() );
return (LoggingService) url.getContent();
}
finally
Modified:
trunk/main/depot/core/src/main/net/dpml/depot/DepotLoggingConfiguration.java
===================================================================
---
trunk/main/depot/core/src/main/net/dpml/depot/DepotLoggingConfiguration.java
2006-03-24 05:11:59 UTC (rev 1263)
+++
trunk/main/depot/core/src/main/net/dpml/depot/DepotLoggingConfiguration.java
2006-03-24 08:15:19 UTC (rev 1264)
@@ -40,7 +40,7 @@
public DepotLoggingConfiguration()
{
String group = System.getProperty( "dpml.system.group", "root" );
- String level = System.getProperty( "dpml.logging.level", "INFO"
).toUpperCase();
+ String level = getDefaultLevel();
Properties properties = new Properties();
@@ -70,5 +70,17 @@
e.printStackTrace();
}
}
+
+ private String getDefaultLevel()
+ {
+ if( "true".equals( System.getProperty( "dpml.debug" ) ) )
+ {
+ return "FINE";
+ }
+ else
+ {
+ return System.getProperty( "dpml.logging.level", "INFO"
).toUpperCase();
+ }
+ }
}
Modified:
trunk/main/metro/component/src/main/net/dpml/component/InitialContext.java
===================================================================
---
trunk/main/metro/component/src/main/net/dpml/component/InitialContext.java
2006-03-24 05:11:59 UTC (rev 1263)
+++
trunk/main/metro/component/src/main/net/dpml/component/InitialContext.java
2006-03-24 08:15:19 UTC (rev 1264)
@@ -202,7 +202,7 @@
/**
* Creation of a new <tt>InitialContext</tt>.
- * @param logger the assigned logging channel
+ * @param partition the partition name
* @param work the working directory
* @param temp the temporary directory
*/
Modified:
trunk/main/station/console/src/main/net/dpml/station/console/StationPlugin.java
===================================================================
---
trunk/main/station/console/src/main/net/dpml/station/console/StationPlugin.java
2006-03-24 05:11:59 UTC (rev 1263)
+++
trunk/main/station/console/src/main/net/dpml/station/console/StationPlugin.java
2006-03-24 08:15:19 UTC (rev 1264)
@@ -464,12 +464,10 @@
list.add(
"-Ddpml.logging.config=local:properties:dpml/station/logging" );
list.add( "-Ddpml.subprocess=true" );
-
- if( getLogger().isDebugEnabled() )
+ if( "true".equals( System.getProperty( "dpml.debug" ) ) )
{
- list.add( "-D.level=FINE" );
+ list.add( "-Ddpml.debug=true" );
}
-
Set propertyValue = line.getProperties();
Iterator iterator = propertyValue.iterator();
while( iterator.hasNext() )
Modified:
trunk/main/station/server/src/main/net/dpml/station/server/ErrorStreamReader.java
===================================================================
---
trunk/main/station/server/src/main/net/dpml/station/server/ErrorStreamReader.java
2006-03-24 05:11:59 UTC (rev 1263)
+++
trunk/main/station/server/src/main/net/dpml/station/server/ErrorStreamReader.java
2006-03-24 08:15:19 UTC (rev 1264)
@@ -55,7 +55,7 @@
String line = null;
while( ( line = reader.readLine() ) != null )
{
- getLogger().debug( line );
+ getLogger().debug( "# " + line );
}
}
catch( IOException e )
Modified:
trunk/main/station/server/src/main/net/dpml/station/server/OutputStreamReader.java
===================================================================
---
trunk/main/station/server/src/main/net/dpml/station/server/OutputStreamReader.java
2006-03-24 05:11:59 UTC (rev 1263)
+++
trunk/main/station/server/src/main/net/dpml/station/server/OutputStreamReader.java
2006-03-24 08:15:19 UTC (rev 1264)
@@ -55,7 +55,7 @@
String line = null;
while( ( line = reader.readLine() ) != null )
{
- getLogger().debug( line );
+ getLogger().debug( "$ " + line );
}
}
catch( IOException e )
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-24 05:11:59 UTC (rev 1263)
+++
trunk/main/station/server/src/main/net/dpml/station/server/RemoteApplication.java
2006-03-24 08:15:19 UTC (rev 1264)
@@ -329,6 +329,10 @@
Properties properties = m_descriptor.getSystemProperties();
properties.setProperty( "dpml.subprocess", "true" );
properties.setProperty( "dpml.station.partition", "depot.station." +
m_id );
+ //if( "true".equals( System.getProperty( "dpml.debug" ) ) )
+ //{
+ // properties.setProperty( "dpml.debug", "true" );
+ //}
if( null == properties.getProperty( "java.util.logging.config.class"
) )
{
properties.setProperty(
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-24 05:11:59 UTC (rev 1263)
+++
trunk/main/station/server/src/main/net/dpml/station/server/RemoteStation.java
2006-03-24 08:15:19 UTC (rev 1264)
@@ -92,6 +92,7 @@
try
{
m_rmiRegistry.bind( STATION_KEY, this );
+ getLogger().debug( "station bound to [" + STATION_KEY + "]" );
}
catch( AlreadyBoundException e )
{
@@ -107,6 +108,7 @@
{
m_loggingServer = new LoggingServer();
m_rmiRegistry.bind( LoggingService.LOGGING_KEY, m_loggingServer
);
+ getLogger().debug( "logging service bound to [" +
LoggingService.LOGGING_KEY + "]");
}
catch( AlreadyBoundException e )
{
Modified: trunk/main/transit/core/src/main/net/dpml/lang/LoggingService.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/LoggingService.java
2006-03-24 05:11:59 UTC (rev 1263)
+++ trunk/main/transit/core/src/main/net/dpml/lang/LoggingService.java
2006-03-24 08:15:19 UTC (rev 1264)
@@ -32,7 +32,7 @@
/**
* Logging service key.
*/
- String LOGGING_KEY = "/dpml/logging";
+ String LOGGING_KEY = "dpml/logging";
/**
* Register a log record with the log service.
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
2006-03-24 05:11:59 UTC (rev 1263)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
2006-03-24 08:15:19 UTC (rev 1264)
@@ -121,7 +121,7 @@
* <tt>local:xml:dpml/transit/config</tt>. If the resource does not exist
a classic
* default scenario will be returned.
*
- * @param category the logging channel category name
+ * @param logger the logging channel
* @return the transit model
* @exception Exception if an error occurs during model construction
*/
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/registry/RegistryURLConnection.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/registry/RegistryURLConnection.java
2006-03-24 05:11:59 UTC (rev 1263)
+++
trunk/main/transit/core/src/main/net/dpml/transit/registry/RegistryURLConnection.java
2006-03-24 08:15:19 UTC (rev 1264)
@@ -153,6 +153,10 @@
public Object run()
throws IOException
{
+ if( null == m_registry )
+ {
+ throw new NullPointerException( "registry" );
+ }
try
{
String path = getURL().getPath();
@@ -167,9 +171,10 @@
}
catch( Exception e )
{
- String message = e.getMessage();
- IOException exception = new IOException( message );
- exception.initCause( e.getCause() );
+ final String error =
+ "Unable to resolve url: " + getURL();
+ IOException exception = new IOException( error );
+ exception.initCause( e );
throw exception;
}
}
- r1264 - in trunk/main: depot/core/src/main/net/dpml/depot metro/component/src/main/net/dpml/component station/console/src/main/net/dpml/station/console station/server/src/main/net/dpml/station/server transit/core/src/main/net/dpml/lang transit/core/src/main/net/dpml/transit transit/core/src/main/net/dpml/transit/registry, mcconnell at BerliOS, 03/24/2006
Archive powered by MHonArc 2.6.24.