DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-07-22 09:35:01 +0200 (Sat, 22 Jul 2006)
New Revision: 1623

Modified:
   
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultDictionary.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JUnitTestTask.java
Log:
housekeeping

Modified: 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultDictionary.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultDictionary.java
      2006-07-20 18:51:44 UTC (rev 1622)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultDictionary.java
      2006-07-22 07:35:01 UTC (rev 1623)
@@ -174,11 +174,8 @@
         for( int i=0; i<keys.length; i++ )
         {
             String key = keys[i];
-            //if( !key.startsWith( "project." ) )
-            //{
-                String value = getProperty( key );
-                properties.setProperty( key, value );
-            //}
+            String value = getProperty( key );
+            properties.setProperty( key, value );
         }
         return properties;
     }

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
     2006-07-20 18:51:44 UTC (rev 1622)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
     2006-07-22 07:35:01 UTC (rev 1623)
@@ -212,6 +212,7 @@
     {
         setProperty( key, value, true );
     }
+    
     private void setProperty( String key, String value, boolean verbose )
     {
         Project project = getProject();

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JUnitTestTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JUnitTestTask.java
     2006-07-20 18:51:44 UTC (rev 1622)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JUnitTestTask.java
     2006-07-22 07:35:01 UTC (rev 1623)
@@ -279,6 +279,7 @@
         junit.setTempdir( working );
         junit.setReloading( true );
         junit.setFiltertrace( true );
+        
         junit.createClasspath().add( classpath );
         
         Context context = getContext();
@@ -363,17 +364,17 @@
                 throw new BuildException( error, e );
             }
             junit.addConfiguredSysproperty( log );
+            
+            final Environment.Variable logging = new Environment.Variable();
+            logging.setKey( "java.util.logging.config.class" );
+            logging.setValue( "net.dpml.util.ConfigurationHandler" );
+            junit.addConfiguredSysproperty( logging );
         }
-
+        
         final Environment.Variable endorsed = new Environment.Variable();
         endorsed.setKey( "java.endorsed.dirs" );
         endorsed.setValue( new File( Transit.DPML_SYSTEM, "lib/endorsed" 
).getAbsolutePath() );
         junit.addConfiguredSysproperty( endorsed );
-
-        final Environment.Variable logging = new Environment.Variable();
-        logging.setKey( "java.util.logging.config.class" );
-        logging.setValue( "net.dpml.util.ConfigurationHandler" );
-        junit.addConfiguredSysproperty( logging );
         
         configureDeliverableSysProperties( junit );
         configureForExecution( junit );