You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by sv...@apache.org on 2005/02/14 14:33:18 UTC
cvs commit: ws-juddi/src/java/org/apache/juddi/handler BusinessEntityHandler.java BusinessServiceHandler.java BindingTemplateHandler.java OverviewDocHandler.java TModelHandler.java
sviens 2005/02/14 05:33:18
Modified: src/java/org/apache/juddi/handler BusinessEntityHandler.java
BusinessServiceHandler.java
BindingTemplateHandler.java OverviewDocHandler.java
TModelHandler.java
Log:
Fix for issue JUDDI-55. Handlers for BusinessEntity, BusinessService, BindingTemplate, TModel and OverviewDoc did not conform to the UDDI v2 XML Schema: http://issues.apache.org/jira/browse/JUDDI-55
Revision Changes Path
1.4 +2 -2 ws-juddi/src/java/org/apache/juddi/handler/BusinessEntityHandler.java
Index: BusinessEntityHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/BusinessEntityHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BusinessEntityHandler.java 6 Feb 2005 02:52:07 -0000 1.3
+++ BusinessEntityHandler.java 14 Feb 2005 13:33:18 -0000 1.4
@@ -186,14 +186,14 @@
}
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);
1.4 +1 -1 ws-juddi/src/java/org/apache/juddi/handler/BusinessServiceHandler.java
Index: BusinessServiceHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/BusinessServiceHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BusinessServiceHandler.java 6 Feb 2005 02:52:07 -0000 1.3
+++ BusinessServiceHandler.java 14 Feb 2005 13:33:18 -0000 1.4
@@ -133,7 +133,7 @@
}
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);
1.5 +1 -1 ws-juddi/src/java/org/apache/juddi/handler/BindingTemplateHandler.java
Index: BindingTemplateHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/BindingTemplateHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BindingTemplateHandler.java 6 Feb 2005 02:52:07 -0000 1.4
+++ BindingTemplateHandler.java 14 Feb 2005 13:33:18 -0000 1.5
@@ -142,7 +142,7 @@
// TODO (UDDI v3) This code should be uncommented when jUDDI is ready to support UDDI v3.0
// CategoryBag categoryBag = binding.getCategoryBag(); // UDDI v3.0
-// if (categoryBag != null)
+// if ((categoryBag != null) && (categoryBag.getKeyedReferenceVector() != null) && (!categoryBag.getKeyedReferenceVector().isEmpty()))
// {
// handler = maker.lookup(CategoryBagHandler.TAG_NAME);
// handler.marshal(categoryBag,element);
1.5 +7 -7 ws-juddi/src/java/org/apache/juddi/handler/OverviewDocHandler.java
Index: OverviewDocHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/OverviewDocHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OverviewDocHandler.java 6 Feb 2005 19:29:23 -0000 1.4
+++ OverviewDocHandler.java 14 Feb 2005 13:33:18 -0000 1.5
@@ -77,13 +77,6 @@
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);
- }
-
Vector descrVector = overDoc.getDescriptionVector();
if ((descrVector!=null) && (descrVector.size() > 0))
{
@@ -92,6 +85,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);
}
1.4 +2 -2 ws-juddi/src/java/org/apache/juddi/handler/TModelHandler.java
Index: TModelHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/TModelHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TModelHandler.java 6 Feb 2005 02:52:07 -0000 1.3
+++ TModelHandler.java 14 Feb 2005 13:33:18 -0000 1.4
@@ -139,14 +139,14 @@
}
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);