You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by tc...@apache.org on 2009/09/14 14:39:46 UTC
svn commit: r814616 - in /webservices/juddi/trunk:
uddi-client/src/main/java/org/uddi/api_v3/client/local/
uddi-ws/src/main/java/org/uddi/api_v3/
Author: tcunning
Date: Mon Sep 14 12:39:45 2009
New Revision: 814616
URL: http://svn.apache.org/viewvc?rev=814616&view=rev
Log:
JUDDI-277
Fix minor errors with Publication/Security services, add XmlRootElement
annotation to all of the api_v3 classes that are returned as a result
from the WS.
Modified:
webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/RequestHandler.java
webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/UDDIPublicationService.java
webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/UDDISecurityService.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AssertionStatusItem.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AuthToken.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BindingDetail.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BusinessDetail.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BusinessList.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OperationalInfos.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/PublisherAssertion.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/RegisteredInfo.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/RelatedBusinessesList.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/ServiceDetail.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/ServiceList.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/TModelDetail.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/TModelList.java
Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/RequestHandler.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/RequestHandler.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/RequestHandler.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/RequestHandler.java Mon Sep 14 12:39:45 2009
@@ -169,8 +169,7 @@
// this child to the soap response body
document.appendChild(element.getFirstChild());
setResponse(document);
- throw new FatalErrorException(new ErrorMessage(""));
- }
+ }/*
catch (RegistryException rex)
{
log.error(rex.getMessage());
@@ -220,7 +219,7 @@
//+ ", errText=" + errText;
setException(fault);
- }
+ } */
catch(Exception ex) // Catch any other exceptions
{
log.error(ex.getMessage());
Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/UDDIPublicationService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/UDDIPublicationService.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/UDDIPublicationService.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/UDDIPublicationService.java Mon Sep 14 12:39:45 2009
@@ -66,10 +66,6 @@
if ((operation == null) || (operation.trim().length() == 0))
throw new FatalErrorException(new ErrorMessage("errors.local.operation.notidentified"));
-
- else if (!operations.containsKey(operation.toLowerCase()))
- throw new UnsupportedException(new ErrorMessage("errors.local.publish.notsupported"));
-
}
@@ -87,7 +83,7 @@
String operation = requestHandler.getOperation(uddiReq);
Handler opHandler = operations.get(operation);
requestHandler.setMethodName(opHandler.getMethodName());
- requestHandler.setOperationClass(opHandler.getClass());
+ requestHandler.setOperationClass(opHandler.getParameter());
String version = requestHandler.getVersion(uddiReq, operation);
validateRequest(operation, version, uddiReq);
Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/UDDISecurityService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/UDDISecurityService.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/UDDISecurityService.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/uddi/api_v3/client/local/UDDISecurityService.java Mon Sep 14 12:39:45 2009
@@ -27,7 +27,7 @@
public UDDISecurityService() {
super();
operations = new HashMap<String, Handler>();
- operations.put("get_authtoken", new Handler("getAuthToken", GetAuthToken.class));
+ operations.put("get_authToken", new Handler("getAuthToken", GetAuthToken.class));
operations.put("discard_authToken", new Handler("discardAuthToken", DiscardAuthToken.class));
}
@@ -39,10 +39,6 @@
if ((operation == null) || (operation.trim().length() == 0))
throw new FatalErrorException(new ErrorMessage("errors.local.operation.notidentified"));
-
- else if (!operations.containsKey(operation.toLowerCase()))
- throw new UnsupportedException(new ErrorMessage("errors.local.security.notsupported"));
-
}
public Node secure(Element uddiReq) throws Exception
@@ -59,7 +55,7 @@
String operation = requestHandler.getOperation(uddiReq);
Handler opHandler = operations.get(operation);
requestHandler.setMethodName(opHandler.getMethodName());
- requestHandler.setOperationClass(opHandler.getClass());
+ requestHandler.setOperationClass(opHandler.getParameter());
String version = requestHandler.getVersion(uddiReq, operation);
validateRequest(operation, version, uddiReq);
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AssertionStatusItem.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AssertionStatusItem.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AssertionStatusItem.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AssertionStatusItem.java Mon Sep 14 12:39:45 2009
@@ -24,6 +24,7 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -58,6 +59,7 @@
"keyedReference",
"keysOwned"
})
+@XmlRootElement
public class AssertionStatusItem implements Serializable{
@XmlTransient
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AuthToken.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AuthToken.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AuthToken.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AuthToken.java Mon Sep 14 12:39:45 2009
@@ -23,6 +23,7 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -50,6 +51,7 @@
@XmlType(name = "authToken", propOrder = {
"authInfo"
})
+@XmlRootElement
public class AuthToken implements Serializable{
@XmlTransient
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BindingDetail.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BindingDetail.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BindingDetail.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BindingDetail.java Mon Sep 14 12:39:45 2009
@@ -24,6 +24,7 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -54,6 +55,7 @@
"listDescription",
"bindingTemplate"
})
+@XmlRootElement
public class BindingDetail implements Serializable{
@XmlTransient
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BusinessDetail.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BusinessDetail.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BusinessDetail.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BusinessDetail.java Mon Sep 14 12:39:45 2009
@@ -24,6 +24,7 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -52,6 +53,7 @@
@XmlType(name = "businessDetail", propOrder = {
"businessEntity"
})
+@XmlRootElement
public class BusinessDetail implements Serializable{
@XmlTransient
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BusinessList.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BusinessList.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BusinessList.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/BusinessList.java Mon Sep 14 12:39:45 2009
@@ -23,6 +23,7 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -53,6 +54,7 @@
"listDescription",
"businessInfos"
})
+@XmlRootElement
public class BusinessList implements Serializable{
@XmlTransient
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OperationalInfos.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OperationalInfos.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OperationalInfos.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OperationalInfos.java Mon Sep 14 12:39:45 2009
@@ -24,6 +24,7 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -52,6 +53,7 @@
@XmlType(name = "operationalInfos", propOrder = {
"operationalInfo"
})
+@XmlRootElement
public class OperationalInfos implements Serializable{
@XmlTransient
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/PublisherAssertion.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/PublisherAssertion.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/PublisherAssertion.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/PublisherAssertion.java Mon Sep 14 12:39:45 2009
@@ -24,6 +24,7 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.w3._2000._09.xmldsig_.SignatureType;
@@ -58,6 +59,7 @@
"keyedReference",
"signature"
})
+@XmlRootElement
public class PublisherAssertion implements Serializable{
@XmlTransient
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/RegisteredInfo.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/RegisteredInfo.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/RegisteredInfo.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/RegisteredInfo.java Mon Sep 14 12:39:45 2009
@@ -23,6 +23,7 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -53,6 +54,7 @@
"businessInfos",
"tModelInfos"
})
+@XmlRootElement
public class RegisteredInfo implements Serializable{
@XmlTransient
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/RelatedBusinessesList.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/RelatedBusinessesList.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/RelatedBusinessesList.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/RelatedBusinessesList.java Mon Sep 14 12:39:45 2009
@@ -24,6 +24,7 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -56,6 +57,7 @@
"businessKey",
"relatedBusinessInfos"
})
+@XmlRootElement
public class RelatedBusinessesList implements Serializable{
@XmlTransient
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/ServiceDetail.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/ServiceDetail.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/ServiceDetail.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/ServiceDetail.java Mon Sep 14 12:39:45 2009
@@ -24,6 +24,7 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -52,6 +53,7 @@
@XmlType(name = "serviceDetail", propOrder = {
"businessService"
})
+@XmlRootElement
public class ServiceDetail implements Serializable{
@XmlTransient
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/ServiceList.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/ServiceList.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/ServiceList.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/ServiceList.java Mon Sep 14 12:39:45 2009
@@ -23,6 +23,7 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -53,6 +54,7 @@
"listDescription",
"serviceInfos"
})
+@XmlRootElement
public class ServiceList implements Serializable{
@XmlTransient
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/TModelDetail.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/TModelDetail.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/TModelDetail.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/TModelDetail.java Mon Sep 14 12:39:45 2009
@@ -24,6 +24,7 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -52,6 +53,7 @@
@XmlType(name = "tModelDetail", propOrder = {
"tModel"
})
+@XmlRootElement
public class TModelDetail implements Serializable{
@XmlTransient
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/TModelList.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/TModelList.java?rev=814616&r1=814615&r2=814616&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/TModelList.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/TModelList.java Mon Sep 14 12:39:45 2009
@@ -23,6 +23,7 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -53,6 +54,7 @@
"listDescription",
"tModelInfos"
})
+@XmlRootElement
public class TModelList implements Serializable{
@XmlTransient
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org