You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2006/08/18 18:21:19 UTC
svn commit: r432629 - in /webservices/muse/trunk/modules:
muse-wsdm-muws-api/src/org/apache/muse/ws/dm/muws/
muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/
Author: danj
Date: Fri Aug 18 09:21:18 2006
New Revision: 432629
URL: http://svn.apache.org/viewvc?rev=432629&view=rev
Log:
Fix for MUSE-58 - contribution from Joel H., I just moved the code to take WsResource[] and turn it into
an Element[] (relationship XML) into QueryRelationshipsResponse rather than the handler. This keeps the
parsing/definition of the message format consistent with other operations.
I also updated SimpleRelationships.create*() so that the relationship resources are initialized after
creation, and a RelationshipCreationFailedFault is consistently thrown for the two points of failure.
Modified:
webservices/muse/trunk/modules/muse-wsdm-muws-api/src/org/apache/muse/ws/dm/muws/MuwsConstants.java
webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/QueryRelationshipsHandler.java
webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/QueryRelationshipsResponse.java
webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/SimpleRelationshipResource.java
webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/SimpleRelationships.java
Modified: webservices/muse/trunk/modules/muse-wsdm-muws-api/src/org/apache/muse/ws/dm/muws/MuwsConstants.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsdm-muws-api/src/org/apache/muse/ws/dm/muws/MuwsConstants.java?rev=432629&r1=432628&r2=432629&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsdm-muws-api/src/org/apache/muse/ws/dm/muws/MuwsConstants.java (original)
+++ webservices/muse/trunk/modules/muse-wsdm-muws-api/src/org/apache/muse/ws/dm/muws/MuwsConstants.java Fri Aug 18 09:21:18 2006
@@ -239,7 +239,7 @@
//
public static final String QUERY_RELATIONSHIPS_URI =
- MUWS_P2_URI + "/QueryRelationshipsByType";
+ RELATIONSHIPS_URI + "/QueryRelationshipsByType";
public static final QName RELATIONSHIP_QNAME =
new QName(MUWS_P2_URI, "Relationship", MUWS_P2_PREFIX);
Modified: webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/QueryRelationshipsHandler.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/QueryRelationshipsHandler.java?rev=432629&r1=432628&r2=432629&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/QueryRelationshipsHandler.java (original)
+++ webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/QueryRelationshipsHandler.java Fri Aug 18 09:21:18 2006
@@ -21,7 +21,7 @@
import org.apache.muse.core.routing.AbstractMessageHandler;
import org.apache.muse.ws.addressing.soap.SoapFault;
import org.apache.muse.ws.dm.muws.MuwsConstants;
-import org.apache.muse.ws.dm.muws.RelationshipResource;
+import org.apache.muse.ws.resource.WsResource;
/**
*
@@ -50,8 +50,7 @@
public Element toXML(Object result)
{
- QueryRelationshipsResponse response =
- new QueryRelationshipsResponse((RelationshipResource[])result);
+ QueryRelationshipsResponse response = new QueryRelationshipsResponse((WsResource[])result);
return response.toXML();
}
Modified: webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/QueryRelationshipsResponse.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/QueryRelationshipsResponse.java?rev=432629&r1=432628&r2=432629&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/QueryRelationshipsResponse.java (original)
+++ webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/QueryRelationshipsResponse.java Fri Aug 18 09:21:18 2006
@@ -27,6 +27,7 @@
import org.apache.muse.ws.addressing.soap.SoapFault;
import org.apache.muse.ws.dm.muws.MuwsConstants;
import org.apache.muse.ws.dm.muws.RelationshipResource;
+import org.apache.muse.ws.resource.WsResource;
import org.apache.muse.ws.resource.remote.WsResourceClient;
/**
@@ -49,7 +50,7 @@
_relationshipsXML = XmlUtils.getElements(xml, MuwsConstants.RELATIONSHIP_QNAME);
}
- public QueryRelationshipsResponse(RelationshipResource[] matches)
+ public QueryRelationshipsResponse(WsResource[] matches)
{
if (matches == null)
throw new NullPointerException(_MESSAGES.get("NullRelationshipArray"));
@@ -57,7 +58,11 @@
_relationshipsXML = new Element[matches.length];
for (int n = 0; n < matches.length; ++n)
- _relationshipsXML[n] = matches[n].toXML();
+ {
+ RelationshipResource relationship =
+ (RelationshipResource)matches[n].getCapability(MuwsConstants.RELATIONSHIP_RESOURCE_URI);
+ _relationshipsXML[n] = relationship.toXML();
+ }
}
public WsResourceClient[] getRelationshipClients()
Modified: webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/SimpleRelationshipResource.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/SimpleRelationshipResource.java?rev=432629&r1=432628&r2=432629&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/SimpleRelationshipResource.java (original)
+++ webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/SimpleRelationshipResource.java Fri Aug 18 09:21:18 2006
@@ -106,6 +106,9 @@
Element root = XmlUtils.createElement(doc, MuwsConstants.RELATIONSHIP_QNAME);
+ Element eprXML = getWsResource().getEndpointReference().toXML();
+ XmlUtils.setElement(root, MuwsConstants.ACCESS_EPR_QNAME, eprXML);
+
String name = getName();
if (name != null)
Modified: webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/SimpleRelationships.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/SimpleRelationships.java?rev=432629&r1=432628&r2=432629&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/SimpleRelationships.java (original)
+++ webservices/muse/trunk/modules/muse-wsdm-muws-impl/src/org/apache/muse/ws/dm/muws/impl/SimpleRelationships.java Fri Aug 18 09:21:18 2006
@@ -121,6 +121,17 @@
relationship.setParticipant(participants);
+ try
+ {
+ resource.initialize();
+ manager.addResource(resource.getEndpointReference(), resource);
+ }
+
+ catch (SoapFault error)
+ {
+ throw new RelationshipCreationFailedFault(error);
+ }
+
return resource;
}
@@ -141,7 +152,7 @@
catch (SoapFault error)
{
- error.printStackTrace();
+ throw new RelationshipCreationFailedFault(error);
}
RelationshipResource relationship =
@@ -153,13 +164,13 @@
try
{
- relationship.initialize();
+ resource.initialize();
manager.addResource(resource.getEndpointReference(), resource);
}
catch (SoapFault error)
{
- error.printStackTrace();
+ throw new RelationshipCreationFailedFault(error);
}
return resource;
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org