git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@700897 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 848 insertions, 142 deletions

diff --git a/java/sca/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js b/java/sca/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
index fa0396a4d8..c64c3fc97c 100644
--- a/java/sca/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
+++ b/java/sca/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
@@ -33,6 +33,17 @@ function Uri( value ) {
    this.toString = function() {
        return "Uri value=" + this.value;
    };
+
+   /**
+    * Serialize this element to XML.
+    * atomUri = text
+    */
+   this.toXML = function() {
+      xml = "<uri>";
+      xml += this.value;
+      xml += "</uri>\n";      
+      return xml;
+   };
 }
 
 /* Updated is Date */
@@ -54,6 +65,17 @@ function Email( value ) {
    this.toString = function() {
        return "Email value=" + this.value;
    };
+
+   /**
+    * Serialize this element to XML.
+    * atomEmailAddress = xsd:string { pattern = ".+@.+" }
+    */
+   this.toXML = function() {
+      xml = "<email>";
+      xml += this.value;
+      xml += "</email>\n";      
+      return xml;
+   };
 }
 
 /**
@@ -72,6 +94,27 @@ function Id( value ) {
    this.toString = function() {
        return "Id value=" + this.value;
    };
+
+   /**
+    * Serialize this element to XML.  
+    * atomId = element atom:id {
+    *    atomCommonAttributes,
+    *    (atomUri)
+    * }
+    */
+   this.toXML = function() {
+      xml = "<id";
+      if ( this.uri != null ) {
+         xml += " uri=\"" + this.uri + "\"";
+      }
+      if ( this.lang != null ) {
+         xml += " lang=\"" + this.lang + "\"";
+      }
+      xml += ">";
+      xml += this.value;
+      xml += "</id>\n";      
+      return xml;
+   };
 }
 
 
@@ -88,26 +131,30 @@ function Logo( value ) {
       this.value = value;
    };
 
+
    this.toString = function() {
        return "Logo value=" + this.value;
    };
