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 10:17:11 UTC
cvs commit: ws-juddi/src/java/org/apache/juddi/handler TModelListHandler.java AuthTokenHandler.java RegisteredInfoHandler.java PublisherAssertionsHandler.java BindingDetailHandler.java PublisherListHandler.java ServiceDetailHandler.java ServiceListHandler.java BusinessDetailExtHandler.java RelatedBusinessesListHandler.java AssertionStatusReportHandler.java TModelDetailHandler.java BusinessListHandler.java BusinessDetailHandler.java
sviens 2005/02/15 01:17:11
Modified: src/java/org/apache/juddi/handler TModelListHandler.java
AuthTokenHandler.java RegisteredInfoHandler.java
PublisherAssertionsHandler.java
BindingDetailHandler.java PublisherListHandler.java
ServiceDetailHandler.java ServiceListHandler.java
BusinessDetailExtHandler.java
RelatedBusinessesListHandler.java
AssertionStatusReportHandler.java
TModelDetailHandler.java BusinessListHandler.java
BusinessDetailHandler.java
Log:
Updated the marshal() method to default the generic attribute value to "2.0" when the objects generic value is null or an empty string.
Revision Changes Path
1.7 +6 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TModelListHandler.java 15 Feb 2005 08:50:45 -0000 1.6
+++ TModelListHandler.java 15 Feb 2005 09:17:10 -0000 1.7
@@ -84,7 +84,7 @@
AbstractHandler handler = null;
String generic = list.getGeneric();
- if (generic != null)
+ if ((generic != null) && (generic.trim().length() > 0))
{
element.setAttribute("generic",generic);
@@ -95,8 +95,11 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
- else
- element.setAttribute("generic","");
+ else // Default to UDDI v2 values
+ {
+ element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
+ element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
+ }
String operator = list.getOperator();
if (operator != null)
1.7 +6 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AuthTokenHandler.java 15 Feb 2005 08:50:45 -0000 1.6
+++ AuthTokenHandler.java 15 Feb 2005 09:17:10 -0000 1.7
@@ -77,7 +77,7 @@
AbstractHandler handler = null;
String generic = authToken.getGeneric();
- if (generic != null)
+ if ((generic != null) && (generic.trim().length() > 0))
{
element.setAttribute("generic",generic);
@@ -88,8 +88,11 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
- else
- element.setAttribute("generic","");
+ else // Default to UDDI v2 values
+ {
+ element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
+ element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
+ }
String operator = authToken.getOperator();
if (operator != null)
1.7 +6 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RegisteredInfoHandler.java 15 Feb 2005 08:50:45 -0000 1.6
+++ RegisteredInfoHandler.java 15 Feb 2005 09:17:10 -0000 1.7
@@ -93,7 +93,7 @@
AbstractHandler handler = null;
String generic = info.getGeneric();
- if (generic != null)
+ if ((generic != null) && (generic.trim().length() > 0))
{
element.setAttribute("generic",generic);
@@ -104,8 +104,11 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
- else
- element.setAttribute("generic","");
+ else // Default to UDDI v2 values
+ {
+ element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
+ element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
+ }
String operator = info.getOperator();
if (operator != null)
1.7 +6 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PublisherAssertionsHandler.java 15 Feb 2005 08:50:45 -0000 1.6
+++ PublisherAssertionsHandler.java 15 Feb 2005 09:17:10 -0000 1.7
@@ -78,7 +78,7 @@
AbstractHandler handler = null;
String generic = assertions.getGeneric();
- if (generic != null)
+ if ((generic != null) && (generic.trim().length() > 0))
{
element.setAttribute("generic",generic);
@@ -89,8 +89,11 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
- else
- element.setAttribute("generic","");
+ else // Default to UDDI v2 values
+ {
+ element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
+ element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
+ }
String operator = assertions.getOperator();
if (operator != null)
1.7 +6 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BindingDetailHandler.java 15 Feb 2005 08:50:45 -0000 1.6
+++ BindingDetailHandler.java 15 Feb 2005 09:17:10 -0000 1.7
@@ -91,7 +91,7 @@
AbstractHandler handler = null;
String generic = detail.getGeneric();
- if (generic != null)
+ if ((generic != null) && (generic.trim().length() > 0))
{
element.setAttribute("generic",generic);
@@ -102,8 +102,11 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
- else
- element.setAttribute("generic","");
+ else // Default to UDDI v2 values
+ {
+ element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
+ element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
+ }
String operator = detail.getOperator();
if (operator != null)
1.7 +6 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PublisherListHandler.java 15 Feb 2005 08:50:45 -0000 1.6
+++ PublisherListHandler.java 15 Feb 2005 09:17:10 -0000 1.7
@@ -85,13 +85,16 @@
AbstractHandler handler = null;
String generic = list.getGeneric();
- if (generic != null)
+ if ((generic != null) && (generic.trim().length() > 0))
{
element.setAttribute("generic",generic);
element.setAttribute("xmlns",IRegistry.JUDDI_V1_NAMESPACE);
}
- else
- element.setAttribute("generic","");
+ else // Default to UDDI v2 and jUDDI v1 values
+ {
+ element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
+ element.setAttribute("xmlns",IRegistry.JUDDI_V1_NAMESPACE);
+ }
String operator = list.getOperator();
if (operator != null)
1.7 +8 -5 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServiceDetailHandler.java 15 Feb 2005 08:50:45 -0000 1.6
+++ ServiceDetailHandler.java 15 Feb 2005 09:17:11 -0000 1.7
@@ -96,7 +96,7 @@
AbstractHandler handler = null;
String generic = detail.getGeneric();
- if (generic != null)
+ if ((generic != null) && (generic.trim().length() > 0))
{
element.setAttribute("generic",generic);
@@ -107,8 +107,11 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
- else
- element.setAttribute("generic","");
+ else // Default to UDDI v2 values
+ {
+ element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
+ element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
+ }
String operator = detail.getOperator();
if (operator != null)
@@ -193,8 +196,8 @@
service.addDescription(new Description("service whatever too","it"));
ServiceDetail detail = new ServiceDetail();
- detail.setGeneric("2.0");
- detail.setOperator("jUDDI.org");
+ //detail.setGeneric("2.0");
+ //detail.setOperator("jUDDI.org");
detail.setTruncated(false);
detail.addBusinessService(service);
detail.addBusinessService(service);
1.7 +6 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServiceListHandler.java 15 Feb 2005 08:50:45 -0000 1.6
+++ ServiceListHandler.java 15 Feb 2005 09:17:11 -0000 1.7
@@ -84,7 +84,7 @@
AbstractHandler handler = null;
String generic = list.getGeneric();
- if (generic != null)
+ if ((generic != null) && (generic.trim().length() > 0))
{
element.setAttribute("generic",generic);
@@ -95,8 +95,11 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
- else
- element.setAttribute("generic","");
+ else // Default to UDDI v2 values
+ {
+ element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
+ element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
+ }
String operator = list.getOperator();
if (operator != null)
1.6 +8 -1 ws-juddi/src/java/org/apache/juddi/handler/BusinessDetailExtHandler.java
Index: BusinessDetailExtHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/BusinessDetailExtHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BusinessDetailExtHandler.java 6 Feb 2005 02:52:07 -0000 1.5
+++ BusinessDetailExtHandler.java 15 Feb 2005 09:17:11 -0000 1.6
@@ -83,7 +83,7 @@
AbstractHandler handler = null;
String generic = detail.getGeneric();
- if (generic != null)
+ if ((generic != null) && (generic.trim().length() > 0))
{
element.setAttribute("generic",generic);
@@ -94,10 +94,17 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
+ else // Default to UDDI v2 values
+ {
+ element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
+ element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
+ }
String operator = detail.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
+ else
+ element.setAttribute("operator","");
boolean truncated = detail.isTruncated();
if (truncated)
1.7 +6 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RelatedBusinessesListHandler.java 15 Feb 2005 08:50:45 -0000 1.6
+++ RelatedBusinessesListHandler.java 15 Feb 2005 09:17:11 -0000 1.7
@@ -91,7 +91,7 @@
AbstractHandler handler = null;
String generic = list.getGeneric();
- if (generic != null)
+ if ((generic != null) && (generic.trim().length() > 0))
{
element.setAttribute("generic",generic);
@@ -102,8 +102,11 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
- else
- element.setAttribute("generic","");
+ else // Default to UDDI v2 values
+ {
+ element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
+ element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
+ }
String operator = list.getOperator();
if (operator != null)
1.7 +6 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AssertionStatusReportHandler.java 15 Feb 2005 08:50:45 -0000 1.6
+++ AssertionStatusReportHandler.java 15 Feb 2005 09:17:11 -0000 1.7
@@ -80,7 +80,7 @@
AbstractHandler handler = null;
String generic = report.getGeneric();
- if (generic != null)
+ if ((generic != null) && (generic.trim().length() > 0))
{
element.setAttribute("generic",generic);
@@ -91,8 +91,11 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
- else
- element.setAttribute("generic","");
+ else // Default to UDDI v2 values
+ {
+ element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
+ element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
+ }
String operator = report.getOperator();
if (operator != null)
1.6 +8 -1 ws-juddi/src/java/org/apache/juddi/handler/TModelDetailHandler.java
Index: TModelDetailHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/TModelDetailHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TModelDetailHandler.java 6 Feb 2005 02:52:07 -0000 1.5
+++ TModelDetailHandler.java 15 Feb 2005 09:17:11 -0000 1.6
@@ -89,7 +89,7 @@
AbstractHandler handler = null;
String generic = detail.getGeneric();
- if (generic != null)
+ if ((generic != null) && (generic.trim().length() > 0))
{
element.setAttribute("generic",generic);
@@ -100,10 +100,17 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
+ else // Default to UDDI v2 values
+ {
+ element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
+ element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
+ }
String operator = detail.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
+ else
+ element.setAttribute("operator","");
boolean truncated = detail.isTruncated();
if (truncated)
1.8 +6 -3 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BusinessListHandler.java 15 Feb 2005 08:50:45 -0000 1.7
+++ BusinessListHandler.java 15 Feb 2005 09:17:11 -0000 1.8
@@ -83,7 +83,7 @@
AbstractHandler handler = null;
String generic = list.getGeneric();
- if (generic != null)
+ if ((generic != null) && (generic.trim().length() > 0))
{
element.setAttribute("generic",generic);
@@ -94,8 +94,11 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
- else
- element.setAttribute("generic","");
+ else // Default to UDDI v2 values
+ {
+ element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
+ element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
+ }
String operator = list.getOperator();
if (operator != null)
1.6 +8 -1 ws-juddi/src/java/org/apache/juddi/handler/BusinessDetailHandler.java
Index: BusinessDetailHandler.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/BusinessDetailHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BusinessDetailHandler.java 6 Feb 2005 02:52:07 -0000 1.5
+++ BusinessDetailHandler.java 15 Feb 2005 09:17:11 -0000 1.6
@@ -106,7 +106,7 @@
AbstractHandler handler = null;
String generic = detail.getGeneric();
- if (generic != null)
+ if ((generic != null) && (generic.trim().length() > 0))
{
element.setAttribute("generic",generic);
@@ -117,10 +117,17 @@
else if (generic.equals(IRegistry.UDDI_V3_GENERIC))
element.setAttribute("xmlns",IRegistry.UDDI_V3_NAMESPACE);
}
+ else // Default to UDDI v2 values
+ {
+ element.setAttribute("generic",IRegistry.UDDI_V2_GENERIC);
+ element.setAttribute("xmlns",IRegistry.UDDI_V2_NAMESPACE);
+ }
String operator = detail.getOperator();
if (operator != null)
element.setAttribute("operator",operator);
+ else
+ element.setAttribute("operator","");
boolean truncated = detail.isTruncated();
if (truncated)