perfsonar development work

Author: zurawski
Date: 2006-10-23 00:26:35 -0400 (Mon, 23 Oct 2006)
New Revision: 173

Modified:
   trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/CommonTime.java
   trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Data.java
   trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Datum.java
   trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Element.java
   trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/EventType.java
   trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Handler.java
   trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Key.java
   trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Message.java
   trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Metadata.java
   trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Parameter.java
   trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Parameters.java
   trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Store.java
   trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Subject.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/characteristic/utilization/v2_0/Parameters.java
   trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateAdmin.java
   trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateOper.java
   trunk/nmwg/java/org/ggf/ns/nmwg/result/v2_0/Datum.java
   trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/End.java
   trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Start.java
   trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Time.java
   trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Value.java
   trunk/nmwg/java/org/ggf/ns/nmwg/tools/bwctl/v2_0/Parameters.java
   trunk/nmwg/java/org/ggf/ns/nmwg/tools/iperf/v2_0/Parameters.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Datum.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Subject.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Datum.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Subject.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Datum.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Subject.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/AccessPoint.java
   trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Datum.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Service.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceDescription.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceName.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceType.java
   
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Subject.java
   trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/v1_0/Subject.java
   trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/v2_0/Parameters.java
   trunk/nmwg/java/org/ggf/ns/nmwg/tools/passivetracefile/v2_0/Parameters.java
   trunk/nmwg/java/org/ggf/ns/nmwg/tools/ping/v2_0/Parameters.java
   trunk/nmwg/java/org/ggf/ns/nmwg/tools/schedule/v2_0/Parameters.java
   trunk/nmwg/java/org/ggf/ns/nmwg/tools/traceroute/v2_0/Parameters.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Capacity.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/City.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Country.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cpu.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Description.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/GlobalName.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/HostName.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfDescription.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfIndex.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfName.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Index.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Institution.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Interface.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Latitude.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Link.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Location.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Longitude.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Name.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Network.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Node.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/OperSys.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Path.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Role.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Type.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Address.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/AuthRealm.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Capacity.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Description.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/GlobalName.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfHostName.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfIndex.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Index.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Interface.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Link.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Name.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Network.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Path.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Role.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Type.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Vlan.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Asn.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/AuthRealm.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Capacity.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/GlobalName.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfAddress.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfDescription.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfHostName.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfIndex.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfName.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Index.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Interface.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IpAddress.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Link.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Name.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Netmask.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Network.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Path.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Role.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Subnet.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Type.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Address.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPoint.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPointPair.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Path.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Role.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/AuthRealm.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Capacity.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/ClassOfService.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Direction.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Dst.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/EndPoint.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/EndPointPair.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/HostName.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfAddress.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfDescription.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfIndex.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfName.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Interface.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IpAddress.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Src.java
   trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Type.java
Log:
Library changes in accordance with the patch C?\195?\161ndido/Ulisses 
developed.  The 2nd part of the patch (extends issues 
within the Topology elements) is not included in this update.

