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/09 22:56:22 UTC
svn commit: r813115 - in /webservices/juddi/trunk:
juddi-core/src/main/java/org/apache/juddi/api/impl/
juddi-core/src/main/java/org/apache/juddi/mapping/
juddi-core/src/main/java/org/apache/juddi/rmi/
juddi-core/src/main/resources/ uddi-ws/src/main/jav...
Author: tcunning
Date: Wed Sep 9 20:56:22 2009
New Revision: 813115
URL: http://svn.apache.org/viewvc?rev=813115&view=rev
Log:
JUDDI-276
Fix KeysOwned issues.
Modified:
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java
webservices/juddi/trunk/juddi-core/src/main/resources/messages.properties
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIPublicationPortType.java
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java?rev=813115&r1=813114&r2=813115&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java Wed Sep 9 20:56:22 2009
@@ -36,10 +36,12 @@
import org.uddi.api_v3.DeletePublisherAssertions;
import org.uddi.api_v3.DeleteService;
import org.uddi.api_v3.DeleteTModel;
+import org.uddi.api_v3.DispositionReport;
import org.uddi.api_v3.GetRegisteredInfo;
import org.uddi.api_v3.InfoSelection;
import org.uddi.api_v3.PublisherAssertion;
import org.uddi.api_v3.RegisteredInfo;
+import org.uddi.api_v3.Result;
import org.uddi.api_v3.SaveBinding;
import org.uddi.api_v3.SaveBusiness;
import org.uddi.api_v3.SaveService;
@@ -50,6 +52,7 @@
import org.uddi.v3_service.UDDIPublicationPortType;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.error.UDDIErrorHelper;
import org.apache.juddi.mapping.MappingApiToModel;
import org.apache.juddi.mapping.MappingModelToApi;
import org.apache.juddi.validation.ValidatePublish;
@@ -78,7 +81,7 @@
public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPublicationPortType {
- public void addPublisherAssertions(AddPublisherAssertions body)
+ public DispositionReport addPublisherAssertions(AddPublisherAssertions body)
throws DispositionReportFaultMessage {
EntityManager em = PersistenceManager.getEntityManager();
@@ -145,9 +148,10 @@
}
em.close();
}
+ return UDDIErrorHelper.buildDispositionReport(UDDIErrorHelper.E_SUCCESS);
}
- public void deleteBinding(DeleteBinding body)
+ public DispositionReport deleteBinding(DeleteBinding body)
throws DispositionReportFaultMessage {
EntityManager em = PersistenceManager.getEntityManager();
@@ -175,9 +179,10 @@
}
em.close();
}
+ return UDDIErrorHelper.buildDispositionReport(UDDIErrorHelper.E_SUCCESS);
}
- public void deleteBusiness(DeleteBusiness body)
+ public DispositionReport deleteBusiness(DeleteBusiness body)
throws DispositionReportFaultMessage {
EntityManager em = PersistenceManager.getEntityManager();
@@ -202,9 +207,10 @@
}
em.close();
}
+ return UDDIErrorHelper.buildDispositionReport(UDDIErrorHelper.E_SUCCESS);
}
- public void deletePublisherAssertions(DeletePublisherAssertions body)
+ public DispositionReport deletePublisherAssertions(DeletePublisherAssertions body)
throws DispositionReportFaultMessage {
EntityManager em = PersistenceManager.getEntityManager();
@@ -230,9 +236,10 @@
}
em.close();
}
+ return UDDIErrorHelper.buildDispositionReport(UDDIErrorHelper.E_SUCCESS);
}
- public void deleteService(DeleteService body)
+ public DispositionReport deleteService(DeleteService body)
throws DispositionReportFaultMessage {
EntityManager em = PersistenceManager.getEntityManager();
@@ -260,10 +267,11 @@
}
em.close();
}
+ return UDDIErrorHelper.buildDispositionReport(UDDIErrorHelper.E_SUCCESS);
}
- public void deleteTModel(DeleteTModel body)
+ public DispositionReport deleteTModel(DeleteTModel body)
throws DispositionReportFaultMessage {
EntityManager em = PersistenceManager.getEntityManager();
@@ -290,6 +298,7 @@
}
em.close();
}
+ return UDDIErrorHelper.buildDispositionReport(UDDIErrorHelper.E_SUCCESS);
}
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java?rev=813115&r1=813114&r2=813115&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java Wed Sep 9 20:56:22 2009
@@ -20,6 +20,7 @@
import java.util.Collections;
import java.util.List;
+import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import org.apache.juddi.error.ErrorMessage;
@@ -30,6 +31,7 @@
import org.apache.juddi.util.JAXBMarshaller;
import org.apache.log4j.Logger;
import org.uddi.api_v3.CompletionStatus;
+import org.uddi.api_v3.ObjectFactory;
import org.uddi.api_v3.OperationalInfo;
import org.uddi.sub_v3.SubscriptionFilter;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -688,11 +690,13 @@
Collections.sort((List<String>)businessKeys);
if (Collections.binarySearch((List<String>)businessKeys, modelPublisherAssertion.getBusinessEntityByFromKey().getEntityKey()) >= 0)
- keysOwned.getFromKey().add(modelPublisherAssertion.getBusinessEntityByFromKey().getEntityKey());
+ keysOwned.setFromKey(modelPublisherAssertion.getBusinessEntityByFromKey().getEntityKey());
if (Collections.binarySearch((List<String>)businessKeys, modelPublisherAssertion.getBusinessEntityByToKey().getEntityKey()) >= 0)
keysOwned.setToKey(modelPublisherAssertion.getBusinessEntityByToKey().getEntityKey());
-
+ if (keysOwned.getFromKey() == null && keysOwned.getToKey() == null) {
+ throw new FatalErrorException(new ErrorMessage("errors.invalidKey.KeysOwned"));
+ }
}
public static void mapRelatedBusinessInfo(org.apache.juddi.model.PublisherAssertion modelPublisherAssertion,
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java?rev=813115&r1=813114&r2=813115&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/UDDIPublicationService.java Wed Sep 9 20:56:22 2009
@@ -33,6 +33,7 @@
import org.uddi.api_v3.DeletePublisherAssertions;
import org.uddi.api_v3.DeleteService;
import org.uddi.api_v3.DeleteTModel;
+import org.uddi.api_v3.DispositionReport;
import org.uddi.api_v3.GetRegisteredInfo;
import org.uddi.api_v3.PublisherAssertion;
import org.uddi.api_v3.RegisteredInfo;
@@ -58,34 +59,34 @@
super();
}
- public void addPublisherAssertions(AddPublisherAssertions body)
+ public DispositionReport addPublisherAssertions(AddPublisherAssertions body)
throws RemoteException {
- publication.addPublisherAssertions(body);
+ return publication.addPublisherAssertions(body);
}
- public void deleteBinding(DeleteBinding body)
+ public DispositionReport deleteBinding(DeleteBinding body)
throws RemoteException {
- publication.deleteBinding(body);
+ return publication.deleteBinding(body);
}
- public void deleteBusiness(DeleteBusiness body)
+ public DispositionReport deleteBusiness(DeleteBusiness body)
throws RemoteException {
- publication.deleteBusiness(body);
+ return publication.deleteBusiness(body);
}
- public void deletePublisherAssertions(DeletePublisherAssertions body)
+ public DispositionReport deletePublisherAssertions(DeletePublisherAssertions body)
throws RemoteException {
- publication.deletePublisherAssertions(body);
+ return publication.deletePublisherAssertions(body);
}
- public void deleteService(DeleteService body)
+ public DispositionReport deleteService(DeleteService body)
throws RemoteException {
- publication.deleteService(body);
+ return publication.deleteService(body);
}
- public void deleteTModel(DeleteTModel body)
+ public DispositionReport deleteTModel(DeleteTModel body)
throws RemoteException {
- publication.deleteTModel(body);
+ return publication.deleteTModel(body);
}
public List<AssertionStatusItem> getAssertionStatusReport(String authInfo,
Modified: webservices/juddi/trunk/juddi-core/src/main/resources/messages.properties
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/resources/messages.properties?rev=813115&r1=813114&r2=813115&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/resources/messages.properties (original)
+++ webservices/juddi/trunk/juddi-core/src/main/resources/messages.properties Wed Sep 9 20:56:22 2009
@@ -86,6 +86,7 @@
errors.invalidkey.businessservice.ParentMismatch=The service being saved has a different parent business key then the one provided
errors.invalidkey.bindingtemplate.ParentMismatch=The binding template being saved has a different parent service key then the one provided
errors.invalidkey.SubscriptionNotFound=The subscription was not found for the given key
+errors.invalidKey.KeysOwned=Either the to key for the from key must be specified on a keysOwned structure
errors.invalidprojection.ParentMismatch=The supplied business key doesn't match the actual business key of the service being projected
errors.usermismatch.InvalidOwner=The user is not authorized to access the given entity
errors.usermismatch.InvalidOwnerParent=The user is not authorized to access the given parent entity
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java?rev=813115&r1=813114&r2=813115&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java Wed Sep 9 20:56:22 2009
@@ -65,9 +65,9 @@
@XmlElement
protected String instanceParms;
- @XmlElement
+ @XmlElement(required=false)
protected List<Description> description;
- @XmlElement
+ @XmlElement(required=false)
protected List<OverviewDoc> overviewDoc;
public void setInstanceParms(String instanceParms) {
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java?rev=813115&r1=813114&r2=813115&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java Wed Sep 9 20:56:22 2009
@@ -59,47 +59,12 @@
@XmlTransient
private static final long serialVersionUID = 1L;
+ @XmlElement(required=false)
+ protected String fromKey;
- @XmlElement
- protected List<String> fromKey;
-
- @XmlElement
+ @XmlElement(required=false)
protected String toKey;
-
-
- /**
- * Gets the rest of the content model.
- *
- * <p>
- * You are getting this "catch-all" property because of the following reason:
- * The field name "ToKey" is used by two different parts of a schema. See:
- * line 354 of file:/C:/Development/Projects/jUDDI_v3/uddi-ws/src/main/resources/uddi_v3.xsd
- * line 352 of file:/C:/Development/Projects/jUDDI_v3/uddi-ws/src/main/resources/uddi_v3.xsd
- * <p>
- * To get rid of this property, apply a property customization to one
- * of both of the following declarations to change their names:
- * Gets the value of the content property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the content property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getContent().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link String }{@code >}
- * {@link JAXBElement }{@code <}{@link String }{@code >}
- *
- *
- */
+
public String getToKey() {
return toKey;
}
@@ -108,9 +73,12 @@
this.toKey = toKey;
}
- public List<String> getFromKey() {
+ public String getFromKey() {
return fromKey;
}
-
+
+ public void setFromKey(String fromKey) {
+ this.fromKey = fromKey;
+ }
}
\ No newline at end of file
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIPublicationPortType.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIPublicationPortType.java?rev=813115&r1=813114&r2=813115&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIPublicationPortType.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/v3_service/UDDIPublicationPortType.java Wed Sep 9 20:56:22 2009
@@ -40,6 +40,7 @@
import org.uddi.api_v3.DeletePublisherAssertions;
import org.uddi.api_v3.DeleteService;
import org.uddi.api_v3.DeleteTModel;
+import org.uddi.api_v3.DispositionReport;
import org.uddi.api_v3.GetRegisteredInfo;
import org.uddi.api_v3.PublisherAssertion;
import org.uddi.api_v3.RegisteredInfo;
@@ -81,8 +82,9 @@
* @throws DispositionReportFaultMessage, RemoteException
*/
@WebMethod(operationName = "add_publisherAssertions", action = "add_publisherAssertions")
+ @WebResult(name = "dispositionReport", targetNamespace = "urn:uddi-org:api_v3", partName = "body")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- public void addPublisherAssertions(
+ public DispositionReport addPublisherAssertions(
@WebParam(name = "add_publisherAssertions", targetNamespace = "urn:uddi-org:api_v3", partName = "body")
AddPublisherAssertions body)
throws DispositionReportFaultMessage, RemoteException
@@ -94,8 +96,9 @@
* @throws DispositionReportFaultMessage, RemoteException
*/
@WebMethod(operationName = "delete_binding", action = "delete_binding")
+ @WebResult(name = "dispositionReport", targetNamespace = "urn:uddi-org:api_v3", partName = "body")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- public void deleteBinding(
+ public DispositionReport deleteBinding(
@WebParam(name = "delete_binding", targetNamespace = "urn:uddi-org:api_v3", partName = "body")
DeleteBinding body)
throws DispositionReportFaultMessage, RemoteException
@@ -107,8 +110,9 @@
* @throws DispositionReportFaultMessage, RemoteException
*/
@WebMethod(operationName = "delete_business", action = "delete_business")
+ @WebResult(name = "dispositionReport", targetNamespace = "urn:uddi-org:api_v3", partName = "body")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- public void deleteBusiness(
+ public DispositionReport deleteBusiness(
@WebParam(name = "delete_business", targetNamespace = "urn:uddi-org:api_v3", partName = "body")
DeleteBusiness body)
throws DispositionReportFaultMessage, RemoteException
@@ -120,8 +124,9 @@
* @throws DispositionReportFaultMessage, RemoteException
*/
@WebMethod(operationName = "delete_publisherAssertions", action = "delete_publisherAssertions")
+ @WebResult(name = "dispositionReport", targetNamespace = "urn:uddi-org:api_v3", partName = "body")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- public void deletePublisherAssertions(
+ public DispositionReport deletePublisherAssertions(
@WebParam(name = "delete_publisherAssertions", targetNamespace = "urn:uddi-org:api_v3", partName = "body")
DeletePublisherAssertions body)
throws DispositionReportFaultMessage, RemoteException
@@ -133,8 +138,9 @@
* @throws DispositionReportFaultMessage, RemoteException
*/
@WebMethod(operationName = "delete_service", action = "delete_service")
+ @WebResult(name = "dispositionReport", targetNamespace = "urn:uddi-org:api_v3", partName = "body")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- public void deleteService(
+ public DispositionReport deleteService(
@WebParam(name = "delete_service", targetNamespace = "urn:uddi-org:api_v3", partName = "body")
DeleteService body)
throws DispositionReportFaultMessage, RemoteException
@@ -146,8 +152,9 @@
* @throws DispositionReportFaultMessage, RemoteException
*/
@WebMethod(operationName = "delete_tModel", action = "delete_tModel")
+ @WebResult(name = "dispositionReport", targetNamespace = "urn:uddi-org:api_v3", partName = "body")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- public void deleteTModel(
+ public DispositionReport deleteTModel(
@WebParam(name = "delete_tModel", targetNamespace = "urn:uddi-org:api_v3", partName = "body")
DeleteTModel body)
throws DispositionReportFaultMessage, RemoteException
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org