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/15 09:50:47 UTC
cvs commit: ws-juddi/src/java/org/apache/juddi/handler TModelListHandler.java ServiceListHandler.java RegisteredInfoHandler.java AuthTokenHandler.java PublisherAssertionsHandler.java BindingDetailHandler.java PublisherDetailHandler.java RelatedBusinessesListHandler.java AssertionStatusReportHandler.java PublisherListHandler.java BusinessListHandler.java ServiceDetailHandler.java
sviens 2005/02/15 00:50:47
Modified: src/java/org/apache/juddi/handler TModelListHandler.java
ServiceListHandler.java RegisteredInfoHandler.java
AuthTokenHandler.java
PublisherAssertionsHandler.java
BindingDetailHandler.java
PublisherDetailHandler.java
RelatedBusinessesListHandler.java
AssertionStatusReportHandler.java
PublisherListHandler.java BusinessListHandler.java
ServiceDetailHandler.java
Log:
Updated the marshal() method to include valueless generic and operator attributes when these values are null. This ommission generated XML that did not conform to the v2 UDDI Schema.
Revision Changes Path
1.6 +4 -0 ws-juddi/src/java/org/apache/juddi/handler/TModelListHandler.java
Index: TModelListHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/TModelListHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TModelListHandler.java 6 Feb 2005 02:52:07 -0000 1.5
+++ TModelListHandler.java 15 Feb 2005 08:50:45 -0000 1.6
@@ -95,10 +95,14 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
+ else
+ element.setAttribute("generic","");
String operator = list.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
+ else
+ element.setAttribute("operator","");
boolean truncated = list.isTruncated();
if (truncated)
1.6 +4 -0 ws-juddi/src/java/org/apache/juddi/handler/ServiceListHandler.java
Index: ServiceListHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/ServiceListHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServiceListHandler.java 6 Feb 2005 02:52:07 -0000 1.5
+++ ServiceListHandler.java 15 Feb 2005 08:50:45 -0000 1.6
@@ -95,10 +95,14 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
+ else
+ element.setAttribute("generic","");
String operator = list.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
+ else
+ element.setAttribute("operator","");
boolean truncated = list.isTruncated();
if (truncated)
1.6 +4 -0 ws-juddi/src/java/org/apache/juddi/handler/RegisteredInfoHandler.java
Index: RegisteredInfoHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/RegisteredInfoHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RegisteredInfoHandler.java 6 Feb 2005 02:52:07 -0000 1.5
+++ RegisteredInfoHandler.java 15 Feb 2005 08:50:45 -0000 1.6
@@ -104,10 +104,14 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
+ else
+ element.setAttribute("generic","");
String operator = info.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
+ else
+ element.setAttribute("operator","");
BusinessInfos bInfos = info.getBusinessInfos();
if (bInfos!=null)
1.6 +4 -0 ws-juddi/src/java/org/apache/juddi/handler/AuthTokenHandler.java
Index: AuthTokenHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/AuthTokenHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AuthTokenHandler.java 15 Feb 2005 08:36:18 -0000 1.5
+++ AuthTokenHandler.java 15 Feb 2005 08:50:45 -0000 1.6
@@ -88,10 +88,14 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
+ else
+ element.setAttribute("generic","");
String operator = authToken.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
+ else
+ element.setAttribute("operator","");
AuthInfo authInfo = authToken.getAuthInfo();
if (authInfo != null)
1.6 +4 -0 ws-juddi/src/java/org/apache/juddi/handler/PublisherAssertionsHandler.java
Index: PublisherAssertionsHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/PublisherAssertionsHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PublisherAssertionsHandler.java 6 Feb 2005 02:52:07 -0000 1.5
+++ PublisherAssertionsHandler.java 15 Feb 2005 08:50:45 -0000 1.6
@@ -89,10 +89,14 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
+ else
+ element.setAttribute("generic","");
String operator = assertions.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
+ else
+ element.setAttribute("operator","");
Vector vector = assertions.getPublisherAssertionVector();
if ((vector!=null) && (vector.size() > 0))
1.6 +4 -0 ws-juddi/src/java/org/apache/juddi/handler/BindingDetailHandler.java
Index: BindingDetailHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/BindingDetailHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BindingDetailHandler.java 6 Feb 2005 02:52:07 -0000 1.5
+++ BindingDetailHandler.java 15 Feb 2005 08:50:45 -0000 1.6
@@ -102,10 +102,14 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
+ else
+ element.setAttribute("generic","");
String operator = detail.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
+ else
+ element.setAttribute("operator","");
boolean truncated = detail.isTruncated();
if (truncated)
1.6 +4 -0 ws-juddi/src/java/org/apache/juddi/handler/PublisherDetailHandler.java
Index: PublisherDetailHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/PublisherDetailHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PublisherDetailHandler.java 6 Feb 2005 02:52:07 -0000 1.5
+++ PublisherDetailHandler.java 15 Feb 2005 08:50:45 -0000 1.6
@@ -89,10 +89,14 @@
element.setAttribute("generic",generic);
element.setAttribute("xmlns",IRegistry.JUDDI_V1_NAMESPACE);
}
+ else
+ element.setAttribute("generic","");
String operator = detail.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
+ else
+ element.setAttribute("operator","");
boolean truncated = detail.isTruncated();
if (truncated)
1.6 +4 -0 ws-juddi/src/java/org/apache/juddi/handler/RelatedBusinessesListHandler.java
Index: RelatedBusinessesListHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/RelatedBusinessesListHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RelatedBusinessesListHandler.java 6 Feb 2005 02:52:07 -0000 1.5
+++ RelatedBusinessesListHandler.java 15 Feb 2005 08:50:45 -0000 1.6
@@ -102,10 +102,14 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
+ else
+ element.setAttribute("generic","");
String operator = list.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
+ else
+ element.setAttribute("operator","");
boolean truncated = list.isTruncated();
if (truncated)
1.6 +6 -2 ws-juddi/src/java/org/apache/juddi/handler/AssertionStatusReportHandler.java
Index: AssertionStatusReportHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/AssertionStatusReportHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AssertionStatusReportHandler.java 6 Feb 2005 02:52:07 -0000 1.5
+++ AssertionStatusReportHandler.java 15 Feb 2005 08:50:45 -0000 1.6
@@ -91,11 +91,15 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
-
+ else
+ element.setAttribute("generic","");
+
String operator = report.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
-
+ else
+ element.setAttribute("operator","");
+
Vector vector = report.getAssertionStatusItemVector();
if ((vector!=null) && (vector.size() > 0))
{
1.6 +4 -0 ws-juddi/src/java/org/apache/juddi/handler/PublisherListHandler.java
Index: PublisherListHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/PublisherListHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PublisherListHandler.java 6 Feb 2005 02:52:07 -0000 1.5
+++ PublisherListHandler.java 15 Feb 2005 08:50:45 -0000 1.6
@@ -90,10 +90,14 @@
element.setAttribute("generic",generic);
element.setAttribute("xmlns",IRegistry.JUDDI_V1_NAMESPACE);
}
+ else
+ element.setAttribute("generic","");
String operator = list.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
+ else
+ element.setAttribute("operator","");
boolean truncated = list.isTruncated();
if (truncated)
1.7 +4 -0 ws-juddi/src/java/org/apache/juddi/handler/BusinessListHandler.java
Index: BusinessListHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/BusinessListHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BusinessListHandler.java 6 Feb 2005 02:55:31 -0000 1.6
+++ BusinessListHandler.java 15 Feb 2005 08:50:45 -0000 1.7
@@ -94,10 +94,14 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
+ else
+ element.setAttribute("generic","");
String operator = list.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
+ else
+ element.setAttribute("operator","");
boolean truncated = list.isTruncated();
if (truncated)
1.6 +4 -0 ws-juddi/src/java/org/apache/juddi/handler/ServiceDetailHandler.java
Index: ServiceDetailHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/ServiceDetailHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServiceDetailHandler.java 6 Feb 2005 02:52:07 -0000 1.5
+++ ServiceDetailHandler.java 15 Feb 2005 08:50:45 -0000 1.6
@@ -107,10 +107,14 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
+ else
+ element.setAttribute("generic","");
String operator = detail.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
+ else
+ element.setAttribute("operator","");
boolean truncated = detail.isTruncated();
if (truncated)