Moving 2.x contribs

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

10 files changed, 0 insertions, 2488 deletions

diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java b/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
deleted file mode 100644
index 3d559c20d5..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.implementation.widget;
-
-import java.net.Socket;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WidgetImplementationTestCase extends TestCase {
-
-    private Node node;
-    
-    @Override
-    protected void setUp() throws Exception {
-        String contribution = ContributionLocationHelper.getContributionLocation(getClass());
-        node = NodeFactory.newInstance().createNode("widget.composite", new Contribution("test", contribution));
-        node.start();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-        node.destroy();
-    }
-    
-    public void testPing() throws Exception {
-        new Socket("127.0.0.1", 8085);
-    }
-
-}
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/Catalog.java b/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/Catalog.java
deleted file mode 100644
index 5dd7d70e6c..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/Catalog.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.    
- */
-
-package store;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * Interface for the Catalog Service.
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface Catalog {
-    String[] get();
-}
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java b/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
deleted file mode 100644
index 1a34094cc5..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.    
- */
-
-package store;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Init;
-
-/**
- * Implementation of the Catalog Service.
- *
- * @version $Rev$ $Date$
- */
-public class CatalogImpl implements Catalog {
-    private List<String> catalog = new ArrayList<String>();
-
-    @Init
-    public void init() {
-        catalog.add("Apple - $ 2.99");
-        catalog.add("Orange - $ 3.55");
-        catalog.add("Pear - $ 1.55");
-    }
-
-    public String[] get() {
-        String[] catalogArray = new String[catalog.size()];
-        catalog.toArray(catalogArray);
-        return catalogArray;
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java b/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
deleted file mode 100644
index 37e8d0161a..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * 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.    
- */
-
-package store;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.tuscany.sca.binding.atom.collection.Collection;
-import org.apache.tuscany.sca.binding.atom.collection.NotFoundException;
-
-/**
- * Implementation of a Shopping Cart.
- *
- * @version $Rev$ $Date$
- */
-public class ShoppingCartImpl implements Collection {
-
-    private static Map<String, Entry> cart = new HashMap<String, Entry>();
-
-    public Feed getFeed() {
-        Feed feed = Abdera.getNewFactory().newFeed();
-        feed.setTitle("shopping cart");
-        feed.setSubtitle("Total : " + getTotal());
-        
-        for (Entry entry : cart.values()) {
-            feed.addEntry(entry);
-        }
-        return feed;
-    }
-    
-    public Feed query(String queryString) {
-        if (queryString.startsWith("name=")) {
-            String name = queryString.substring(5);
-
-            Feed feed = Abdera.getNewFactory().newFeed();
-            feed.setTitle("shopping cart");
-            feed.setSubtitle("Total : " + getTotal());
-            
-            for (Entry entry : cart.values()) {
-                if (entry.getTitle().contains(name)) {
-                    feed.addEntry(entry);
-                }
-            }
-            return feed;
-            
-        } else {
-            return getFeed();
-        }
-    }
-
-    public Entry get(String id) throws NotFoundException {
-        return cart.get(id);
-    }
-
-    public Entry post(Entry entry) {
-        System.out.println("post" + entry);
-        String id = "cart-" + UUID.randomUUID().toString();
-        entry.setId(id);
-
-        entry.addLink(id, "edit");
-        entry.addLink(id, "alternate");
-        
-        entry.setUpdated(new Date());
-
-        cart.put(id, entry);
-        return entry;
-    }
-
-    public void put(String id, Entry entry) throws NotFoundException {
-        entry.setUpdated(new Date());
-        cart.put(id, entry);
-    }
-
-    public void delete(String id) throws NotFoundException {
-        if (id.equals(""))
-            cart.clear();
-        else
-            cart.remove(id);
-    }
-
-    private String getTotal() {
-        float total = 0;
-        String currencySymbol = "";
-        if (!cart.isEmpty()) {
-            String item = ((Entry)cart.values().iterator().next()).getContent();
-            // Select first symbol after dash.
-            currencySymbol = item.substring(item.indexOf("-") + 2, item.indexOf("-") + 3);
-        }
-        for (Entry entry : cart.values()) {
-            String item = entry.getContent();
-            
-            int index = item.length()-1;
-            char digit;
-            while ((digit = item.charAt(index)) == '.' || Character.isDigit(digit)) {
-                index--;
-            }
-            
-            total += Float.valueOf(item.substring(index));
-        }
-        return currencySymbol + String.valueOf(total);
-    }
-}
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js b/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
deleted file mode 100644
index c64c3fc97c..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/atomModel.js
+++ /dev/null
@@ -1,1590 +0,0 @@
-/*
- * 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.    
- */
- 
-/**
- * Class that defines a URI represented as a string,
- */
-function Uri( value ) {
-   this.value = value;
-   this.getValue = function() {
-      return this.value;
-   };
-
-   this.setValue = function(value) {
-      this.value = 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 */
-/* Published is Date */
-
-/**
- * Class that defines an Email represented as a string,
- */
-function Email( value ) {
-   this.value = value;
-   this.getValue = function() {
-      return this.value;
-   };
-
-   this.setValue = function(value) {
-      this.value = 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;
-   };
-}
-
-/**
- * Class that defines an Id represented as a string,
- */
-function Id( value ) {
-   this.value = value;
-   this.getValue = function() {
-      return this.value;
-   };
-
-   this.setValue = function(value) {
-      this.value = 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;
-   };
-}
-
-
-/**
- * Class that defines an Id represented as a string,
- */
-function Logo( value ) {
-   this.value = value;
-   this.getValue = function() {
-      return this.value;
-   };
-
-   this.setValue = function(value) {
-      this.value = value;
-   };
-
-
-   this.toString = function() {
-       return "Logo 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;
-   };
-}
-
-/**
- * Class that defines a Text object.
- */
-function Text( content, /* optional */ type ) {
-   this.content = content;
-   this.type = type;
-   if (type == null) this.type = "text"; // If undefined or null, use text
-   
-   this.setText = function(content) {
-      this.content = content;
-   };
-
-   this.getText = function() {
-      return this.content;
-   };
-
-   this.getValue = function() {
-      return this.content;
-   };
-
-   this.setType = function(type) {
-      if ((type != "text") && (type != "html") && (type != "xhtml")) {
-         error( "Text type must be one of text, html, or xhtml" );
-      }
-      this.type = type;
-   };
-
-   this.getType = function() {
-      return this.type;
-   };
-
-   this.setLang = function(lang) {
-      this.lang = lang;
-   };
-
-   this.getLang = function() {
-      return this.lang;
-   };
-
-   this.setUri = function(uri) {
-      this.uri = new Uri( uri );
-   };
-
-   this.getUri = function() {
-      return this.uri;
-   };
-
-   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.
- */
-function Person( name, email ) {
-   this.name = name;
-   if ( email != null ) {
-      this.email = new Email( email );
-   }
-   
-   this.setName = function( name ) {
-      this.name = name;
-   };
-
-   this.getName = function() {
-      return this.name;
-   };
-
-   this.setLang = function(lang) {
-      this.lang = lang;
-   };
-
-   this.getLang = function() {
-      return this.lang;
-   };
-
-   this.setEmail = function( email ) {
-      this.email = new Email( email );
-   };
-
-   this.getEmail = function() {
-      return this.email;
-   };
-
-   this.setUri = function( uri ) {
-      this.uri = new Uri( uri );
-   };
-
-   this.getUri = function() {
-      return this.uri;
-   };
-
-   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 = name;
-   this.uri = new Uri( uri );
-   
-   this.setName = function( name ) {
-      this.name = name;
-   };
-
-   this.getName = function() {
-      return this.name;
-   };
-
-   this.setVersion = function(version) {
-      this.version = version;
-   };
-
-   this.getVersion = function() {
-      return this.version;
-   };
-
-   this.setUri = function( uri ) {
-      this.uri = new Email( uri );
-   };
-
-   this.getUri = function() {
-      return this.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;
-   }
-}
-
-/**
- * Class that defines a Category object.
- *atomCategory =
- *     element atom:category {
- *        atomCommonAttributes,
- *        attribute term { text },
- *        attribute scheme { atomUri }?,
- *        attribute label { text }?,
- *        undefinedContent
- *     }
- */
-function Category( label, content ) {
-   this.label = label;
-   this.content = content;
-   
-   this.setLabel = function( label ) {
-      this.label = label;
-   };
-
-   this.getLabel = function() {
-      return this.label;
-   };
-
-   this.setLang = function(lang) {
-      this.lang = lang;
-   };
-
-   this.getLang = function() {
-      return this.lang;
-   };
-
-   this.setTerm = function(term) {
-      this.term = term;
-   };
-
-   this.getTerm = function() {
-      return this.term;
-   };
-
-   this.setScheme = function( scheme ) {
-      this.scheme = scheme;
-   };
-
-   this.getScheme = function() {
-      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, relation ) {
-   this.href = new Uri( href );
-   this.relation = relation;
-   
-   this.setHRef = function( uri ) {
-      this.href = new Uri( uri );
-   };
-
-   this.getHRef = function() {
-      return this.href;
-   };
-
-   this.setTitle = function( title ) {
-      this.title = title;
-   };
-
-   this.getTitle = function() {
-      return this.title;
-   };
-
-   this.setHRefLang = function(lang) {
-      this.hrefLang = lang;
-   };
-
-   this.getHRefLang = function() {
-      return this.hreflang;
-   };
-
-   this.setTitleLang = function(lang) {
-      this.titleLang = lang;
-   };
-
-   this.getTitleLang = function() {
-      return this.titleLang;
-   };
-   
-   this.setLength= function( length ) {
-      this.length= length;
-   };
-
-   this.getLength = function() {
-      return this.length;
-   };
-
-/*
-<static>  <final> String 	TYPE_ATOM
-          Link type used for Atom content.
-<static>  <final> String 	TYPE_HTML
-          Link type used for HTML content.
-*/          
-   this.setMimeType = function(mimeType) {
-      this.mimeType = mimeType;
-   };
-
-   this.getMimeType = function() {
-      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.
-<static>  <final> String 	REL_ENTRY_EDIT
-          Link that provides the URI that can be used to edit the entry.
-<static>  <final> String 	REL_MEDIA_EDIT
-          Link that provides the URI that can be used to edit the media associated with an entry.
-<static>  <final> String 	REL_NEXT
-          Link that provides the URI of next page in a paged feed.
-<static>  <final> String 	REL_PREVIOUS
-          Link that provides the URI of previous page in a paged feed.
-<static>  <final> String 	REL_RELATED
-          Link that provides the URI of a related link to the entry.
-<static>  <final> String 	REL_SELF
-          Link that provides the URI of the feed or entry.
-<static>  <final> String 	REL_VIA
-          Link that provides the URI that of link that provides the data for the content in the feed.
-*/          
-   this.setRelation = function( relation ) {
-      this.relation = relation;
-   };
-
-   this.getRelation = function() {
-      return this.relation;
-   };
-
-   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;
-   }
-   
-}          
-
-/**
- * Class that defines an Entry object.
- * atomEntry =
- *     element atom:entry {
- *        atomCommonAttributes,
- *        (atomAuthor*
- *         & atomCategory*
- *         & atomContent?
- *         & atomContributor*
- *         & atomId
- *         & atomLink*
- *         & atomPublished?
- *         & atomRights?
- *         & atomSource?
- *         & atomSummary?
- *         & atomTitle
- *         & atomUpdated
- *         & extensionElement*)
- *     } 
- */
-function Entry( init ) {
-   // Constructor code at bottom after function definition
-   
-   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;
-   };
-
-   this.getPublished = function() {
-      return this.published;
-   };
-
-   this.setUpdated = function( updated ) {
-      this.updated = updated;
-   };
-
-   this.getUpdated = function() {
-      return this.updated;
-   };
-
-   this.setRights = function( rights ) {
-      this.rights = rights;
-   }
-
-   this.getRights = function() {
-      return this.rights;
-   };
-
-   this.setSource = function( source ) {
-      this.source = source;
-   }
-
-   this.getSource = function() {
-      return this.source;
-   };
-
-   /* Type Text */
-   this.setTitle = function( title ) {
-      if (!((typeof title == "object") && (title instanceof Text)))
-         this.title = new Text( title, "text" );
-      else 
-         this.title = title;
-   }
-
-   this.getTitle = function() {
-      return this.title;
-   };
-
-   /* Type Text */
-   this.setSummary = function( summary ) {
-      if (!((typeof summary == "object") && (summary instanceof Text)))
-         this.summary = new Text( summary, "text" );
-      else
-         this.summary = summary;
-   }
-
-   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;
-   };
-
-   /**
-    * Add an author.
-    * @param name Author
-    */
-   this.addAuthor = function(person) {
-      if (!((typeof person == "object") && (person instanceof Person)))
-         error( "Entry author must be of type Person" );
-      var i = this.authors.length;
-      this.authors[ i ] = person; 
-   }
-   
-   /**
-    * Get an author.
-    * @param name Author
-    */
-   this.getAuthor = function(name) {
-      return this.authors[ name ];
-   }
-   
-   /**
-    * Set list of authors.
-    * @param name Author
-    */
-   this.setAuthors = function( authors ) {
-      return this.authors = authors;
-   }
-   
-   /**
-    * Get an author"pom.xml".
-    * @param name Author
-    */
-   this.getAuthors = function() {
-      return this.authors;
-   }
-   
-   /**
-    * Add an contributor.
-    * @param name Contributor
-    */
-   this.addContributor = function(person) {
-      if (!((typeof person == "object") && (person instanceof Person)))
-         error( "Entry contributor must be of type Person" );
-      var i = this.contributors.length;
-      this.contributors[ i ] = person;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Contributor
-    */
-   this.getContributor = function(name) {
-      return this.contributors[ name ];
-   }
-   
-   /**
-    * Set list of contributors
-    * @param name Author
-    */
-   this.setContributors = function( contributors ) {
-      return this.contributors = contributors;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Contributor
-    */
-   this.getContributors = function() {
-      return this.contributors;
-   }
-   
-   /**
-    * Add a category.
-    * @param name Category
-    */
-   this.addCategory = function(category) {
-      if (!((typeof category == "object") && (category instanceof Category)))
-         error( "Entry category must be of type Category" );
-      var i = this.categories.length
-      this.categories[ i ] = category;
-   }
-   
-   /**
-    * Get a names category.
-    * @param name Category
-    */
-   this.getCategory = function(name) {
-      return this.categories[ name ];
-   }
-   
-   /**
-    * Set list of categories
-    * @param name Author
-    */
-   this.setCategories = function( categories ) {
-      return this.categories = categories;
-   }
-   
-   /**
-    * Get all categories.
-    * @param name Category
-    */
-   this.getCategories = function() {
-      return this.categories;
-   }
-   
-   /**
-    * Add an link.
-    * @param name Link
-    */
-   this.addLink = function(link) {
-      if (!((typeof link == "object") && (link instanceof Link)))
-         error( "Entry link must be of type Link" );
-      var i = this.links.length;
-      this.links[ i ] = link;
-   }
-   
-   /**
-    * Get an link.
-    * @param name Link
-    */
-   this.getLink = function(name) {
-      return links[ name ];
-   }
-   
-   /**
-    * Set list of links.
-    * @param name Link
-    */
-   this.setLinks = function( links ) {
-      return this.links = links;
-   }
-   
-   /**
-    * Get an link.
-    * @param name Link
-    */
-   this.getLinks = function() {
-      return links;
-   }
-   
-   this.readFromXML = function( xml ) {
-      if (!((typeof xml == "object") && (xml instanceof string)))
-         error( "Entry xml must be of type string" );
-      // To Do - Read from arbutrary XML such as 
-      // <entry>
-      //   <title type="text">cart-item</title>
-      //   <content type="text">Apple - $ 2.99</content>
-      //   <id>cart-bd5323d6-1f59-4fae-a8f5-01f7654f1e77</id>
-      //   <link href="cart-bd5323d6-1f59-4fae-a8f5-01f7654f1e77" rel="edit"/>
-      //   <link href="cart-bd5323d6-1f59-4fae-a8f5-01f7654f1e77" rel="alternate"/>
-      //   <updated>2008-09-21T23:06:43.921Z</updated>
-      // </entry>
-      
-   }
-  this.readFromDoc = function( htmlDoc ) {
-      // Expect HTML collection.
-      var entryDoc = htmlDoc.getElementsByTagName("entry");
-      for (var i = 0; i < entryDoc.length; i++) {
-         this.readFromNode( entryDoc[ i ] );
-      }
-   }
-
-   this.readFromNode = function( entryNode ) {
-      // Expect entry node
-      var childNodes = entryNode.childNodes;
-      for ( var i = 0; i < childNodes.length; i++ ) {
-         var node = childNodes[ i ];
-         if (node.nodeType == 1 /*Node.ELEMENT_NODE*/) {
-            var tagName = node.tagName;
-            if (tagName == "title" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if ( type == undefined )
-                  type = "text";
-               var title = new Text( text, type );
-               this.setTitle( title );
-            } else if ( tagName == "subtitle" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if ( type == undefined )
-                  type = "text";
-               var title = new Text( text, type );
-               this.setSubtitle( title );
-            } else if ( tagName == "id" ) {
-               var id = new Id( getTextContent( node ) );
-               this.setId( id );
-            } else if ( tagName == "updated" ) {
-               var dateText = getTextContent( node );
-               var date = new Date( dateText ); // 2008-09-21T23:06:43.921Z
-               this.setUpdated( date );
-            } else if ( tagName == "link" ) {
-               // var href = node.attributes[ "href" ]; // Works on modern browsers.
-               var attrVal = node.getAttribute( "href" );
-               var link = new Link( attrVal );
-               attrVal = node.getAttribute( "rel" );
-               if ( attrVal )
-                  link.setRelation( attrVal );
-               this.addLink( link );
-            } else if ( tagName == "content" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if (type == undefined)
-                  type = "text";
-               var content = new Text( text, type );
-               this.setContent( content );
-            } else {
-               // To Do - implement rest of nodes
-			   error( "undefined element node" );
-            } 
-         } else if (node.nodeType == 2 /*Node.ATTRIBUTE_NODE*/) {
-            var attrName = node.tagName;
-         } else if (node.nodeType == 3 /*Node.TEXT_NODE*/) {
-         }
-      }      
-   }
-
-   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 */
-         this.readFromDoc( init );
-      } else {      
-         error( "Feed init unknown type" );
-      }
-   }  else if ( typeof init === 'string' ) {
-      this.setTitle( init );
-   }
-   this.namespace = "http://www.w3.org/2005/Atom";
-}
-
-/**
- * Class that defines an Feed object.
- *  atomFeed =
- *     element atom:feed {
- *        atomCommonAttributes,
- *        (atomAuthor*
- *         & atomCategory*
- *         & atomContributor*
- *         & atomGenerator?
- *         & atomIcon?
- *         & atomId
- *         & atomLink*
- *         & atomLogo?
- *         & atomRights?
- *         & atomSubtitle?
- *         & atomTitle
- *         & atomUpdated
- *         & extensionElement*),
- *        atomEntry* 
- */
-function Feed( init ) {
-   // See init after functions have been defined.
-
-   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;
-   };
-
-   this.getPublished = function() {
-      return this.published;
-   };
-
-   this.setUpdated = function( updated ) {
-      this.updated = updated;
-   };
-
-   this.getUpdated = function() {
-      return this.updated;
-   };
-
-   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)))
-         this.rights = new Text( rights, "text" );
-      else 
-         this.rights = rights;
-   }
-
-   this.getRights = function() {
-      return this.rights;
-   };
-
-   this.setSummary = function( summary ) {
-      if (!((typeof summary == "object") && (summary instanceof Text)))
-         error( "Feed summary must be of type Text" );
-      this.summary = summary;
-   }
-
-   this.getSummary = function() {
-      return this.summary;
-   };
-
-   this.setTitle = function( title ) {
-      if (!((typeof title == "object") && (title instanceof Text)))
-         this.title = new Text( title, "text" );
-      else 
-         this.title = title;
-   }
-
-   this.getTitle = function() {
-      return this.title;
-   };
-
-   this.setSubtitle = function( subtitle ) {
-      if (!((typeof subtitle == "object") && (subtitle instanceof Text)))
-         this.subtitle = new Text( subtitle, "text" );
-      else 
-         this.subtitle = subtitle;
-   }
-
-   this.getSubtitle = function() {
-      return this.subtitle;
-   };
-
-   /* Type Id */
-   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.setGenerator = function( generator ) {
-      if (!((typeof generator == "object") && (generator instanceof Generator)))
-         error( "Feed generator must be of type Generator" );
-      this.generator = generator;
-   }
-
-   this.getGenerator = function() {
-      return this.generator;
-   };
-
-   this.setBase = function( base ) {
-      this.base = base;
-   }
-
-   this.getBase = function() {
-      return this.base;
-   };
-
-   this.setLogo = function( logo ) {
-      this.logo = logo;
-   }
-
-   this.getLogo = function() {
-      return this.logo;
-   };
-
-   /**
-    * Add an author.
-    * @param name Author
-    */
-   this.addAuthor = function(person) {
-      if (!((typeof person == "object") && (person instanceof Person)))
-         error( "Entry author must be of type Person" );
-      var i = this.authors.length;
-      this.authors[ i ] = person;
-   }
-   
-   /**
-    * Get an author.
-    * @param name Author
-    */
-   this.getAuthor = function(name) {
-      return this.authors[ name ];
-   }
-   
-   /**
-    * Set list of authors.
-    * @param name Author
-    */
-   this.setAuthors = function( authors ) {
-      return this.authors = authors;
-   }
-   
-   /**
-    * Get an author.
-    * @param name Author
-    */
-   this.getAuthors = function() {
-      return this.authors;
-   }
-   
-   /**
-    * Add an contributor.
-    * @param name Contributor
-    */
-   this.addContributor = function(person) {
-      if (!((typeof person == "object") && (person instanceof Person)))
-         error( "Entry contributor must be of type Person" );
-      var i = this.contributors.length;
-      this.contributors[ i ] = person;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Contributor
-    */
-   this.getContributor = function(name) {
-      return this.contributors[ name ];
-   }
-   
-   /**
-    * Set list of contributors
-    * @param name Author
-    */
-   this.setContributors = function( contributors ) {
-      return this.contributors = contributors;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Contributor
-    */
-   this.getContributors = function() {
-      return this.contributors;
-   }
-   
-   /**
-    * Add a category.
-    * @param name Category
-    */
-   this.addCategory = function(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 a named contributor.
-    * @param name Category
-    */
-   this.getCategory = function(name) {
-      return this.categories[ name ];
-   }
-   
-   /**
-    * Set list of categories
-    * @param category
-    */
-   this.setCategories = function( categories ) {
-      return this.categories = categories;
-   }
-   
-   /**
-    * Get all categories.
-    * @param name Category
-    */
-   this.getCategories = function() {
-      return this.categories;
-   }
-   
-   /**
-    * Add an link.
-    * @param name Link
-    */
-   this.addLink = function(link) {
-      if (!((typeof link == "object") && (link instanceof Link)))
-         error( "Entry link must be of type Link" );
-      var i = this.links.length;
-      this.links[ i ] = link;
-   }
-   
-   /**
-    * Get an link.
-    * @param name Link
-    */
-   this.getLink = function(name) {
-      return this.links[ name ];
-   }
-   
-   /**
-    * Set list of links.
-    * @param name Link
-    */
-   this.setLinks = function( links ) {
-      return this.links = links;
-   }
-   
-   /**
-    * Get an link.
-    * @param name Link
-    */
-   this.getLinks = function() {
-      return this.links;
-   }
-   
-   /**
-    * Add an entry.
-    * @param name Entry
-    */
-   this.addEntry = function(entry) {
-      if (!((typeof entry == "object") && (entry instanceof Entry)))
-         error( "Entry entry must be of type Entry" );
-      var i = this.entries.length;
-      this.entries[ i ] = entry;
-   }
-   
-   /**
-    * Get an entry by name.
-    * @param name Entry
-    */
-   this.getEntry = function(name) {
-      return this.entries[ name ];
-   }
-   
-   /**
-    * Set list of entries
-    * @param name Author
-    */
-   this.setEntries = function( entries ) {
-      return this.entries = entries;
-   }
-   
-   /**
-    * Get an contributor.
-    * @param name Entry
-    */
-   this.getEntries = function() {
-      return this.entries;
-   }
-   
-   this.readFromXML = function( xml ) {
-      // To Do Read from arbitraty XML such as 
-      // <feed xmlns="http://www.w3.org/2005/Atom">
-      // <title type="text">shopping cart</title>
-      // <subtitle type="text">Total : $4.54</subtitle>
-      // <entry>
-      //    ...
-      // </entry>
-      // </feed>    
-   }
-
-   this.readFromDoc = function( htmlDoc ) {
-      // Expect HTML collection.
-      var feedDoc = htmlDoc.getElementsByTagName("feed");
-      for (var i = 0; i < feedDoc.length; i++) {
-         this.readFromNode( feedDoc[ i ] );
-      }
-   }
-   this.readFromNode = function( feedNode ) {
-      // Expect feed node
-      var childNodes = feedNode.childNodes;
-      for ( var i = 0; i < childNodes.length; i++ ) {
-         var node = childNodes[ i ];
-         if (node.nodeType == 1 /*Node.ELEMENT_NODE*/) {
-            var tagName = node.tagName;
-            if (tagName == "title" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if ( type == undefined )
-                  type = "text";
-               var title = new Text( text, type );
-               this.setTitle( title );
-            } else if ( tagName == "subtitle" ) {
-               var text = getTextContent( node );
-               var type = node.getAttribute( "type" );
-               if ( type == undefined )
-                  type = "text";
-               var title = new Text( text, type );
-               this.setSubtitle( title );
-            } else if ( tagName == "entry" ) {
-               var entry = new Entry();
-               entry.readFromNode( node );
-               this.addEntry( entry ); 
-            } else if ( tagName == "id" ) {
-               var id = new Id( getTextContent( node ) );
-               this.setId( id );
-            } else if ( tagName == "updated" ) {
-               var dateText = getTextContent( node );
-               var date = new Date( dateText ); //2008-09-21T23:06:53.750Z
-               this.setUpdated( date );
-            } else if ( tagName == "link" ) {
-               // var href = node.attributes[ "href" ]; // Works on modern browsers.
-               var attrVal = node.getAttribute( "href" );
-               var link = new Link( attrVal );
-               attrVal = node.getAttribute( "rel" );
-               if ( attrVal )
-                  link.setRelation( attrVal );
-               this.addLink( link );
-            } else {
-               // To Do - implement rest of nodes
-			   error( "undefined element node" );
-            } 
-         } else if (node.nodeType == 2 /*Node.ATTRIBUTE_NODE*/) {
-            var attrName = node.tagName;
-         } else if (node.nodeType == 3 /*Node.TEXT_NODE*/) {
-         }
-      }      
-   }
-
-   this.toString = function() {
-       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 */
-         this.readFromDoc( 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 ) {
-   alert( message );
-}
-
-/* Returns inner text on both IE and modern browsers. */
-function getTextContent(node) {
-   // innerText for IE, textContent for others, child text node, "" for others.
-   if ( node.innerText )
-      return node.innerText;
-   if ( node.textContent )
-      return node.textContent;
-   if ( node.hasChildNodes() ) {
-      var childNodes = node.childNodes
-      for ( var j = 0; j < childNodes.length; j++ ) {
-         var childNode = childNodes[ j ];
-         var childType = childNode.nodeType;
-         if (childNode.nodeType == 3 /*Node.TEXT_NODE*/) {
-            return childNode.nodeValue;
-         }
-      } 
-   }
-   return undefined;
-} 
\ No newline at end of file
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/store.html b/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/store.html
deleted file mode 100644
index 58f9f560a7..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/store.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!--

-    * 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>Store</TITLE>

-

-<!-- one js include per sca component -->

-<script type="text/javascript" src="store.js"></script>

-

-<script language="JavaScript">

-

-	//@Reference

-	var catalog = new Reference("Catalog");

-	

-	//@Reference

-	var shoppingCart = new Reference("ShoppingCart"); 
-	
-	//@Property
-	var locale = Property("locale");

-

-	function catalog_getResponse(items,exception) {

-		if(exception){

-			alert(exception.message);

-			return;

-		}

-		var catalog = "";

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

-			catalog += '<input name="items" type="checkbox" value="' + 

-						items[i] + '">' + items[i]+ ' <br>';

-		document.getElementById('catalog').innerHTML=catalog;

-	}

-	

-	function shoppingCart_getResponse(feed) {

-		if (feed != null) {

-			var entries = feed.getElementsByTagName("entry");              

-			var list = "";

-			for (var i=0; i<entries.length; i++) {

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

-				list += item + ' <br>';

-			}

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

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

-		}

-	}

-	function shoppingCart_postResponse(entry) {

-		shoppingCart.get("", shoppingCart_getResponse);

-	}				

-

-

-	function addToCart() {

-		var items  = document.catalogForm.items;

-		var j = 0;

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

-			if (items[i].checked) {

-				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;

-			}

-	}

-	function checkoutCart() {

-		document.getElementById('store').innerHTML='<h2>' +

-				'Thanks for Shopping With Us!</h2>'+

-				'<h2>Your Order</h2>'+

-				'<form name="orderForm" action="/ufs/store.html">'+

-					document.getElementById('shoppingCart').innerHTML+

-					'<br>'+

-					document.getElementById('total').innerHTML+

-					'<br>'+

-					'<br>'+

-					'<input type="submit" value="Continue Shopping">'+ 

-				'</form>';

-		shoppingCart.del("", null);

-	}

-	function deleteCart() {

-		shoppingCart.del("", null);

-		document.getElementById('shoppingCart').innerHTML = "";

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

-	}	

-
-    //alert(locale);

-	catalog.get(catalog_getResponse);

-	shoppingCart.get("", shoppingCart_getResponse);

-</script>

-

-</head>

-

-<body>

-<h1>Store</h1>

-  <div id="store">

-   	<h2>Catalog</h2>

-   	<form name="catalogForm">

-		<div id="catalog" ></div>

-		<br>

-		<input type="button" onClick="addToCart()"  value="Add to Cart">

-   	</form>

- 

- 	<br>

-  

-   	<h2>Your Shopping Cart</h2>

-   	<form name="shoppingCartForm">

-		<div id="shoppingCart"></div>

-		<br>

-		<div id="total"></div>

-		<br>		

-		<input type="button" onClick="checkoutCart()" value="Checkout"> 

-		<input type="button" onClick="deleteCart()" value="Empty">     

-	   	<a href="../ShoppingCart/">(feed)</a>

-	</form>    

-  </div>

-</body>

-</html>
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html b/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
deleted file mode 100644
index 6bbc285377..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!--

-    * 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>Store</TITLE>

-

-<!-- one js include per sca component -->

-<!-- For Atom, the Tuscany JavaScript client includes the 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="storeJS.js"></script>

-

-<script language="JavaScript">

-

-	//@Reference

-	var catalog = new Reference("Catalog");

-	

-	//@Reference

-	var shoppingCart = new Reference("ShoppingCart"); 
-	
-	//@Property
-	var locale = Property("locale");

-

-	function catalog_getResponse(items,exception) {

-		if(exception){

-			alert(exception.message);

-			return;

-		}

-		var catalog = "";

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

-			catalog += '<input name="items" type="checkbox" value="' + 

-						items[i] + '">' + items[i]+ ' <br>';

-		document.getElementById('catalog').innerHTML=catalog;

-	}

-	

-	function shoppingCart_getResponse(feedDoc) {

-	    // var xmlString = new XMLSerializer().serializeToString(feedDoc);

-	    // alert("shoppingCart_getResponse feed xml=" + xmlString);

-		var feed = new Feed( feedDoc );

-		

-		if (feed != null) {

-			// var entries = feed.getElementsByTagName("entry");

-			var entries = feed.getEntries();              

-			var list = "";

-			for (var i=0; i<entries.length; i++) {

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

-				var item = entries[ i ].getContent().getText();

-				list += item + ' <br>';

-			}

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

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

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

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

-		}

-	}

-	

-	function shoppingCart_postResponse(entry) {

-		shoppingCart.get("", shoppingCart_getResponse);

-	}				

-

-	function addToCart() {

-		var items  = document.catalogForm.items;

-		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;

-			}

-	}

-	

-	function checkoutCart() {

-		document.getElementById('store').innerHTML='<h2>' +

-				'Thanks for Shopping With Us!</h2>'+

-				'<h2>Your Order</h2>'+

-				'<form name="orderForm" action="/ufs/store.html">'+

-					document.getElementById('shoppingCart').innerHTML+

-					'<br>'+

-					document.getElementById('total').innerHTML+

-					'<br>'+

-					'<br>'+

-					'<input type="submit" value="Continue Shopping">'+ 

-				'</form>';

-		shoppingCart.del("", null);

-	}

-	function deleteCart() {

-		shoppingCart.del("", null);

-		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);

-</script>

-

-</head>

-

-<body>

-<h1>Store</h1>

-  <div id="store">

-   	<h2>Catalog</h2>

-   	<form name="catalogForm">

-		<div id="catalog" ></div>

-		<br>

-		<input type="button" onClick="addToCart()"  value="Add to Cart">

-   	</form>

- 

- 	<br>

-  

-   	<h2>Your Shopping Cart</h2>

-   	<form name="shoppingCartForm">

-		<div id="shoppingCart"></div>

-		<br>

-		<div id="total"></div>

-		<br>		

-		<input type="button" onClick="checkoutCart()" value="Checkout"> 

-		<input type="button" onClick="deleteCart()" value="Empty">     

-	   	<a href="../ShoppingCart/">(feed)</a>

-	</form>    

-  </div>

-</body>

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

-    * 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>
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widget.composite b/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widget.composite
deleted file mode 100644
index f23d6a20f5..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widget.composite
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * 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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/resource"
-	xmlns:sr="http://sample/resource"
-	name="resource">
-
-    <component name="store">
-        <tuscany:implementation.widget location="content/store.html"/>
-        <property name="locale">en</property>
-        <service name="Widget">
-        	<tuscany:binding.http uri="http://localhost:8085/store"/> 
-        </service>
-		<reference name="Catalog" target="Catalog">
-		 	<tuscany:binding.jsonrpc uri="http://localhost:8085/Catalog"/>
-		 </reference>
-		 <reference name="ShoppingCart" target="ShoppingCart">
-		 	<tuscany:binding.atom uri="http://localhost:8085/ShoppingCart"/>
-		 </reference>
-    </component>
-    
-    <component name="Catalog">
-		<implementation.java class="store.CatalogImpl"/> 
-		<service name="Catalog">
-			<tuscany:binding.jsonrpc uri="http://localhost:8085/Catalog"/>
-   		</service>
-	</component> 
-	
-	<component name="ShoppingCart">
-		<implementation.java class="store.ShoppingCartImpl"/>
-		<service name="Collection">
-			<tuscany:binding.atom uri="http://localhost:8085/ShoppingCart"/>
-		</service>    	
-	</component>
-
-</composite>
diff --git a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite b/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite
deleted file mode 100644
index e44a56e520..0000000000
--- a/java/sca-contrib/modules/implementation-widget-runtime/src/test/resources/widgetJS.composite
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * 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.    

--->

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-	targetNamespace="http://sample/resource"

-	xmlns:sr="http://sample/resource"

-	name="resource">

-

-    <component name="storeJS">

-    	<!-- Note: the store.html and storeJS.html clients are similar

-    		 except that store.html edits the client document using JavaScript

-    		 and many node queries, and storeJS.html uses the client Atom

-    		 JavaScript mode (fewer node queries and less XML knowledge needed.-->

-        <tuscany:implementation.widget location="content/storeJS.html"/>

-        <property name="locale">en</property>

-        <service name="Widget">

-        	<tuscany:binding.http uri="/storeJS"/> 

-        </service>

-		<reference name="Catalog" target="Catalog">

-		 	<tuscany:binding.jsonrpc uri="/Catalog"/>

-		 </reference>

-		 <reference name="ShoppingCart" target="ShoppingCart">

-		 	<tuscany:binding.atom uri="/ShoppingCart"/>

-		 </reference>

-    </component>

-    

-    <component name="Catalog">

-		<implementation.java class="store.CatalogImpl"/> 

-		<service name="Catalog">

-			<tuscany:binding.jsonrpc uri="/Catalog"/>

-   		</service>

-	</component> 

-	

-	<component name="ShoppingCart">

-		<implementation.java class="store.ShoppingCartImpl"/>

-		<service name="Collection">

-			<tuscany:binding.atom uri="/ShoppingCart"/>

-		</service>    	

-	</component>

-

-</composite>