-}
-
-/**
- * Class that defines an Name represented as a string,
- */
-function Name( value ) {
-   this.value = value;
-   this.getValue = function() {
-      return this.value;
-   };
 
-   this.setValue = function(value) {
-      this.value = value;
-   };
-
-   this.toString = function() {
-       return "Name value=" + this.value;
+   /**
+    * Serialize this element to XML.  
+    * atomLogo = element atom:logo {
+    *    atomCommonAttributes,
+    *    (atomUri)
+    * }
+    */
+   this.toXML = function() {
+      xml = "<logo";
+      if ( this.uri != null ) {
+         xml += " uri=\"" + this.uri + "\"";
+      }
+      if ( this.lang != null ) {
+         xml += " lang=\"" + this.lang + "\"";
+      }
+      xml += ">";
+      xml += this.value;
+      xml += "</logo>\n";      
+      return xml;
    };
 }
 
@@ -117,7 +164,7 @@ function Name( value ) {
 function Text( content, /* optional */ type ) {
    this.content = content;
    this.type = type;
-   if (!type) this.type = "text"; // If undefined or null, use text
+   if (type == null) this.type = "text"; // If undefined or null, use text
    
    this.setText = function(content) {
       this.content = content;
@@ -161,23 +208,56 @@ function Text( content, /* optional */ type ) {
    this.toString = function() {
        return "Text type=" + this.type + ", content=" + this.content;
    };
+   
+   /** Serialize this text element to XML. 
+    *  atomPlainTextConstruct =
+    *     atomCommonAttributes,
+    *     attribute type { "text" | "html" }?,
+    *     text
+    *
+    *  atomXHTMLTextConstruct =
+    *     atomCommonAttributes,
+    *     attribute type { "xhtml" },
+    *     xhtmlDiv
+    * 
+    *  atomTextConstruct = atomPlainTextConstruct | atomXHTMLTextConstruct
+    */
+   this.toXML = function( elementName ) {
+      if ( elementName == null ) {
+         elementName = "text";
+      }
+      xml = "<" + elementName;
+      if ( this.uri != null ) {
+         xml += " uri=\"" + this.uri + "\"";
+      }
+      if ( this.lang != null ) {
+         xml += " lang=\"" + this.lang + "\"";
+      }
+      xml += " type=\"" + this.type + "\"";
+      xml += ">";
+      if ( this.type === "xhtml" ) {
+         xml += "<div xmlns=\"http://www.w3.org/1999/xhtml\">";      
+      }
+      xml += this.content;
+      if ( this.type === "xhtml" ) {
+         xml += "</div>";      
+      }
+      xml += "</" + elementName + ">";      
+      return xml;
+   }
 }
 
 /**
  * Class that defines a Person object.
- * atomPersonConstruct =
- *     atomCommonAttributes,
- *     (element atom:name { text }
- *      & element atom:uri { atomUri }?
- *      & element atom:email { atomEmailAddress }?
- *      & extensionElement*) 
  */
 function Person( name, email ) {
-   this.name = new Name( name );
-   this.email = new Email( email );
+   this.name = name;
+   if ( email != null ) {
+      this.email = new Email( email );
+   }
    
    this.setName = function( name ) {
-      this.name = new Name( name );
+      this.name = name;
    };
 
    this.getName = function() {
@@ -211,17 +291,50 @@ function Person( name, email ) {
    this.toString = function() {
        return "Person name=" + this.name + ", email=" + this.email;
    };
-}
+
+  /** Serialize this text element to XML. 
+    * atomPersonConstruct =
+    *     atomCommonAttributes,
+    *     (element atom:name { text }
+    *      & element atom:uri { atomUri }?
+    *      & element atom:email { atomEmailAddress }?
+    *      & extensionElement*) 
+    */
+   this.toXML = function( elementName ) {
+      if ( elementName == null ) {
+         elementName = "person";
+      }
+      xml = "<" + elementName;
+      if ( this.uri != null ) {
+         xml += " uri=\"" + this.uri + "\"";
+      }
+      if ( this.lang != null ) {
+         xml += " lang=\"" + this.lang + "\"";
+      }
+      xml += ">\n";
+      if ( this.name != null ) {
+         xml += "<name>" + this.name + "</name>\n";
+      }
+      if ( this.uri != null ) {
+         xml += "<uri>" + this.uri + "</uri>\n";
+      }
+      if ( this.email != null) {
+         xml += this.email.toXML();
+      }      
+      xml += "</" + elementName + ">\n";      
+      return xml;
+   }
+ }
 
 /**
  * Class that defines a Generator object.
  */
 function Generator( name, uri ) {
-   this.name = new Name( name );
+   this.name = name;
    this.uri = new Uri( uri );
    
    this.setName = function( name ) {
-      this.name = new Name( name );
+      this.name = name;
    };
 
    this.getName = function() {
@@ -247,6 +360,33 @@ function Generator( name, uri ) {
    this.toString = function() {
        return "Generator name=" + this.name + ", email=" + this.email;
    };
+
+  /** Serialize this text element to XML. 
+    * atomGenerator = element atom:generator {
+    *    atomCommonAttributes,
+    *    attribute uri { atomUri }?,
+    *    attribute version { text }?,
+    *    text
+    * }
+    */
+   this.toXML = function() {
+      xml = "<generator";
+      if ( this.uri != null ) {
+         xml += " uri=\"" + this.uri.getValue() + "\"";
+      }
+      if ( this.lang != null) {
+         xml += " lang=\"" + this.lang + "\"";
+      }
+      if ( this.version != null ) {
+         xml += " version=\"" + this.version + "\"";
+      }
+      xml += ">";
+      if ( this.name != null ) {
+         xml += this.name;
+      }
+      xml += "</generator>\n";      
+      return xml;
+   }
 }
 
 /**
@@ -260,8 +400,9 @@ function Generator( name, uri ) {
  *        undefinedContent
  *     }
  */
-function Category( label, uri ) {
-   this.label = new Label( label );
+function Category( label, content ) {
+   this.label = label;
+   this.content = content;
    
    this.setLabel = function( label ) {
       this.label = label;
@@ -295,16 +436,60 @@ function Category( label, uri ) {
       return this.scheme;
    };
 
+   this.setContent = function( content ) {
+      this.content = content;
+   };
+
+   this.getContent = function() {
+      return this.content;
+   };
+
    this.toString = function() {
        return "Category label=" + this.label;
    };
+
+   /** Serialize this text element to XML. 
+    *  atomCategory =
+    *     element atom:category {
+    *        atomCommonAttributes,
+    *        attribute term { text },
+    *        attribute scheme { atomUri }?,
+    *        attribute label { text }?,
+    *        undefinedContent
+    *     }
+    */
+   this.toXML = function() {
+      xml = "<category>\n";
+      if ( this.uri != null ) {
+         xml += " uri=\"" + this.uri + "\"";
+      }
+      if ( this.lang != null) {
+         xml += " lang=\"" + this.lang + "\"";
+      }
+      if ( this.term != null) {
+         xml += " term=\"" + this.term + "\"";
+      }
+      if ( this.scheme != null) {
+         xml += " scheme=\"" + this.scheme + "\"";
+      }
+      if ( this.label != null) {
+         xml += " label=\"" + this.label + "\"";
+      }
+      xml += ">\n";
+      if ( this.content != null ) {
+         xml += this.content + "\n";
+      }
+      xml += "</category>\n";      
+      return xml;
+   }
 }
 
 /**
  * Class that defines a Link object.
  */
-function Link( href ) {
+function Link( href, relation ) {
    this.href = new Uri( href );
+   this.relation = relation;
    
    this.setHRef = function( uri ) {
       this.href = new Uri( uri );
@@ -337,6 +522,7 @@ function Link( href ) {
    this.getTitleLang = function() {
       return this.titleLang;
    };
+   
    this.setLength= function( length ) {
       this.length= length;
    };
@@ -359,6 +545,14 @@ function Link( href ) {
       return this.mimeType;
    };
 
+   this.setContent= function( content ) {
+      this.content = content;
+   };
+
+   this.getContent = function() {
+      return this.content;
+   };
+
 /*
 <static>  <final> String 	REL_ALTERNATE
           Link that provides the URI of an alternate format of the entry's or feed's contents.
@@ -388,6 +582,52 @@ function Link( href ) {
    this.toString = function() {
        return "Link href=" + this.href + ", title=" + this.title;
    };
+   
+   /** Serialize this text element to XML. 
+     * atomLink =
+     *     element atom:link {
+     *     atomCommonAttributes,
+     *     attribute href { atomUri },
+     *     attribute rel { atomNCName | atomUri }?,
+     *     attribute type { atomMediaType }?,
+     *     attribute hreflang { atomLanguageTag }?,
+     *     attribute title { text }?,
+     *     attribute length { text }?,
+     *     undefinedContent
+     *  }
+     */
+   this.toXML = function() {
+      xml = "<link";
+      if ( this.relation != null ) {
+         xml += " rel=\"" + this.relation + "\"";
+      }
+      if ( this.uri != null ) {
+         xml += " uri=\"" + this.uri.getValue() + "\"";
+      }
+      if ( this.lang != null) {
+         xml += " lang=\"" + this.lang + "\"";
+      }
+      if ( this.href != null ) {
+         xml += " href=\"" + this.href.getValue() + "\"";
+      }
+      if ( this.hreflang != null ) {
+         xml += " hreflang=\"" + this.hreflang + "\"";
+      }
+      if ( this.title != null ) {
+         xml += " title=\"" + this.title + "\"";
+      }
+      if ( this.length != null ) {
+         xml += " length=\"" + this.length + "\"";
+      }
+      if ( this.content != null ) {
+         xml += this.content + "\n";
+         xml += "</link>\n";
+      } else {
+         xml += "/>\n";
+      }      
+      return xml;
+   }
+   
 }          
 
 /**
@@ -413,10 +653,29 @@ function Link( href ) {
 function Entry( init ) {
    // Constructor code at bottom after function definition
    
-   var authors = new Array();
-   var contributors = new Array();
-   var categories = new Array();
-   var links = new Array();
+   this.authors = new Array();
+   this.contributors = new Array();
+   this.categories = new Array();
+   this.links = new Array();
+
+   this.setNamespace = function( namespace ) {
+      this.namespace = namespace;
+   };
+
+   this.getNamespace = function() {
+      return this.namespace;
+   };
+
+   this.setId = function( id ) {
+      if (!((typeof id == "object") && (id instanceof Id)))
+         this.id = new Id( id );
+      else 
+         this.id = id;
+   }
+
+   this.getId = function() {
+      return this.id;
+   };
 
    this.setPublished = function( published ) {
       this.published = published;
@@ -434,28 +693,7 @@ function Entry( init ) {
       return this.updated;
    };
 
-   this.setNamespace = function( namespace ) {
-      this.namespace = namespace;
-   };
-
-   this.getNamespace = function() {
-      return this.namespace;
-   };
-
-   this.setContent = function( content ) {
-      if (!((typeof content == "object") && (content instanceof Text)))
-         error( "Entry content must be of type Text" );
-
-      this.content = content;
-   }
-
-   this.getContent = function() {
-      return this.content;
-   };
-
    this.setRights = function( rights ) {
-      if (!((typeof rights == "object") && (rights instanceof Text)))
-         error( "Entry rights must be of type Text" );
       this.rights = rights;
    }
 
@@ -463,33 +701,48 @@ function Entry( init ) {
       return this.rights;
    };
 
-   /* Type Text */
-   this.setSummary = function( summary ) {
-      this.summary = summary;
+   this.setSource = function( source ) {
+      this.source = source;
    }
 
-   this.getSummary = function() {
-      return this.summary;
+   this.getSource = function() {
+      return this.source;
    };
 
    /* Type Text */
    this.setTitle = function( title ) {
       if (!((typeof title == "object") && (title instanceof Text)))
-         error( "Entry title must be of type Text" );
-      this.title = title;
+         this.title = new Text( title, "text" );
+      else 
+         this.title = title;
    }
 
    this.getTitle = function() {
       return this.title;
    };
 
-   /* Type Id */
-   this.setId = function( id ) {
-      this.id = id;
+   /* Type Text */
+   this.setSummary = function( summary ) {
+      if (!((typeof summary == "object") && (summary instanceof Text)))
+         this.summary = new Text( summary, "text" );
+      else
+         this.summary = summary;
    }
 
-   this.getId = function() {
-      return this.id;
+   this.getSummary = function() {
+      return this.summary;
+   };
+
+   /* Type Text */
+   this.setContent = function( content ) {
+      if (!((typeof content == "object") && (content instanceof Text)))
+         this.content = new Text( content, "text" );
+      else
+         this.content = content;
+   }
+
+   this.getContent = function() {
+      return this.content;
    };
 
    /**
@@ -499,8 +752,8 @@ function Entry( init ) {
    this.addAuthor = function(person) {
       if (!((typeof person == "object") && (person instanceof Person)))
          error( "Entry author must be of type Person" );
-      var i = authors.length;
-      authors[ i ] = person;
+      var i = this.authors.length;
+      this.authors[ i ] = person; 
    }
    
    /**
@@ -508,7 +761,7 @@ function Entry( init ) {
     * @param name Author
     */
    this.getAuthor = function(name) {
-      return authors[ name ];
+      return this.authors[ name ];
    }
    
    /**
@@ -524,7 +777,7 @@ function Entry( init ) {
     * @param name Author
     */
    this.getAuthors = function() {
-      return authors;
+      return this.authors;
    }
    
    /**
@@ -534,8 +787,8 @@ function Entry( init ) {
    this.addContributor = function(person) {
       if (!((typeof person == "object") && (person instanceof Person)))
          error( "Entry contributor must be of type Person" );
-      var i = contributors.length;
-      contributors[ i ] = person;
+      var i = this.contributors.length;
+      this.contributors[ i ] = person;
    }
    
    /**
@@ -543,7 +796,7 @@ function Entry( init ) {
     * @param name Contributor
     */
    this.getContributor = function(name) {
-      return contributors[ name ];
+      return this.contributors[ name ];
    }
    
    /**
@@ -559,26 +812,26 @@ function Entry( init ) {
     * @param name Contributor
     */
    this.getContributors = function() {
-      return contributors;
+      return this.contributors;
    }
    
    /**
-    * Add an contributor.
+    * Add a category.
     * @param name Category
     */
    this.addCategory = function(category) {
-      if (!((typeof category == "object") && (person instanceof Category)))
+      if (!((typeof category == "object") && (category instanceof Category)))
          error( "Entry category must be of type Category" );
-      var i = categories.length
-      categories[ i ] = category;
+      var i = this.categories.length
+      this.categories[ i ] = category;
    }
    
    /**
-    * Get an contributor.
+    * Get a names category.
     * @param name Category
     */
    this.getCategory = function(name) {
-      return categories[ name ];
+      return this.categories[ name ];
    }
    
    /**
@@ -590,11 +843,11 @@ function Entry( init ) {
    }
    
    /**
-    * Get an contributor.
+    * Get all categories.
     * @param name Category
     */
    this.getCategories = function() {
-      return categories;
+      return this.categories;
    }
    
    /**
@@ -604,8 +857,8 @@ function Entry( init ) {
    this.addLink = function(link) {
       if (!((typeof link == "object") && (link instanceof Link)))
          error( "Entry link must be of type Link" );
-      var i = links.length;
-      links[ i ] = link;
+      var i = this.links.length;
+      this.links[ i ] = link;
    }
    
    /**
@@ -674,7 +927,7 @@ function Entry( init ) {
                if ( type == undefined )
                   type = "text";
                var title = new Text( text, type );
-               this.setSubTitle( title );
+               this.setSubtitle( title );
             } else if ( tagName == "id" ) {
                var id = new Id( getTextContent( node ) );
                this.setId( id );
@@ -711,7 +964,90 @@ function Entry( init ) {
    this.toString = function() {
        return "Entry title=" + this.title + ", updated=" + this.updated;
    };
-   
+
+   /** Serialize this text element to XML. 
+	 * atomEntry =
+	 *     element atom:entry {
+	 *        atomCommonAttributes,
+	 *        (atomAuthor*
+	 *         & atomContributor*
+	 *         & atomCategory*
+	 *         & atomLink*
+	 *         & atomTitle
+	 *         & atomId
+	 *         & atomPublished?
+	 *         & atomUpdated
+	 *         & atomContent?
+	 *         & atomRights?
+	 *         & atomSource?
+	 *         & atomSummary?
+	 *         & extensionElement*)
+	 *     }    
+     */
+   this.toXML = function() {
+      xml = "<entry";
+      if ( this.namespace != null ) {
+         xml += " namespace=\"" + this.namespace + "\"";
+      }
+      if ( this.uri != null ) {
+         xml += " uri=\"" + this.uri + "\"";
+      }
+      if ( this.lang != null ) {
+         xml += " lang=\"" + this.lang + "\"";
+      }
+      xml += ">";
+      if ( this.title != null ) {
+         xml += this.title.toXML( "title" );
+      }
+      if ( this.id != null ) {
+         xml += this.id.toXML();
+      }
+      if ( this.published != null ) {
+         xml += "<published>" + this.published + "</published>\n";
+      }
+      if ( this.updated != null ) {
+         xml += "<updated>" + this.updated + "</updated>\n";
+      }
+      if ( this.authors != null ) {
+      for ( var i = 0; i < this.authors.length; i++ ) {
+         var author = this.authors[ i ];
+         xml += author.toXML( "author" );
+      }
+      }
+      if ( this.contributors != null ) {
+      for ( var i = 0; i < this.contributors.length; i++ ) {
+         var contributor = this.contributors[ i ];
+         xml += contributor.toXML( "contributor" );
+      }
+      }
+      if ( this.categories != null ) {
+      for ( var i = 0; i < this.categories.length; i++ ) {
+         var category = this.categories[ i ];
+         xml += category.toXML();
+      }
+      }
+      if ( this.links != null ) {
+      for ( var i = 0; i < this.links.length; i++ ) {
+         var link = this.links[ i ];
+         xml += link.toXML();
+      }
+      }
+      if ( this.rights != null ) {
+         xml += "<rights>" + this.rights + "</rights>\n";
+      }
+      if ( this.source != null ) {
+         xml += "<source>" + this.source + "</source>\n";
+      }
+      if ( this.summary != null ) {
+         xml += this.summary.toXML( "summary" );
+      }
+      if ( this.content != null ) {
+         xml += this.content.toXML( "content" );
+      }
+      xml += "</entry>";      
+      return xml;
+   }
+  
    // Initialize from constructor   
    if (typeof init == 'object') {
       if ( init.nodeType == 1 ) { /* Document Node.ELEMENT_NODE 1 */
@@ -719,7 +1055,10 @@ function Entry( init ) {
       } else {      
          error( "Feed init unknown type" );
       }
-   }  
+   }  else if ( typeof init === 'string' ) {
+      this.setTitle( init );
+   }
+   this.namespace = "http://www.w3.org/2005/Atom";
 }
 
 /**
@@ -745,11 +1084,19 @@ function Entry( init ) {
 function Feed( init ) {
    // See init after functions have been defined.
 
-   var authors = new Array();
-   var contributors = new Array();
-   var categories = new Array();
-   var links = new Array();
-   var entries = new Array();
+   this.authors = new Array();
+   this.contributors = new Array();
+   this.categories = new Array();
+   this.links = new Array();
+   this.entries = new Array();
+
+   this.setNamespace = function( namespace ) {
+      this.namespace = namespace;
+   };
+
+   this.getNamespace = function() {
+      return this.namespace;
+   };
 
    this.setPublished = function( published ) {
       this.published = published;
@@ -767,14 +1114,6 @@ function Feed( init ) {
       return this.updated;
    };
 
-   this.setNamespace = function( namespace ) {
-      this.namespace = namespace;
-   };
-
-   this.getNamespace = function() {
-      return this.namespace;
-   };
-
    this.setContent = function( content ) {
       if (!((typeof content == "object") && (content instanceof Text)))
          error( "Entry content must be of type Text" );
@@ -788,8 +1127,9 @@ function Feed( init ) {
 
    this.setRights = function( rights ) {
       if (!((typeof rights == "object") && (rights instanceof Text)))
-         error( "Feed rights must be of type Text" );
-      this.rights = rights;
+         this.rights = new Text( rights, "text" );
+      else 
+         this.rights = rights;
    }
 
    this.getRights = function() {
@@ -808,27 +1148,32 @@ function Feed( init ) {
 
    this.setTitle = function( title ) {
       if (!((typeof title == "object") && (title instanceof Text)))
-         error( "Feed title must be of type Text" );
-      this.title = title;
+         this.title = new Text( title, "text" );
+      else 
+         this.title = title;
    }
 
    this.getTitle = function() {
       return this.title;
    };
 
-   this.setSubTitle = function( subtitle ) {
+   this.setSubtitle = function( subtitle ) {
       if (!((typeof subtitle == "object") && (subtitle instanceof Text)))
-         error( "Feed subtitle must be of type Text" );
-      this.subtitle = subtitle;
+         this.subtitle = new Text( subtitle, "text" );
+      else 
+         this.subtitle = subtitle;
    }
 
-   this.getSubTitle = function() {
+   this.getSubtitle = function() {
       return this.subtitle;
    };
 
    /* Type Id */
    this.setId = function( id ) {
-      this.id = id;
+      if (!((typeof id == "object") && (id instanceof Id)))
+         this.id = new Id( id );
+      else 
+         this.id = id;
    }
 
    this.getId = function() {
@@ -868,8 +1213,8 @@ function Feed( init ) {
    this.addAuthor = function(person) {
       if (!((typeof person == "object") && (person instanceof Person)))
          error( "Entry author must be of type Person" );
-      var i = authors.length;
-      authors[ i ] = person;
+      var i = this.authors.length;
+      this.authors[ i ] = person;
    }
    
    /**
@@ -877,7 +1222,7 @@ function Feed( init ) {
     * @param name Author
     */
    this.getAuthor = function(name) {
-      return authors[ name ];
+      return this.authors[ name ];
    }
    
    /**
@@ -893,7 +1238,7 @@ function Feed( init ) {
     * @param name Author
     */
    this.getAuthors = function() {
-      return authors;
+      return this.authors;
    }
    
    /**
@@ -903,8 +1248,8 @@ function Feed( init ) {
    this.addContributor = function(person) {
       if (!((typeof person == "object") && (person instanceof Person)))
          error( "Entry contributor must be of type Person" );
-      var i = contributors.length;
-      contributors[ i ] = person;
+      var i = this.contributors.length;
+      this.contributors[ i ] = person;
    }
    
    /**
@@ -912,7 +1257,7 @@ function Feed( init ) {
     * @param name Contributor
     */
    this.getContributor = function(name) {
-      return contributors[ name ];
+      return this.contributors[ name ];
    }
    
    /**
@@ -928,42 +1273,42 @@ function Feed( init ) {
     * @param name Contributor
     */
    this.getContributors = function() {
-      return contributors;
+      return this.contributors;
    }
    
    /**
-    * Add an contributor.
+    * Add a category.
     * @param name Category
     */
    this.addCategory = function(category) {
-      if (!((typeof category == "object") && (person instanceof Category)))
-         error( "Entry category must be of type Category" );
-      var i = categories.length;
-      categories[ i ] = category;
+      if (!((typeof category == "object") && (category instanceof Category)))
+         error( "Feed category must be of type Category" );
+      var i = this.categories.length;
+      this.categories[ i ] = category;
    }
    
    /**
-    * Get an contributor.
+    * Get a named contributor.
     * @param name Category
     */
    this.getCategory = function(name) {
-      return categories[ name ];
+      return this.categories[ name ];
    }
    
    /**
     * Set list of categories
-    * @param name Author
+    * @param category
     */
    this.setCategories = function( categories ) {
       return this.categories = categories;
    }
    
    /**
-    * Get an contributor.
+    * Get all categories.
     * @param name Category
     */
    this.getCategories = function() {
-      return categories;
+      return this.categories;
    }
    
    /**
@@ -973,8 +1318,8 @@ function Feed( init ) {
    this.addLink = function(link) {
       if (!((typeof link == "object") && (link instanceof Link)))
          error( "Entry link must be of type Link" );
-      var i = links.length
-      links[ i ] = link;
+      var i = this.links.length;
+      this.links[ i ] = link;
    }
    
    /**
@@ -982,7 +1327,7 @@ function Feed( init ) {
     * @param name Link
     */
    this.getLink = function(name) {
-      return links[ name ];
+      return this.links[ name ];
    }
    
    /**
@@ -998,7 +1343,7 @@ function Feed( init ) {
     * @param name Link
     */
    this.getLinks = function() {
-      return links;
+      return this.links;
    }
    
    /**
@@ -1008,8 +1353,8 @@ function Feed( init ) {
    this.addEntry = function(entry) {
       if (!((typeof entry == "object") && (entry instanceof Entry)))
          error( "Entry entry must be of type Entry" );
-      var i = entries.length;
-      entries[ i ] = entry;
+      var i = this.entries.length;
+      this.entries[ i ] = entry;
    }
    
    /**
@@ -1017,7 +1362,7 @@ function Feed( init ) {
     * @param name Entry
     */
    this.getEntry = function(name) {
-      return entries[ name ];
+      return this.entries[ name ];
    }
    
    /**
@@ -1033,7 +1378,7 @@ function Feed( init ) {
     * @param name Entry
     */
    this.getEntries = function() {
-      return entries;
+      return this.entries;
    }
    
    this.readFromXML = function( xml ) {
@@ -1074,7 +1419,7 @@ function Feed( init ) {
                if ( type == undefined )
                   type = "text";
                var title = new Text( text, type );
-               this.setSubTitle( title );
+               this.setSubtitle( title );
             } else if ( tagName == "entry" ) {
                var entry = new Entry();
                entry.readFromNode( node );
@@ -1109,6 +1454,104 @@ function Feed( init ) {
        return "Feed title=" + this.title + ", updated=" + this.updated;
    };
 
+   /** Serialize this text element to XML. 
+	 *  atomFeed =
+	 *     element atom:feed {
+	 *        atomCommonAttributes,
+	 *        (atomAuthor*
+	 *         & atomContributor*
+	 *         & atomCategory*
+	 *         & atomLink*
+	 *         & atomTitle
+	 *         & atomSubtitle?
+	 *         & atomId
+	 *         & atomUpdated
+	 *         & atomRights?	 
+	 *         & atomGenerator?
+	 *         & atomIcon?
+	 *         & atomLogo?
+	 *         & extensionElement*),
+	 *        atomEntry* 
+     */
+   this.toXML = function() {
+      xml = "<feed";
+      if ( this.namespace != null ) {
+         xml += " namespace=\"" + this.namespace + "\"";
+      }
+      if ( this.uri != null ) {
+         xml += " uri=\"" + this.uri + "\"";
+      }
+      if ( this.lang != null ) {
+         xml += " lang=\"" + this.lang + "\"";
+      }
+      xml += ">\n";
+      if ( this.title != null ) {
+         xml += this.title.toXML( "title" );
+      }
+      if ( this.subtitle != null ) {
+         xml += this.subtitle.toXML( "subtitle" );
+      }
+      if ( this.id != null ) {
+         xml += this.id.toXML();
+      }
+      if ( this.published != null ) {
+         xml += "<published>" + this.published + "</published>\n";
+      }
+      if ( this.updated != null ) {
+         xml += "<updated>" + this.updated + "</updated>\n";
+      }
+      if ( this.authors != null ) {      
+      for ( var i = 0; i < this.authors.length; i++ ) {
+         var author = this.authors[ i ];
+         xml += author.toXML( "author" );
+      }
+      }
+      if ( this.contributors != null ) {      
+      for ( var i = 0; i < this.contributors.length; i++ ) {
+         var contributor = this.contributors[ i ];
+         xml += contributor.toXML( "contributor" );
+      }
+      }
+      if ( this.categories != null ) {      
+      for ( var i = 0; i < this.categories.length; i++ ) {
+         var category = this.categories[ i ];
+         xml += category.toXML();
+      }
+      }
+      if ( this.links != null ) {      
+      for ( var i = 0; i < this.links.length; i++ ) {
+         var link = this.links[ i ];
+         xml += link.toXML();
+      }
+      }
+      if ( this.rights != null ) {
+         xml += this.rights.toXML( "rights" );
+      }
+      if ( this.source != null ) {
+         xml += "<source>" + this.source + "</source>\n";
+      }
+      if ( this.logo != null ) {
+         xml += "<logo>" + this.logo + "</logo>\n";
+      }
+      if ( this.icon != null ) {
+         xml += "<icon>" + this.icon + "</icon>\n";
+      }
+      if ( this.generator != null ) {
+         xml += this.generator.toXML( "generator" );
+      }
+      if ( this.summary != null ) {
+         xml += this.summary.toXML( "summary" );
+      }
+      if ( this.entries != null ) {
+      for ( var i = 0; i < this.entries.length; i++ ) {
+         var entry = this.entries[ i ];
+         xml += entry.toXML();
+      }      
+      }      
+      xml += "</feed>\n";      
+      return xml;
+   }
+  
    // Initialize from constructor   
    if (typeof init == 'object') {
       if ( init.nodeType == 9 ) { /* Document Node.DOCUMENT_NODE 9 */
@@ -1116,7 +1559,10 @@ function Feed( init ) {
       } else {      
          error( "Feed init unknown type" );
       }
-   }  
+   }  else if ( typeof init === 'string' ) {
+      this.setTitle( init );
+   }   
+   this.namespace = "http://www.w3.org/2005/Atom";
 }
 
 function error( message ) {
diff --git a/java/sca/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html b/java/sca/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
index e58f14a635..71148833e0 100644
--- a/java/sca/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
+++ b/java/sca/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
@@ -70,7 +70,7 @@
 			}

 			document.getElementById("shoppingCart").innerHTML = list;

 			// document.getElementById('total').innerHTML = feed.getElementsByTagName("subtitle")[0].firstChild.nodeValue;

-			var text =  feed.getSubTitle().getText();

+			var text =  feed.getSubtitle().getText();

 			document.getElementById('total').innerHTML = text;

 		}

 	}

@@ -84,6 +84,9 @@
 		var j = 0;

 		for (var i=0; i<items.length; i++)

 			if (items[i].checked) {

+				var entry = new Entry( "cart-item" );

+				entry.setContent( items[i].value );

+				var entryXML = entry.toXML();

 				var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>cart-item</title><content type="text">'+items[i].value+'</content></entry>'

 				shoppingCart.post(entry, shoppingCart_postResponse);

 				items[i].checked = false;

@@ -109,7 +112,14 @@
 		document.getElementById('shoppingCart').innerHTML = "";

 		document.getElementById('total').innerHTML = "";	

 	}	

-
+	function testFeedtoXML() {

+		if(exception){

+			alert(exception.message);

+			return;

+		}

+    	document.getElementById('results').innerHTML = text;

+	}

+	

     //alert(locale);

 	catalog.get(catalog_getResponse);

 	shoppingCart.get("", shoppingCart_getResponse);

diff --git a/java/sca/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html b/java/sca/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html
new file mode 100644
index 0000000000..352dd85508
--- /dev/null
+++ b/java/sca/modules/implementation-widget-runtime/src/test/resources/content/unitTests.html
@@ -0,0 +1,250 @@
+<!--

+    * Licensed to the Apache Software Foundation (ASF) under one

+    * or more contributor license agreements.  See the NOTICE file

+    * distributed with this work for additional information

+    * regarding copyright ownership.  The ASF licenses this file

+    * to you under the Apache License, Version 2.0 (the

+    * "License"); you may not use this file except in compliance

+    * with the License.  You may obtain a copy of the License at

+    * 

+    *   http://www.apache.org/licenses/LICENSE-2.0

+    * 

+    * Unless required by applicable law or agreed to in writing,

+    * software distributed under the License is distributed on an

+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    * KIND, either express or implied.  See the License for the

+    * specific language governing permissions and limitations

+    * under the License.    

+-->

+<html>

+<head>

+<title>Atom JavaScript Client Unit Tests</title>

+

+<!-- Include Tuscany JavaScript client model for Atom.  

+	 Using this JavaScript model, users can use syntax such as:

+	 item += "name=" + entry.getName() + ", price=" + entry.getContent() 

+	 rather than

+     item += entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;

+	-->

+<script type="text/javascript" src="atomModel.js"></script>

+

+<script language="JavaScript">

+	

+	function testUritoXML() {

+       var test = new Uri( "http://example.org/edit/first-post.atom" );

+       var text = text.toXML();

+       alert( "Uri=" + text );

+	}

+	

+	function testEmailtoXML() {

+       var test = new Email( "john.doe@ibm.com" );

+       var text = test.toXML();

+       alert( "Email=" + text );

+	}

+

+	function testIdtoXML() {

+       var test = new Id( "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a" );

+       var text = test.toXML();

+       alert( "Id=" + text );

+	}

+

+	function testLogotoXML() {

+       var test = new Logo( "goofyGraphic.png" );

+       var text = test.toXML();

+       alert( "Logo=" + text );

+	 	document.getElementById('results').innerHTML = removeBrackets( text );

+	}

+

+	function testTexttoXML() {

+       var test = new Text( "This is ordinary text." );

+       var text = test.toXML();

+       alert( "Text=" + text );

+       var test = new Text( "This is <b>HTML</b> text.", "html" );

+       var text = test.toXML( "supertext" );

+       alert( "Text=" + text );

+	 document.getElementById('results').innerHTML = removeBrackets( text );

+	}

+

+	function testPersontoXML() {

+       var test = new Person( "John Doe", "john.doe@ibm.com" );

+       var text = test.toXML();

+       alert( "Person=" + text );

+	 document.getElementById('results').innerHTML = removeBrackets( text );

+	}

+	

+	function testGeneratortoXML() {

+       var test = new Generator( "Power Station", "http://www.powerstation.com" );

+       var text = test.toXML();

+       alert( "Generator=" + text );

+	 document.getElementById('results').innerHTML = removeBrackets( text );

+	}

+	

+	function testCategorytoXML() {

+       var test = new Category( "CategoryXYZ", "http://www.site.com/?category=CategoryXYZ" );

+       var text = test.toXML();

+       alert( "Category=" + text );

+	 document.getElementById('results').innerHTML = removeBrackets( text );

+	}

+	

+	function testLinktoXML() {

+       var test = new Link( "http://example.org/edit/first-post.atom", "edit" );

+       var text = test.toXML();

+       alert( "Link=" + text );

+	 document.getElementById('results').innerHTML = removeBrackets( text );

+	}

+	

+	function testEntrytoXML() {

+       // <?xml version="1.0"?>

+       // <entry xmlns="http://www.w3.org/2005/Atom">

+       //   <title>Atom-Powered Robots Run Amok</title>

+       //   <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>

+       //   <updated>2003-12-13T18:30:02Z</updated>

+       //   <author><name>John Doe</name></author>

+       //   <content>Some text.</content>

+       //   <link rel="edit" href="http://example.org/edit/first-post.atom"/>

+       // </entry>

+

+       var entry = new Entry();

+       entry.setNamespace( "http://www.w3.org/2005/Atom" );

+       entry.setTitle( "Atom-Powered Robots Run Amok" );

+       entry.setId( "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a" );

+       entry.setUpdated( "2003-12-13T18:30:02Z" );

+       entry.setContent( "Some text." );

+       entry.addAuthor( new Person( "John Doe" ) );

+       entry.addAuthor( new Person( "Mark Pilgrim", "f8dy@example.com" ));

+       entry.addContributor( new Person( "Sam Ruby" ));

+       entry.addContributor( new Person( "Joe Gregorio" ));

+       entry.addLink( new Link( "http://example.org/edit/first-post.atom", "edit" ));

+       var text = entry.toXML();

+        		

+	 	document.getElementById('results').innerHTML = removeBrackets( text );

+	}

+	

+	function testFeedtoXML() {

+       // <feed xmlns="http://www.w3.org/2005/Atom">

+       // <title type="text">dive into mark</title>

+       // <subtitle type="html">A &lt;em&gt;lot&lt;/em&gt; of effort went into making this effortless </subtitle>

+       // <updated>2005-07-31T12:29:29Z</updated>

+       // <id>tag:example.org,2003:3</id>

+       // <link rel="alternate" type="text/html" hreflang="en" href="http://example.org/"/>

+       // <link rel="self" type="application/atom+xml" href="http://example.org/feed.atom"/>

+       // <rights>Copyright (c) 2003, Mark Pilgrim</rights>

+       // <generator uri="http://www.example.com/" version="1.0">Example Toolkit</generator>

+       // <entry>

+       //    <title>Atom draft-07 snapshot</title>

+       //    <link rel="alternate" type="text/html" href="http://example.org/2005/04/02/atom"/>

+       //    <link rel="enclosure" type="audio/mpeg" length="1337" href="http://example.org/audio/ph34r_my_podcast.mp3"/>

+       //    <id>tag:example.org,2003:3.2397</id>

+       //    <updated>2005-07-31T12:29:29Z</updated>

+       //    <published>2003-12-13T08:29:29-04:00</published>

+       //    <author><name>Mark Pilgrim</name><uri>http://example.org/</uri><email>f8dy@example.com</email></author>

+       //    <contributor><name>Sam Ruby</name></contributor>

+       //    <contributor><name>Joe Gregorio</name></contributor>

+       //    <content type="xhtml" xml:lang="en"  xml:base="http://diveintomark.org/">

+       //    <div xmlns="http://www.w3.org/1999/xhtml">

+       //       <p><i>[Update: The Atom draft is finished.]</i></p>

+       //    </div>

+       //    </content>

+       // </entry>

+       // <entry>

+       //    <title>Dan Becker's Triathlon Site - Best Hills In Austin</title>

+       //    <category term="triathlons"/>

+       //    <id>tag:www.io.com,2008-09-05:/~beckerdo/triathlons/besthills.html</id>

+       //    <link href="http://www.io.com/~beckerdo/triathlons/besthills.html"/>

+       //    <published>2008-09-05T14:09:32-05:00</published>

+       //    <updated>2008-09-06T08:49:12-05:00</updated>

+       //    <summary type='html'>

+       //    &lt;a href='http://www.io.com/~beckerdo/triathlons/besthills.html'&gt;&lt;img src='http://www.io.com/~beckerdo/pictures/LittleDan25.png' width='25' height='25' alt='Little Dan' align='left'&gt;&lt;/a&gt;

+       //    A description and Google maps of the best running and biking hills in Austin, Texas.

+       //    </summary>

+       //    </entry>

+       // </feed>

+

+       var feed = new Feed( "Dive into Mark" );

+       feed.setSubtitle( new Text( "A &lt;em&gt;lot&lt;/em&gt; of effort went into making this effortless", "html" ));

+       feed.setUpdated( "2005-07-31T12:29:29Z" );

+       feed.setId( "tag:example.org,2003:3" );

+       var link = new Link( "http://example.org", "alternate" );

+       link.setMimeType( "text/html" );

+       link.setHRefLang( "en" );

+       feed.addLink( link ); 

+       feed.addLink( new Link( "http://example.org/feed.atom", "self" ));

+       feed.setRights( "Copyright (c) 2003, Mark Pilgrim" );

+       feed.setGenerator( new Generator(  "Example Toolkit", "http://www.example.com/" ));

+       feed.addAuthor( new Person( "Mark Pilgrim", "f8dy@example.com" ));

+       feed.addContributor( new Person( "Sam Ruby" ));

+       feed.addContributor( new Person( "Joe Gregorio" ));

+       // <entry>

+       //    <title>Atom draft-07 snapshot</title>

+       //    <link rel="alternate" type="text/html" href="http://example.org/2005/04/02/atom"/>

+       //    <link rel="enclosure" type="audio/mpeg" length="1337" href="http://example.org/audio/ph34r_my_podcast.mp3"/>

+       //    <id>tag:example.org,2003:3.2397</id>

+       //    <updated>2005-07-31T12:29:29Z</updated>

+       //    <published>2003-12-13T08:29:29-04:00</published>

+       //    <author><name>Mark Pilgrim</name><uri>http://example.org/</uri><email>f8dy@example.com</email></author>

+       //    <contributor><name>Sam Ruby</name></contributor>

+       //    <contributor><name>Joe Gregorio</name></contributor>

+       //    <content type="xhtml" xml:lang="en"  xml:base="http://diveintomark.org/">

+       //    <div xmlns="http://www.w3.org/1999/xhtml">

+       //       <p><i>[Update: The Atom draft is finished.]</i></p>

+       //    </div>

+       //    </content>

+       // </entry>

+       // <entry>

+       //    <title>Dan Becker's Triathlon Site - Best Hills In Austin</title>

+       //    <category term="triathlons"/>

+       //    <id>tag:www.io.com,2008-09-05:/~beckerdo/triathlons/besthills.html</id>

+       //    <link href="http://www.io.com/~beckerdo/triathlons/besthills.html"/>

+       //    <published>2008-09-05T14:09:32-05:00</published>

+       //    <updated>2008-09-06T08:49:12-05:00</updated>

+       //    <summary type='html'>

+       //    &lt;a href='http://www.io.com/~beckerdo/triathlons/besthills.html'&gt;&lt;img src='http://www.io.com/~beckerdo/pictures/LittleDan25.png' width='25' height='25' alt='Little Dan' align='left'&gt;&lt;/a&gt;

+       //    A description and Google maps of the best running and biking hills in Austin, Texas.

+       //    </summary>

+       //    </entry>

+       // </feed>

+       var entry = new Entry( "Dan Becker's Triathlon Site - Best Hills In Austin" );

+       entry.addCategory( new Category( "running" ));

+       entry.addCategory( new Category( "triathlons" ));

+       entry.setId( "tag:www.io.com,2008-09-05:/~beckerdo/triathlons/besthills.html" );

+       entry.addLink( new Link ( "http://www.io.com/~beckerdo/triathlons/besthills.html" ));

+       entry.setPublished( "2008-09-05T14:09:32-05:00" );

+       entry.setUpdated( "2008-09-06T08:49:12-05:00" );

+       entry.setSummary( new Text (

+          "&lt;a href='http://www.io.com/~beckerdo/triathlons/besthills.html'&gt;&lt;img src='http://www.io.com/~beckerdo/pictures/LittleDan25.png' width='25' height='25' alt='Little Dan' align='left'&gt;&lt;/a&gt;\n" + 

+          "A description and Google maps of the best running and biking hills in Austin, Texas.", "html" ));

+       feed.addEntry( entry );

+       

+       var text = feed.toXML();

+       alert( "Feed xml=" + text );        		

+	 	document.getElementById('results').innerHTML = removeBrackets( text );

+	}

+	

+    function removeBrackets( input ) {

+       input = input.replace( /</g, "&lt;" ); // replaceAll

+       input = input.replace( />/g, "&gt;" ); // replaceAll

+       return input;

+    }

+</script>

+</head>

+

+<body>

+<h1>Atom JavaScript Client Unit Tests</h1>

+<p>This document tests the serialization and deserialization of the Atom JavaScript client.

+   	<h2>Model to XML Tests</h2>

+		<input type="button" onClick="testUritoXML()" value="Uri to XML"><br> 

+		<input type="button" onClick="testEmailtoXML()" value="Email to XML"><br> 

+		<input type="button" onClick="testIdtoXML()" value="Id to XML"><br> 

+		<input type="button" onClick="testLogotoXML()" value="Logo to XML"><br> 

+		<input type="button" onClick="testTexttoXML()" value="Text to XML"><br> 

+		<input type="button" onClick="testPersontoXML()" value="Person to XML"><br> 

+		<input type="button" onClick="testGeneratortoXML()" value="Generator to XML"><br> 

+		<input type="button" onClick="testCategorytoXML()" value="Category to XML"><br> 

+		<input type="button" onClick="testLinktoXML()" value="Link to XML"><br> 

+		<input type="button" onClick="testEntrytoXML()" value="Entry to XML"><br> 

+		<input type="button" onClick="testFeedtoXML()" value="Feed to XML"><br> 

+   	<h2>Results</h2>

+   	<code id="results">

+   	</code>

+</body>

+</html>