Skip to Content.
Sympa Menu

notify-dpml - r1390 - in trunk/main: central/src/docs/depot/concepts depot/core/src/main/net/dpml/depot planet/http/impl/src/main/net/dpml/http station/server/etc/prefs/xmls

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: r1390 - in trunk/main: central/src/docs/depot/concepts depot/core/src/main/net/dpml/depot planet/http/impl/src/main/net/dpml/http station/server/etc/prefs/xmls
  • Date: Thu, 20 Apr 2006 21:56:34 +0200

Author: mcconnell
Date: 2006-04-20 21:56:27 +0200 (Thu, 20 Apr 2006)
New Revision: 1390

Modified:
trunk/main/central/src/docs/depot/concepts/index.xml
trunk/main/depot/core/src/main/net/dpml/depot/Main.java
trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
trunk/main/planet/http/impl/src/main/net/dpml/http/SslSocketConnector.java
trunk/main/station/server/etc/prefs/xmls/registry.xml
Log:
housekeeping

Modified: trunk/main/central/src/docs/depot/concepts/index.xml
===================================================================
--- trunk/main/central/src/docs/depot/concepts/index.xml 2006-04-20
05:37:20 UTC (rev 1389)
+++ trunk/main/central/src/docs/depot/concepts/index.xml 2006-04-20
19:56:27 UTC (rev 1390)
@@ -12,7 +12,7 @@
<section name="DPML Depot">

<p>
- Depot is a the component development workshop. It provides tools
+ Depot is a development toolkit that extends Ant. It provides tools
supporting general build functions, centralizes library management,
a framework for project modularization, and a solution that delivers
overall simplification to build configuration and maintenance concerns.

Modified: trunk/main/depot/core/src/main/net/dpml/depot/Main.java
===================================================================
--- trunk/main/depot/core/src/main/net/dpml/depot/Main.java 2006-04-20
05:37:20 UTC (rev 1389)
+++ trunk/main/depot/core/src/main/net/dpml/depot/Main.java 2006-04-20
19:56:27 UTC (rev 1390)
@@ -41,6 +41,7 @@
import net.dpml.lang.Part;

import net.dpml.util.Logger;
+import net.dpml.util.PropertyResolver;

/**
* CLI hander for the depot package.
@@ -391,7 +392,8 @@
if( index > -1 && arg.startsWith( "-D" ) )
{
String name = arg.substring( 2, index );
- String value = arg.substring( index + 1 );
+ String raw = arg.substring( index + 1 );
+ String value = PropertyResolver.resolve( raw );
System.setProperty( name, value );
}
else

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-04-20 05:37:20 UTC (rev 1389)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
2006-04-20 19:56:27 UTC (rev 1390)
@@ -95,6 +95,7 @@

private final Logger m_logger;
private final Context m_context;
+ private final ArrayList m_connections = new ArrayList();

/**
* Creation of a new HTTP server implementation.
@@ -168,7 +169,6 @@
getLogger().debug( "commencing connector addition" );
ComponentHandler[] handlers = parts.getComponentHandlers(
Connector.class );
getLogger().debug( "connector count: " + handlers.length );
- ArrayList list = new ArrayList();
for( int i=0; i<handlers.length; i++ )
{
ComponentHandler handler = handlers[i];
@@ -177,7 +177,7 @@
{
Provider provider = handler.getProvider();
Connector ch = (Connector) provider.getValue( false );
- list.add( ch );
+ m_connections.add( ch );
}
catch( Throwable e )
{
@@ -186,7 +186,7 @@
throw new Exception( error, e );
}
}
- Connector[] connectors = (Connector[]) list.toArray( new
Connector[0] );
+ Connector[] connectors = (Connector[]) m_connections.toArray( new
Connector[0] );
setConnectors( connectors );
}

@@ -242,23 +242,6 @@
setUserRealms( realms );
}

- /*
- public void addHandler( Handler handler )
- throws Exception
- {
- Handler[] handlers = getHandlers();
- Handler[] newHandlers = (Handler[]) LazyList.addToArray( handlers,
handler );
- Arrays.sort( newHandlers );
- super.setHandlers( newHandlers );
- }
-
- public void setHandlers( Handler[] handlers )
- {
- Arrays.sort( handlers );
- super.setHandlers( handlers );
- }
- */
-
private Logger getLogger()
{
return m_logger;

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-04-20 05:37:20 UTC (rev 1389)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/SslSocketConnector.java
2006-04-20 19:56:27 UTC (rev 1390)
@@ -40,7 +40,11 @@
*/
public interface Context extends ConnectorContext
{
- //setCipherSuites( String[] suites );
+ /**
+ * Set the cipher suites.
+ * @param suites the default suites argument
+ */
+ String[] getCipherSuites( String[] suites );

/**
* Return the certificate password.
@@ -194,5 +198,11 @@

boolean needClientAuth = context.getNeedClientAuth( false );
setNeedClientAuth( needClientAuth );
+
+ String[] suites = context.getCipherSuites( (String[]) null );
+ if( null != suites )
+ {
+ setCipherSuites( suites );
+ }
}
}

Modified: trunk/main/station/server/etc/prefs/xmls/registry.xml
===================================================================
--- trunk/main/station/server/etc/prefs/xmls/registry.xml 2006-04-20
05:37:20 UTC (rev 1389)
+++ trunk/main/station/server/etc/prefs/xmls/registry.xml 2006-04-20
19:56:27 UTC (rev 1390)
@@ -9,7 +9,6 @@
<shutdown>6</shutdown>
<properties>
<property name="org.mortbay.log.class"
value="net.dpml.http.LogAdapter"/>
- <!--<property name="dpml.logging.level" value="FINE"/>-->
</properties>
</jvm>





  • r1390 - in trunk/main: central/src/docs/depot/concepts depot/core/src/main/net/dpml/depot planet/http/impl/src/main/net/dpml/http station/server/etc/prefs/xmls, mcconnell at BerliOS, 04/20/2006

Archive powered by MHonArc 2.6.24.

Top of Page