Index: org/apache/juddi/handler/BusinessEntityHandler.java
===================================================================
RCS file: /home/cvspublic/ws-juddi/src/java/org/apache/juddi/handler/BusinessEntityHandler.java,v
retrieving revision 1.3
diff -u -r1.3 BusinessEntityHandler.java
--- org/apache/juddi/handler/BusinessEntityHandler.java	6 Feb 2005 02:52:07 -0000	1.3
+++ org/apache/juddi/handler/BusinessEntityHandler.java	14 Feb 2005 10:08:35 -0000
@@ -185,15 +185,16 @@
       handler.marshal(services,element);
     }
 
+    // Only output IdentifierBag and CategoryBag if there is something inside
     IdentifierBag identifierBag = business.getIdentifierBag();
-    if (identifierBag != null)
+    if ((identifierBag != null) && (identifierBag.getKeyedReferenceVector() != null) && (!identifierBag.getKeyedReferenceVector().isEmpty()))
     {
       handler = maker.lookup(IdentifierBagHandler.TAG_NAME);
       handler.marshal(identifierBag,element);
     }
 
     CategoryBag categoryBag = business.getCategoryBag();
-    if (categoryBag != null)
+    if ((categoryBag != null) && (categoryBag.getKeyedReferenceVector() != null) && (!categoryBag.getKeyedReferenceVector().isEmpty()))
     {
       handler = maker.lookup(CategoryBagHandler.TAG_NAME);
       handler.marshal(categoryBag,element);
Index: org/apache/juddi/handler/BusinessServiceHandler.java
===================================================================
RCS file: /home/cvspublic/ws-juddi/src/java/org/apache/juddi/handler/BusinessServiceHandler.java,v
retrieving revision 1.3
diff -u -r1.3 BusinessServiceHandler.java
--- org/apache/juddi/handler/BusinessServiceHandler.java	6 Feb 2005 02:52:07 -0000	1.3
+++ org/apache/juddi/handler/BusinessServiceHandler.java	14 Feb 2005 10:08:35 -0000
@@ -132,8 +132,9 @@
       handler.marshal(bindings,element);
     }
 
+    // Only output CategoryBag if there is something inside
     CategoryBag categoryBag = service.getCategoryBag();
-    if (categoryBag != null)
+    if ((categoryBag != null) && (categoryBag.getKeyedReferenceVector() != null) && (!categoryBag.getKeyedReferenceVector().isEmpty()))
     {
       handler = maker.lookup(CategoryBagHandler.TAG_NAME);
       handler.marshal(categoryBag,element);
Index: org/apache/juddi/handler/OverviewDocHandler.java
===================================================================
RCS file: /home/cvspublic/ws-juddi/src/java/org/apache/juddi/handler/OverviewDocHandler.java,v
retrieving revision 1.4
diff -u -r1.4 OverviewDocHandler.java
--- org/apache/juddi/handler/OverviewDocHandler.java	6 Feb 2005 19:29:23 -0000	1.4
+++ org/apache/juddi/handler/OverviewDocHandler.java	14 Feb 2005 10:08:35 -0000
@@ -77,13 +77,7 @@
     Element element = parent.getOwnerDocument().createElementNS(null,TAG_NAME);
     AbstractHandler handler = null;
 
-    OverviewURL overURL = overDoc.getOverviewURL();
-    if (overURL != null)
-    {
-      handler = maker.lookup(OverviewURLHandler.TAG_NAME);
-      handler.marshal(overURL,element);
-    }
-
+    // switch description/overviewURL place to be uddi v2 schema compliant
     Vector descrVector = overDoc.getDescriptionVector();
     if ((descrVector!=null) && (descrVector.size() > 0))
     {
@@ -92,6 +86,13 @@
         handler.marshal((Description)descrVector.elementAt(i),element);
     }
 
+    OverviewURL overURL = overDoc.getOverviewURL();
+    if (overURL != null)
+    {
+      handler = maker.lookup(OverviewURLHandler.TAG_NAME);
+      handler.marshal(overURL,element);
+    }
+
     parent.appendChild(element);
   }
 
Index: org/apache/juddi/handler/TModelHandler.java
===================================================================
RCS file: /home/cvspublic/ws-juddi/src/java/org/apache/juddi/handler/TModelHandler.java,v
retrieving revision 1.3
diff -u -r1.3 TModelHandler.java
--- org/apache/juddi/handler/TModelHandler.java	6 Feb 2005 02:52:07 -0000	1.3
+++ org/apache/juddi/handler/TModelHandler.java	14 Feb 2005 10:08:35 -0000
@@ -138,15 +138,16 @@
       handler.marshal(overDoc,element);
     }
 
+    // Only output IdentifierBag and CategoryBag if there is something inside
     IdentifierBag identifierBag = tModel.getIdentifierBag();
-    if (identifierBag != null)
+    if ((identifierBag != null) && (identifierBag.getKeyedReferenceVector() != null) && (!identifierBag.getKeyedReferenceVector().isEmpty()))
     {
       handler = maker.lookup(IdentifierBagHandler.TAG_NAME);
       handler.marshal(identifierBag,element);
     }
 
     CategoryBag categoryBag = tModel.getCategoryBag();
-    if (categoryBag != null)
+    if ((categoryBag != null) && (categoryBag.getKeyedReferenceVector() != null) && (!categoryBag.getKeyedReferenceVector().isEmpty()))
     {
       handler = maker.lookup(CategoryBagHandler.TAG_NAME);
       handler.marshal(categoryBag,element);