DPML Notify

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

Author: mcconnell
Date: 2006-05-25 09:08:50 +0200 (Thu, 25 May 2006)
New Revision: 1459

Modified:
   trunk/main/planet/http/server/project.xml
   trunk/main/transit/core/src/main/net/dpml/util/ElementHelper.java
Log:
Resolve issue in component definition encoding related to externalization of 
expanded symbols.  This was due to symbolic expansion in the ElementHelper 
class resoluting in the subsequent association of the expanded value within 
directives, which in turn resulted in the creation of output xmls containing 
expanded values.  Based on this change the symbolic values are correctly 
maintained with directives and symbol expansion is undertaken during datatype 
evaluation (during model construction).

Modified: trunk/main/planet/http/server/project.xml
===================================================================
--- trunk/main/planet/http/server/project.xml   2006-05-25 06:31:13 UTC (rev 
1458)
+++ trunk/main/planet/http/server/project.xml   2006-05-25 07:08:50 UTC (rev 
1459)
@@ -10,7 +10,7 @@
         id="part"
         alias="true">
       <parts xmlns="artifact:xsd:dpml/lang/dpml-component#1.0">
-        <!-- 
+        <!--
         Add a select channel connector to 8080.
         -->
         <component key="plain" type="net.dpml.http.SelectChannelConnector">

Modified: trunk/main/transit/core/src/main/net/dpml/util/ElementHelper.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/util/ElementHelper.java   
2006-05-25 06:31:13 UTC (rev 1458)
+++ trunk/main/transit/core/src/main/net/dpml/util/ElementHelper.java   
2006-05-25 07:08:50 UTC (rev 1459)
@@ -206,7 +206,8 @@
         {
             value = node.getNodeValue();
         }
-        return normalize( value );
+        //return normalize( value );
+        return value;
     }
 
    /**
@@ -236,9 +237,10 @@
         if( !node.hasAttribute( key ) )
         {
             return def;
-        } 
-        final String value = node.getAttribute( key );
-        return normalize( value );
+        }
+        //final String value = node.getAttribute( key );
+        //return normalize( value );
+        return node.getAttribute( key );
     }
 
    /**