perfsonar development work

[Nicolas Simar <>]

Well done to you! :-)

Cheers,
Nicolas

ulisses wrote:
> Hi all
>
> Cándido (Cica/RedIRIS) has found the problem that I was 
> experiencing from many time ago when converting 
> the topology service output to DOM.
>
> I attach the patch that Cándido made to fix it. Please take 
> a look at it.
>
> Cándido also noticed that the method for generating the
> ASCII version of the XML document is different that the one
> when converting TO DOM. As far as I understnand, this means 
> that service developers can't be sure if the XML document
> is being generated correctly when delivering it to the
> perfsonar framework, and hence the debugging is much more
> difficult.
>
> It's a luck Cándido helped with his expertise. Thanks Cándido.
>
> regards
>
>         Ulisses
>
>
> ------------------------------------------------------------------------
>
> Index: ns/nmwg/base/v2_0/Subject.java
> ===================================================================
> --- ns/nmwg/base/v2_0/Subject.java      (revision 172)
> +++ ns/nmwg/base/v2_0/Subject.java      (working copy)
> @@ -10,9 +10,14 @@
>   */
>  package org.ggf.ns.nmwg.base.v2_0;
>  
> -import java.util.*;
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> +import java.util.Collection;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.Map;
> +import java.util.Vector;
> +
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Subject extends Element {
> Index: ns/nmwg/base/v2_0/Parameters.java
> ===================================================================
> --- ns/nmwg/base/v2_0/Parameters.java   (revision 172)
> +++ ns/nmwg/base/v2_0/Parameters.java   (working copy)
> @@ -11,10 +11,13 @@
>   */
>  package org.ggf.ns.nmwg.base.v2_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> +import java.util.Collection;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.Map;
>  
> -import java.util.*;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Parameters extends Element {
> Index: ns/nmwg/base/v2_0/CommonTime.java
> ===================================================================
> --- ns/nmwg/base/v2_0/CommonTime.java   (revision 172)
> +++ ns/nmwg/base/v2_0/CommonTime.java   (working copy)
> @@ -16,14 +16,18 @@
>   */
>  package org.ggf.ns.nmwg.base.v2_0;
>  
> -import java.util.*;
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> +import java.util.Collection;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.Map;
> +import java.util.Vector;
>  
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
> +import org.xml.sax.helpers.NamespaceSupport;
>  import org.ggf.ns.nmwg.time.v2_0.Start;
>  import org.ggf.ns.nmwg.time.v2_0.End;
>  import org.ggf.ns.nmwg.time.v2_0.Value;
> -import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class CommonTime extends Element {
>  
> Index: ns/nmwg/base/v2_0/Data.java
> ===================================================================
> --- ns/nmwg/base/v2_0/Data.java (revision 172)
> +++ ns/nmwg/base/v2_0/Data.java (working copy)
> @@ -17,9 +17,14 @@
>   */
>  package org.ggf.ns.nmwg.base.v2_0;
>  
> -import java.util.*;
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> +import java.util.Collection;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.Map;
> +import java.util.Vector;
> +
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Data extends Element {
> Index: ns/nmwg/base/v2_0/Datum.java
> ===================================================================
> --- ns/nmwg/base/v2_0/Datum.java        (revision 172)
> +++ ns/nmwg/base/v2_0/Datum.java        (working copy)
> @@ -12,11 +12,15 @@
>   */
>  package org.ggf.ns.nmwg.base.v2_0;
>  
> -import java.util.*;
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> +import java.util.Collection;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.Map;
> +import java.util.Vector;
>  
>  import org.ggf.ns.nmwg.time.v2_0.Time;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Datum extends Element {
> Index: ns/nmwg/base/v2_0/Handler.java
> ===================================================================
> --- ns/nmwg/base/v2_0/Handler.java      (revision 172)
> +++ ns/nmwg/base/v2_0/Handler.java      (working copy)
> @@ -7,43 +7,17 @@
>   */
>  package org.ggf.ns.nmwg.base.v2_0;
>  
> -import java.io.OutputStream;
> -import java.io.OutputStreamWriter;
> -import java.io.PrintWriter;
> -import java.io.Writer;
> -import java.io.*;
> -
>  import org.xml.sax.Attributes;
> -import org.xml.sax.Locator;
>  import org.xml.sax.SAXException;
> -import org.xml.sax.SAXNotRecognizedException;
> -import org.xml.sax.SAXNotSupportedException;
>  import org.xml.sax.SAXParseException;
>  import org.xml.sax.XMLReader;
>  import org.xml.sax.helpers.XMLReaderFactory;
>  import org.xml.sax.helpers.DefaultHandler;
>  import org.xml.sax.helpers.NamespaceSupport;
> -import org.xml.sax.helpers.ParserAdapter;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -import org.apache.xml.serialize.*;
> -
>  import java.util.Hashtable;
>  import java.util.Stack;
>  
> -import org.w3c.dom.Document;
> -import javax.xml.parsers.DocumentBuilder;
> -import javax.xml.parsers.DocumentBuilderFactory;
> -import org.w3c.dom.NodeList;
> -import org.w3c.dom.Node;
> -
> -import org.w3c.dom.*;
> -import javax.xml.parsers.*;
> -import javax.xml.transform.*;
> -import javax.xml.transform.dom.*;
> -import javax.xml.transform.stream.*;
> -
>  public class Handler
>         extends DefaultHandler {
>  
> Index: ns/nmwg/base/v2_0/Metadata.java
> ===================================================================
> --- ns/nmwg/base/v2_0/Metadata.java     (revision 172)
> +++ ns/nmwg/base/v2_0/Metadata.java     (working copy)
> @@ -14,9 +14,14 @@
>   */
>  package org.ggf.ns.nmwg.base.v2_0;
>  
> -import java.util.*;
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> +import java.util.Collection;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.Map;
> +import java.util.Vector;
> +
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Metadata extends Element {
> Index: ns/nmwg/base/v2_0/Parameter.java
> ===================================================================
> --- ns/nmwg/base/v2_0/Parameter.java    (revision 172)
> +++ ns/nmwg/base/v2_0/Parameter.java    (working copy)
> @@ -11,9 +11,14 @@
>   */
>  package org.ggf.ns.nmwg.base.v2_0;
>  
> -import java.util.*;
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> +import java.util.Collection;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.Map;
> +import java.util.Vector;
> +
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Parameter extends Element {
> Index: ns/nmwg/base/v2_0/EventType.java
> ===================================================================
> --- ns/nmwg/base/v2_0/EventType.java    (revision 172)
> +++ ns/nmwg/base/v2_0/EventType.java    (working copy)
> @@ -14,8 +14,8 @@
>   */
>  package org.ggf.ns.nmwg.base.v2_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class EventType extends Element {
> Index: ns/nmwg/base/v2_0/Message.java
> ===================================================================
> --- ns/nmwg/base/v2_0/Message.java      (revision 172)
> +++ ns/nmwg/base/v2_0/Message.java      (working copy)
> @@ -14,9 +14,13 @@
>   */
>  package org.ggf.ns.nmwg.base.v2_0;
>  
> -import java.util.*;
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> +import java.util.Collection;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.Map;
> +
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Message extends Element {
> Index: ns/nmwg/base/v2_0/Key.java
> ===================================================================
> --- ns/nmwg/base/v2_0/Key.java  (revision 172)
> +++ ns/nmwg/base/v2_0/Key.java  (working copy)
> @@ -14,8 +14,8 @@
>   */
>  package org.ggf.ns.nmwg.base.v2_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Key extends Element {
> Index: ns/nmwg/base/v2_0/Element.java
> ===================================================================
> --- ns/nmwg/base/v2_0/Element.java      (revision 172)
> +++ ns/nmwg/base/v2_0/Element.java      (working copy)
> @@ -14,10 +14,8 @@
>  
>  import java.net.InetAddress;
>  import java.net.UnknownHostException;
> -import java.rmi.server.UID;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> +import org.xml.sax.ContentHandler;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Element {
> Index: ns/nmwg/base/v2_0/Store.java
> ===================================================================
> --- ns/nmwg/base/v2_0/Store.java        (revision 172)
> +++ ns/nmwg/base/v2_0/Store.java        (working copy)
> @@ -8,11 +8,6 @@
>   */
>  package org.ggf.ns.nmwg.base.v2_0;
>  
> -import java.util.*;
> -
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  public class Store extends Message {
>                 
>         /**
> Index: ns/nmwg/topology/l3/v3_0/IfName.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/IfName.java        (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/IfName.java        (working copy)
> @@ -12,10 +12,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class IfName extends Element {
> Index: ns/nmwg/topology/l3/v3_0/Interface.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/Interface.java     (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/Interface.java     (working copy)
> @@ -19,14 +19,11 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
> -import org.ggf.ns.nmwg.topology.base.v3_0.Node;
> -
>  public class Interface extends Element {
>         
>         /**
> Index: ns/nmwg/topology/l3/v3_0/Subnet.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/Subnet.java        (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/Subnet.java        (working copy)
> @@ -10,10 +10,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Subnet extends Element {
> Index: ns/nmwg/topology/l3/v3_0/GlobalName.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/GlobalName.java    (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/GlobalName.java    (working copy)
> @@ -12,10 +12,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class GlobalName extends Element {
> Index: ns/nmwg/topology/l3/v3_0/Role.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/Role.java  (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/Role.java  (working copy)
> @@ -10,10 +10,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Role extends Element {
> Index: ns/nmwg/topology/l3/v3_0/Netmask.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/Netmask.java       (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/Netmask.java       (working copy)
> @@ -10,10 +10,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Netmask extends Element {
> Index: ns/nmwg/topology/l3/v3_0/IfDescription.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/IfDescription.java (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/IfDescription.java (working copy)
> @@ -12,10 +12,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class IfDescription extends Element {
> Index: ns/nmwg/topology/l3/v3_0/IfAddress.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/IfAddress.java     (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/IfAddress.java     (working copy)
> @@ -12,10 +12,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class IfAddress extends Element {
> Index: ns/nmwg/topology/l3/v3_0/Index.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/Index.java (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/Index.java (working copy)
> @@ -10,10 +10,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Index extends Element {
> Index: ns/nmwg/topology/l3/v3_0/IpAddress.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/IpAddress.java     (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/IpAddress.java     (working copy)
> @@ -12,10 +12,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class IpAddress extends Element {
> Index: ns/nmwg/topology/l3/v3_0/Name.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/Name.java  (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/Name.java  (working copy)
> @@ -12,10 +12,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Name extends Element {
> Index: ns/nmwg/topology/l3/v3_0/Asn.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/Asn.java   (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/Asn.java   (working copy)
> @@ -10,10 +10,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Asn extends Element {
> Index: ns/nmwg/topology/l3/v3_0/Type.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/Type.java  (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/Type.java  (working copy)
> @@ -12,10 +12,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Type extends Element {
> Index: ns/nmwg/topology/l3/v3_0/AuthRealm.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/AuthRealm.java     (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/AuthRealm.java     (working copy)
> @@ -12,10 +12,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class AuthRealm extends Element {
> Index: ns/nmwg/topology/l3/v3_0/IfIndex.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/IfIndex.java       (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/IfIndex.java       (working copy)
> @@ -12,10 +12,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class IfIndex extends Element {
> Index: ns/nmwg/topology/l3/v3_0/Network.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/Network.java       (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/Network.java       (working copy)
> @@ -15,15 +15,17 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import java.util.*;
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> +import java.util.Collection;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.Map;
>  
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.ggf.ns.nmwg.topology.base.v3_0.Node;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
> -import org.ggf.ns.nmwg.topology.base.v3_0.Node;
> -
>  public class Network extends Element {
>  
>  	/**
> Index: ns/nmwg/topology/l3/v3_0/Path.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/Path.java  (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/Path.java  (working copy)
> @@ -11,11 +11,14 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import java.util.*;
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> +import java.util.Collection;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.Map;
>  
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Path extends Element {
> Index: ns/nmwg/topology/l3/v3_0/Link.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/Link.java  (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/Link.java  (working copy)
> @@ -18,15 +18,17 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import java.util.*;
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> +import java.util.Collection;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.Map;
>  
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.ggf.ns.nmwg.topology.base.v3_0.Node;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
> -import org.ggf.ns.nmwg.topology.base.v3_0.Node;
> -
>  public class Link extends Element {
>  
>  	/**
> @@ -92,6 +94,7 @@
>                                 
>                 uri = "http://ggf.org/ns/nmwg/topology/l3/3.0/";;
>                 qName = "nmwgtopo3:link";     
> +               localName = "link";
>                 prefix = "nmwgtopo3"; 
>                 fileName = "org/ggf/ns/nmwg/topology/l3/v3_0/Link.java";      
>         }
> Index: ns/nmwg/topology/l3/v3_0/IfHostName.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/IfHostName.java    (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/IfHostName.java    (working copy)
> @@ -12,10 +12,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class IfHostName extends Element {
> Index: ns/nmwg/topology/l3/v3_0/Capacity.java
> ===================================================================
> --- ns/nmwg/topology/l3/v3_0/Capacity.java      (revision 172)
> +++ ns/nmwg/topology/l3/v3_0/Capacity.java      (working copy)
> @@ -12,10 +12,9 @@
>   */
>  package org.ggf.ns.nmwg.topology.l3.v3_0;
>  
> -import org.xml.sax.*;
> -import org.xml.sax.helpers.*;
> -
>  import org.ggf.ns.nmwg.base.v2_0.Element;
> +import org.xml.sax.ContentHandler;
> +import org.xml.sax.helpers.AttributesImpl;
>  import org.xml.sax.helpers.NamespaceSupport;
>  
>  public class Capacity extends Element {

--
Nicolas
______________________________________________________________________

Nicolas Simar
Network Engineer

DANTE - www.dante.net

Tel - BE: +32 (0) 4 366 93 49
Tel - UK: +44 (0)1223 371 300
Mobile: +44 (0) 7740 176 883

City House, 126-130 Hills Road
Cambridge CB2 1PQ
UK
_____________________________________________________________________