-jason



Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/CommonTime.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/CommonTime.java   2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/CommonTime.java   2006-10-23 
04:26:35 UTC (rev 173)
@@ -16,14 +16,19 @@
  */
 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 {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Data.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Data.java 2006-09-22 12:55:58 
UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Data.java 2006-10-23 04:26:35 
UTC (rev 173)
@@ -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 {

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Datum.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Datum.java        2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Datum.java        2006-10-23 
04:26:35 UTC (rev 173)
@@ -12,13 +12,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.ggf.ns.nmwg.time.v2_0.Time;
+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.Time;
+
 public class Datum extends Element {
 
        /**

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Element.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Element.java      2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Element.java      2006-10-23 
04:26:35 UTC (rev 173)
@@ -16,8 +16,8 @@
 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.AttributesImpl;
 import org.xml.sax.helpers.NamespaceSupport;
 
 public class Element {

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/EventType.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/EventType.java    2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/EventType.java    2006-10-23 
04:26:35 UTC (rev 173)
@@ -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 {

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Handler.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Handler.java      2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Handler.java      2006-10-23 
04:26:35 UTC (rev 173)
@@ -7,43 +7,38 @@
  */
 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 java.io.FileOutputStream;
 
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.XMLSerializer;
+
 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.ContentHandler;
+
 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.*;
+import javax.xml.transform.Result;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
 
+import javax.xml.transform.stream.StreamResult;
+
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+
 public class Handler
        extends DefaultHandler {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Key.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Key.java  2006-09-22 12:55:58 
UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Key.java  2006-10-23 04:26:35 
UTC (rev 173)
@@ -14,9 +14,10 @@
  */
 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;
+import org.xml.sax.helpers.NamespaceSupport;
 
 public class Key extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Message.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Message.java      2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Message.java      2006-10-23 
04:26:35 UTC (rev 173)
@@ -14,10 +14,16 @@
  */
 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.xml.sax.helpers.NamespaceSupport;
 
 public class Message extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Metadata.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Metadata.java     2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Metadata.java     2006-10-23 
04:26:35 UTC (rev 173)
@@ -14,10 +14,16 @@
  */
 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.xml.sax.helpers.NamespaceSupport;
 
 public class Metadata extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Parameter.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Parameter.java    2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Parameter.java    2006-10-23 
04:26:35 UTC (rev 173)
@@ -11,10 +11,16 @@
  */
 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.xml.sax.helpers.NamespaceSupport;
 
 public class Parameter extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Parameters.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Parameters.java   2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Parameters.java   2006-10-23 
04:26:35 UTC (rev 173)
@@ -11,10 +11,14 @@
  */
 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.Vector;
 
-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 {

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Store.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Store.java        2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Store.java        2006-10-23 
04:26:35 UTC (rev 173)
@@ -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 {
                
        /**

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Subject.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Subject.java      2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/base/v2_0/Subject.java      2006-10-23 
04:26:35 UTC (rev 173)
@@ -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 {

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/characteristic/utilization/v2_0/Parameters.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/characteristic/utilization/v2_0/Parameters.java
     2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/characteristic/utilization/v2_0/Parameters.java
     2006-10-23 04:26:35 UTC (rev 173)
@@ -13,9 +13,14 @@
 
 import org.ggf.ns.nmwg.base.v2_0.Parameter;
 
-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 Parameters extends org.ggf.ns.nmwg.base.v2_0.Parameters {

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateAdmin.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateAdmin.java    
  2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateAdmin.java    
  2006-10-23 04:26:35 UTC (rev 173)
@@ -12,8 +12,14 @@
  */
 package org.ggf.ns.nmwg.event.status.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.Vector;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.helpers.AttributesImpl;
 import org.xml.sax.helpers.NamespaceSupport;
 import org.ggf.ns.nmwg.base.v2_0.*;
 

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateOper.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateOper.java     
  2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/event/status/base/v2_0/StateOper.java     
  2006-10-23 04:26:35 UTC (rev 173)
@@ -12,8 +12,14 @@
  */
 package org.ggf.ns.nmwg.event.status.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.Vector;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.helpers.AttributesImpl;
 import org.xml.sax.helpers.NamespaceSupport;
 import org.ggf.ns.nmwg.base.v2_0.*;
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/result/v2_0/Datum.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/result/v2_0/Datum.java      2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/result/v2_0/Datum.java      2006-10-23 
04:26:35 UTC (rev 173)
@@ -12,7 +12,12 @@
  */
 package org.ggf.ns.nmwg.result.v2_0;
 
-import java.util.*;
+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;

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/End.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/End.java  2006-09-22 12:55:58 
UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/End.java  2006-10-23 04:26:35 
UTC (rev 173)
@@ -11,11 +11,11 @@
  */
 package org.ggf.ns.nmwg.time.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;
 
 import org.ggf.ns.nmwg.base.v2_0.*;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class End extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Start.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Start.java        2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Start.java        2006-10-23 
04:26:35 UTC (rev 173)
@@ -11,11 +11,11 @@
  */
 package org.ggf.ns.nmwg.time.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;
 
 import org.ggf.ns.nmwg.base.v2_0.*;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Start extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Time.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Time.java 2006-09-22 12:55:58 
UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Time.java 2006-10-23 04:26:35 
UTC (rev 173)
@@ -15,11 +15,11 @@
  */
 package org.ggf.ns.nmwg.time.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;
 
 import org.ggf.ns.nmwg.base.v2_0.*;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Time extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Value.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Value.java        2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/time/v2_0/Value.java        2006-10-23 
04:26:35 UTC (rev 173)
@@ -14,11 +14,11 @@
  */
 package org.ggf.ns.nmwg.time.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Value extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/tools/bwctl/v2_0/Parameters.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/tools/bwctl/v2_0/Parameters.java    
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/tools/bwctl/v2_0/Parameters.java    
2006-10-23 04:26:35 UTC (rev 173)
@@ -13,9 +13,14 @@
 
 import org.ggf.ns.nmwg.base.v2_0.Parameter;
 
-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 Parameters extends org.ggf.ns.nmwg.base.v2_0.Parameters {

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/tools/iperf/v2_0/Parameters.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/tools/iperf/v2_0/Parameters.java    
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/tools/iperf/v2_0/Parameters.java    
2006-10-23 04:26:35 UTC (rev 173)
@@ -13,9 +13,14 @@
 
 import org.ggf.ns.nmwg.base.v2_0.Parameter;
 
-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 Parameters extends org.ggf.ns.nmwg.base.v2_0.Parameters {

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Datum.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Datum.java
      2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Datum.java
      2006-10-23 04:26:35 UTC (rev 173)
@@ -16,11 +16,11 @@
  */
 package org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.sql.v1_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;
 
 import org.ggf.ns.nmwg.base.v2_0.*;
-import org.xml.sax.helpers.NamespaceSupport;
 
 //import org.perfsonar.service.commons.logging.Log;
 import org.perfsonar.service.commons.exceptions.SystemException;

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Subject.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Subject.java
    2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/sql/v1_0/Subject.java
    2006-10-23 04:26:35 UTC (rev 173)
@@ -17,8 +17,8 @@
  */
 package org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.sql.v1_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;
 
 //import org.perfsonar.service.commons.logging.Log;

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Datum.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Datum.java
    2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Datum.java
    2006-10-23 04:26:35 UTC (rev 173)
@@ -16,8 +16,8 @@
  */
 package org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xpath.v1_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Subject.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Subject.java
  2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xpath/v1_0/Subject.java
  2006-10-23 04:26:35 UTC (rev 173)
@@ -17,8 +17,8 @@
  */
 package org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xpath.v1_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;
 
 //import org.perfsonar.service.commons.logging.Log;

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Datum.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Datum.java
   2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Datum.java
   2006-10-23 04:26:35 UTC (rev 173)
@@ -16,11 +16,10 @@
  */
 package org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xquery.v1_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.base.v2_0.Element;
 
 //import org.perfsonar.service.commons.logging.Log;
 import org.perfsonar.service.commons.exceptions.SystemException;

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Subject.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Subject.java
 2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/v1_0/Subject.java
 2006-10-23 04:26:35 UTC (rev 173)
@@ -17,8 +17,8 @@
  */
 package org.ggf.ns.nmwg.tools.org.perfsonar.service.lookup.xquery.v1_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;
 
 //import org.perfsonar.service.commons.logging.Log;

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/AccessPoint.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/AccessPoint.java
   2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/AccessPoint.java
   2006-10-23 04:26:35 UTC (rev 173)
@@ -14,11 +14,10 @@
  */
 package org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0;
 
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
-import org.ggf.ns.nmwg.base.v2_0.*;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.helpers.AttributesImpl;
 import org.xml.sax.helpers.NamespaceSupport;
+import org.ggf.ns.nmwg.base.v2_0.*;
 
 //import org.perfsonar.service.commons.logging.Log;
 import org.perfsonar.service.commons.exceptions.SystemException;

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Datum.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Datum.java 
2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Datum.java 
2006-10-23 04:26:35 UTC (rev 173)
@@ -16,11 +16,11 @@
  */
 package org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_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;
 
 import org.ggf.ns.nmwg.base.v2_0.*;
-import org.xml.sax.helpers.NamespaceSupport;
 
 //import org.perfsonar.service.commons.logging.Log;
 import org.perfsonar.service.commons.exceptions.SystemException;

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Service.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Service.java 
      2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Service.java 
      2006-10-23 04:26:35 UTC (rev 173)
@@ -20,11 +20,10 @@
  */
 package org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_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.base.v2_0.Element;
 
 //import org.perfsonar.service.commons.logging.Log;
 import org.perfsonar.service.commons.exceptions.SystemException;

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceDescription.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceDescription.java
    2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceDescription.java
    2006-10-23 04:26:35 UTC (rev 173)
@@ -14,11 +14,11 @@
  */
 package org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 //import org.perfsonar.service.commons.logging.Log;
 import org.perfsonar.service.commons.exceptions.SystemException;

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceName.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceName.java
   2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceName.java
   2006-10-23 04:26:35 UTC (rev 173)
@@ -14,11 +14,11 @@
  */
 package org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 //import org.perfsonar.service.commons.logging.Log;
 import org.perfsonar.service.commons.exceptions.SystemException;

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceType.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceType.java
   2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/ServiceType.java
   2006-10-23 04:26:35 UTC (rev 173)
@@ -14,11 +14,11 @@
  */
 package org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 //import org.perfsonar.service.commons.logging.Log;
 import org.perfsonar.service.commons.exceptions.SystemException;

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Subject.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Subject.java 
      2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/service/v1_0/Subject.java 
      2006-10-23 04:26:35 UTC (rev 173)
@@ -10,13 +10,13 @@
  */
 package org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_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;
 
 import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Service;
 import org.ggf.ns.nmwg.base.v2_0.Element;
 import org.ggf.ns.nmwg.topology.v2_0.Interface;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Subject extends org.ggf.ns.nmwg.base.v2_0.Subject {
 

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/v1_0/Subject.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/v1_0/Subject.java     
  2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/tools/org/perfsonar/v1_0/Subject.java     
  2006-10-23 04:26:35 UTC (rev 173)
@@ -10,13 +10,13 @@
  */
 package org.ggf.ns.nmwg.tools.org.perfsonar.v1_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;
 
 import org.ggf.ns.nmwg.tools.org.perfsonar.service.v1_0.Service;
 import org.ggf.ns.nmwg.base.v2_0.Element;
 import org.ggf.ns.nmwg.topology.v2_0.Interface;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Subject extends org.ggf.ns.nmwg.base.v2_0.Subject {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/v2_0/Parameters.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/v2_0/Parameters.java    
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/tools/owamp/v2_0/Parameters.java    
2006-10-23 04:26:35 UTC (rev 173)
@@ -13,9 +13,14 @@
 
 import org.ggf.ns.nmwg.base.v2_0.Parameter;
 
-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 Parameters extends org.ggf.ns.nmwg.base.v2_0.Parameters {

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/passivetracefile/v2_0/Parameters.java
===================================================================
--- 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/passivetracefile/v2_0/Parameters.java 
2006-09-22 12:55:58 UTC (rev 172)
+++ 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/passivetracefile/v2_0/Parameters.java 
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,9 +12,18 @@
 
 import org.ggf.ns.nmwg.base.v2_0.Parameter;
 
-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 java.util.Set;
+import java.util.HashSet;
+import java.util.Arrays;
+
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.helpers.AttributesImpl;
 import org.xml.sax.helpers.NamespaceSupport;
 
 public class Parameters extends org.ggf.ns.nmwg.base.v2_0.Parameters {

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/tools/ping/v2_0/Parameters.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/tools/ping/v2_0/Parameters.java     
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/tools/ping/v2_0/Parameters.java     
2006-10-23 04:26:35 UTC (rev 173)
@@ -13,9 +13,14 @@
 
 import org.ggf.ns.nmwg.base.v2_0.Parameter;
 
-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 Parameters extends org.ggf.ns.nmwg.base.v2_0.Parameters {

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/tools/schedule/v2_0/Parameters.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/tools/schedule/v2_0/Parameters.java 
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/tools/schedule/v2_0/Parameters.java 
2006-10-23 04:26:35 UTC (rev 173)
@@ -11,9 +11,14 @@
 
 import org.ggf.ns.nmwg.base.v2_0.Parameter;
 
-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 Parameters extends org.ggf.ns.nmwg.base.v2_0.Parameters {

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/tools/traceroute/v2_0/Parameters.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/tools/traceroute/v2_0/Parameters.java     
  2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/tools/traceroute/v2_0/Parameters.java     
  2006-10-23 04:26:35 UTC (rev 173)
@@ -13,9 +13,14 @@
 
 import org.ggf.ns.nmwg.base.v2_0.Parameter;
 
-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 Parameters extends org.ggf.ns.nmwg.base.v2_0.Parameters {

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Capacity.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Capacity.java    
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Capacity.java    
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Capacity extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/City.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/City.java        
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/City.java        
2006-10-23 04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class City extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Country.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Country.java     
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Country.java     
2006-10-23 04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Country extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cpu.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cpu.java 2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Cpu.java 2006-10-23 
04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Cpu extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Description.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Description.java 
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Description.java 
2006-10-23 04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Description extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/GlobalName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/GlobalName.java  
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/GlobalName.java  
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class GlobalName extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/HostName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/HostName.java    
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/HostName.java    
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class HostName extends Element {
 

Modified: 
trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfDescription.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfDescription.java     
  2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfDescription.java     
  2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IfDescription extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfIndex.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfIndex.java     
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfIndex.java     
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IfIndex extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfName.java      
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/IfName.java      
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IfName extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Index.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Index.java       
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Index.java       
2006-10-23 04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Index extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Institution.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Institution.java 
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Institution.java 
2006-10-23 04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Institution extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Interface.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Interface.java   
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Interface.java   
2006-10-23 04:26:35 UTC (rev 173)
@@ -17,11 +17,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Interface extends Element {
        

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Latitude.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Latitude.java    
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Latitude.java    
2006-10-23 04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Latitude extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Link.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Link.java        
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Link.java        
2006-10-23 04:26:35 UTC (rev 173)
@@ -17,13 +17,18 @@
  */
 package org.ggf.ns.nmwg.topology.base.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 java.util.Vector;
 
-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.base.v2_0.Element;
+
 public class Link extends Element {
 
        /**

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Location.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Location.java    
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Location.java    
2006-10-23 04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Location extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Longitude.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Longitude.java   
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Longitude.java   
2006-10-23 04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Longitude extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Name.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Name.java        
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Name.java        
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Name extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Network.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Network.java     
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Network.java     
2006-10-23 04:26:35 UTC (rev 173)
@@ -15,13 +15,18 @@
  */
 package org.ggf.ns.nmwg.topology.base.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 java.util.Vector;
 
-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.base.v2_0.Element;
+
 public class Network extends Element {
 
        /**

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Node.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Node.java        
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Node.java        
2006-10-23 04:26:35 UTC (rev 173)
@@ -24,13 +24,18 @@
  */
 package org.ggf.ns.nmwg.topology.base.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 java.util.Vector;
 
-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.base.v2_0.Element;
+
 public class Node extends Element {
        
        /**

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/OperSys.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/OperSys.java     
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/OperSys.java     
2006-10-23 04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class OperSys extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Path.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Path.java        
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Path.java        
2006-10-23 04:26:35 UTC (rev 173)
@@ -11,13 +11,18 @@
  */
 package org.ggf.ns.nmwg.topology.base.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 java.util.Vector;
 
-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.base.v2_0.Element;
+
 public class Path extends Element {
        
        /**

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Role.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Role.java        
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Role.java        
2006-10-23 04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Role extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Type.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Type.java        
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/base/v3_0/Type.java        
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.base.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Type extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Address.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Address.java       
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Address.java       
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l2.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Address extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/AuthRealm.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/AuthRealm.java     
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/AuthRealm.java     
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l2.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class AuthRealm extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Capacity.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Capacity.java      
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Capacity.java      
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l2.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Capacity extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Description.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Description.java   
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Description.java   
2006-10-23 04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.l2.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Description extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/GlobalName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/GlobalName.java    
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/GlobalName.java    
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l2.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class GlobalName extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfHostName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfHostName.java    
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfHostName.java    
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l2.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IfHostName extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfIndex.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfIndex.java       
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/IfIndex.java       
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l2.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IfIndex extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Index.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Index.java 2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Index.java 2006-10-23 
04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.l2.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Index extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Interface.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Interface.java     
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Interface.java     
2006-10-23 04:26:35 UTC (rev 173)
@@ -18,12 +18,11 @@
  */
 package org.ggf.ns.nmwg.topology.l2.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.base.v2_0.Element;
 import org.ggf.ns.nmwg.topology.base.v3_0.Node;
 
 public class Interface extends Element {

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Link.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Link.java  2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Link.java  2006-10-23 
04:26:35 UTC (rev 173)
@@ -18,13 +18,17 @@
  */
 package org.ggf.ns.nmwg.topology.l2.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 java.util.Vector;
 
-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.base.v2_0.Element;
 import org.ggf.ns.nmwg.topology.base.v3_0.Node;
 
 public class Link extends Element {

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Name.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Name.java  2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Name.java  2006-10-23 
04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l2.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Name extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Network.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Network.java       
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Network.java       
2006-10-23 04:26:35 UTC (rev 173)
@@ -16,13 +16,17 @@
  */
 package org.ggf.ns.nmwg.topology.l2.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 java.util.Vector;
 
-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.base.v2_0.Element;
 import org.ggf.ns.nmwg.topology.base.v3_0.Node;
 
 public class Network extends Element {

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Path.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Path.java  2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Path.java  2006-10-23 
04:26:35 UTC (rev 173)
@@ -11,13 +11,18 @@
  */
 package org.ggf.ns.nmwg.topology.l2.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 java.util.Vector;
 
-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.base.v2_0.Element;
+
 public class Path extends Element {
        
        /**

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Role.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Role.java  2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Role.java  2006-10-23 
04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.l2.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Role extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Type.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Type.java  2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Type.java  2006-10-23 
04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l2.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Type extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Vlan.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Vlan.java  2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l2/v3_0/Vlan.java  2006-10-23 
04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.l2.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Vlan extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Asn.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Asn.java   2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Asn.java   2006-10-23 
04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Asn extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/AuthRealm.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/AuthRealm.java     
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/AuthRealm.java     
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class AuthRealm extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Capacity.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Capacity.java      
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Capacity.java      
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Capacity extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/GlobalName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/GlobalName.java    
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/GlobalName.java    
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class GlobalName extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfAddress.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfAddress.java     
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfAddress.java     
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IfAddress extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfDescription.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfDescription.java 
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfDescription.java 
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IfDescription extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfHostName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfHostName.java    
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfHostName.java    
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IfHostName extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfIndex.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfIndex.java       
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfIndex.java       
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IfIndex extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfName.java        
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IfName.java        
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IfName extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Index.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Index.java 2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Index.java 2006-10-23 
04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Index extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Interface.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Interface.java     
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Interface.java     
2006-10-23 04:26:35 UTC (rev 173)
@@ -19,11 +19,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 import org.ggf.ns.nmwg.topology.base.v3_0.Node;
 
@@ -264,7 +264,7 @@
                else if(newChild.getLocalName().equals("capacity")) {         
          
                        setCapacityElement((Capacity)newChild);
                }
-               else if(newChild.getLocalName().equals("network")) {          
          
+               else if(newChild.getLocalName().equals("netmask")) {          
          
                        setNetmaskElement((Netmask)newChild);
                }
                else if(newChild.getLocalName().equals("ipAddress")) {        
          

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IpAddress.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IpAddress.java     
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/IpAddress.java     
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IpAddress extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Link.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Link.java  2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Link.java  2006-10-23 
04:26:35 UTC (rev 173)
@@ -18,13 +18,18 @@
  */
 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 java.util.Vector;
 
-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.base.v2_0.Element;
+
 import org.ggf.ns.nmwg.topology.base.v3_0.Node;
 
 public class Link extends Element {

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Name.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Name.java  2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Name.java  2006-10-23 
04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Name extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Netmask.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Netmask.java       
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Netmask.java       
2006-10-23 04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Netmask extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Network.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Network.java       
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Network.java       
2006-10-23 04:26:35 UTC (rev 173)
@@ -15,13 +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 java.util.Vector;
 
-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.base.v2_0.Element;
 import org.ggf.ns.nmwg.topology.base.v3_0.Node;
 
 public class Network extends Element {

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Path.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Path.java  2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Path.java  2006-10-23 
04:26:35 UTC (rev 173)
@@ -11,13 +11,18 @@
  */
 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 java.util.Vector;
 
-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.base.v2_0.Element;
+
 public class Path extends Element {
        
        /**

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Role.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Role.java  2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Role.java  2006-10-23 
04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Role extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Subnet.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Subnet.java        
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Subnet.java        
2006-10-23 04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Subnet extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Type.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Type.java  2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l3/v3_0/Type.java  2006-10-23 
04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l3.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Type extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Address.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Address.java       
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Address.java       
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.l4.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Address extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPoint.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPoint.java      
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPoint.java      
2006-10-23 04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.l4.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 import org.ggf.ns.nmwg.topology.l3.v3_0.Interface;
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPointPair.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPointPair.java  
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/EndPointPair.java  
2006-10-23 04:26:35 UTC (rev 173)
@@ -11,11 +11,11 @@
  */
 package org.ggf.ns.nmwg.topology.l4.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class EndPointPair extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Path.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Path.java  2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Path.java  2006-10-23 
04:26:35 UTC (rev 173)
@@ -11,13 +11,18 @@
  */
 package org.ggf.ns.nmwg.topology.l4.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 java.util.Vector;
 
-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.base.v2_0.Element;
+
 public class Path extends Element {
        
        /**

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Role.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Role.java  2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/l4/v3_0/Role.java  2006-10-23 
04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.l4.v3_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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Role extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/AuthRealm.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/AuthRealm.java        
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/AuthRealm.java        
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class AuthRealm extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Capacity.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Capacity.java 2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Capacity.java 2006-10-23 
04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Capacity extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/ClassOfService.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/ClassOfService.java   
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/ClassOfService.java   
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class ClassOfService extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Direction.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Direction.java        
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Direction.java        
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,12 +12,13 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
+
 public class Direction extends Element {
 
        /**

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Dst.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Dst.java      2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Dst.java      2006-10-23 
04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Dst extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/EndPoint.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/EndPoint.java 2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/EndPoint.java 2006-10-23 
04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class EndPoint extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/EndPointPair.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/EndPointPair.java     
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/EndPointPair.java     
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class EndPointPair extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/HostName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/HostName.java 2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/HostName.java 2006-10-23 
04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class HostName extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfAddress.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfAddress.java        
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfAddress.java        
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,12 +12,13 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
+
 public class IfAddress extends Element {
 
        /**

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfDescription.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfDescription.java    
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfDescription.java    
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IfDescription extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfIndex.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfIndex.java  2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfIndex.java  2006-10-23 
04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IfIndex extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfName.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfName.java   2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IfName.java   2006-10-23 
04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IfName extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Interface.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Interface.java        
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Interface.java        
2006-10-23 04:26:35 UTC (rev 173)
@@ -21,11 +21,11 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Interface extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IpAddress.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IpAddress.java        
2006-09-22 12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/IpAddress.java        
2006-10-23 04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class IpAddress extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Src.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Src.java      2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Src.java      2006-10-23 
04:26:35 UTC (rev 173)
@@ -10,11 +10,11 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Src extends Element {
 

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Type.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Type.java     2006-09-22 
12:55:58 UTC (rev 172)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/topology/v2_0/Type.java     2006-10-23 
04:26:35 UTC (rev 173)
@@ -12,11 +12,11 @@
  */
 package org.ggf.ns.nmwg.topology.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;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.xml.sax.helpers.NamespaceSupport;
 
 public class Type extends Element {