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/07/11 02:25:40 UTC
svn commit: r420666 - in /webservices/muse/trunk/modules/muse-wsrf:
src-api/org/apache/muse/ws/resource/properties/schema/
src-api/org/apache/muse/ws/resource/properties/set/
src-api/org/apache/muse/ws/resource/properties/set/ext/
src-impl/org/apache/m...
Author: danj
Date: Mon Jul 10 17:25:39 2006
New Revision: 420666
URL: http://svn.apache.org/viewvc?rev=420666&view=rev
Log:
Fix for MUSE-36 - All WSRF public or standard operations use BaseFault as their LCD fault type,
not SoapFault. This is consistent with the rest of the WSRF API (and others built on it). The
types that were affected by this change had SoapFault where BaseFault was more appropriate
because of a simple mistake when defining the methods.
Modified:
webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/schema/ResourcePropertiesSchemaValidation.java
webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/PutResourcePropertyDocument.java
webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/SetResourceProperties.java
webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/ext/SetResourcePropertiesExtensions.java
webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java
webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/set/impl/SimpleSetCapability.java
Modified: webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/schema/ResourcePropertiesSchemaValidation.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/schema/ResourcePropertiesSchemaValidation.java?rev=420666&r1=420665&r2=420666&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/schema/ResourcePropertiesSchemaValidation.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/schema/ResourcePropertiesSchemaValidation.java Mon Jul 10 17:25:39 2006
@@ -20,8 +20,8 @@
import javax.xml.namespace.QName;
-import org.apache.muse.ws.addressing.soap.SoapFault;
import org.apache.muse.ws.resource.WsResourceCapability;
+import org.apache.muse.ws.resource.basefaults.BaseFault;
public interface ResourcePropertiesSchemaValidation
@@ -73,7 +73,7 @@
* SetResourceProperties, the implementation of the operations should
* validate the individual property being targeted, not the whole document.
*
- * @throws SoapFault
+ * @throws BaseFault
* <ul>
* <li>If the number of instances of a property is below the
* required minimum.</li>
@@ -82,9 +82,8 @@
* <li>If an instance of the property is null (the equivalent of
* an empty XML element) but the property is not nillable.</li>
* </ul>
- * @throws SoapFault
*
*/
void validateSchema()
- throws SoapFault;
+ throws BaseFault;
}
Modified: webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/PutResourcePropertyDocument.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/PutResourcePropertyDocument.java?rev=420666&r1=420665&r2=420666&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/PutResourcePropertyDocument.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/PutResourcePropertyDocument.java Mon Jul 10 17:25:39 2006
@@ -16,12 +16,12 @@
package org.apache.muse.ws.resource.properties.set;
-import org.apache.muse.ws.addressing.soap.SoapFault;
import org.w3c.dom.Element;
+import org.apache.muse.ws.resource.basefaults.BaseFault;
public interface PutResourcePropertyDocument
{
Element putResourcePropertyDocument(Element wsrpDoc)
- throws SoapFault;
+ throws BaseFault;
}
Modified: webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/SetResourceProperties.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/SetResourceProperties.java?rev=420666&r1=420665&r2=420666&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/SetResourceProperties.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/SetResourceProperties.java Mon Jul 10 17:25:39 2006
@@ -16,11 +16,11 @@
package org.apache.muse.ws.resource.properties.set;
+import org.apache.muse.ws.resource.basefaults.BaseFault;
import org.apache.muse.ws.resource.properties.get.faults.InvalidResourcePropertyQNameFault;
import org.apache.muse.ws.resource.properties.set.faults.InvalidModificationFault;
import org.apache.muse.ws.resource.properties.set.faults.SetResourcePropertyRequestFailedFault;
import org.apache.muse.ws.resource.properties.set.faults.UnableToModifyResourcePropertyFault;
-import org.apache.muse.ws.addressing.soap.SoapFault;
/**
*
@@ -67,13 +67,12 @@
* The SetResourceProperties request that contains the individual
* operations { Insert, Update, Delete } to perform on the document.
*
- * @throws SoapFault
+ * @throws BaseFault
* <ul>
* <li>If one of the individual set operations fails. Please
* review the different fault cases for each set operation in
* the SetResourcePropertiesRequests interface.</li>
* </ul>
- * @throws SoapFault
*
* @see SetResourceProperties
*
@@ -83,5 +82,5 @@
InvalidModificationFault,
SetResourcePropertyRequestFailedFault,
UnableToModifyResourcePropertyFault,
- SoapFault;
+ BaseFault;
}
Modified: webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/ext/SetResourcePropertiesExtensions.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/ext/SetResourcePropertiesExtensions.java?rev=420666&r1=420665&r2=420666&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/ext/SetResourcePropertiesExtensions.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/ext/SetResourcePropertiesExtensions.java Mon Jul 10 17:25:39 2006
@@ -18,7 +18,7 @@
import javax.xml.namespace.QName;
-import org.apache.muse.ws.addressing.soap.SoapFault;
+import org.apache.muse.ws.resource.basefaults.BaseFault;
/**
*
@@ -43,11 +43,10 @@
*
* This is just a convenience method that will call
* insertOrUpdate(QName, Object[]) with a one-element array.
- * @throws SoapFault
*
*/
void insertOrUpdate(QName property, Object value)
- throws SoapFault;
+ throws BaseFault;
/**
*
@@ -63,5 +62,5 @@
*
*/
void insertOrUpdate(QName property, Object[] values)
- throws SoapFault;
+ throws BaseFault;
}
Modified: webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java?rev=420666&r1=420665&r2=420666&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java Mon Jul 10 17:25:39 2006
@@ -30,7 +30,6 @@
import org.apache.muse.util.messages.Messages;
import org.apache.muse.util.messages.MessagesFactory;
import org.apache.muse.util.xml.XmlUtils;
-import org.apache.muse.ws.addressing.soap.SoapFault;
import org.apache.muse.ws.resource.WsResourceCapability;
import org.apache.muse.ws.resource.basefaults.BaseFault;
import org.apache.muse.ws.resource.metadata.MetadataDescriptor;
@@ -217,7 +216,7 @@
// if we get an error inserting a "required" value,
// something is totally awry - throw unchecked
//
- catch (SoapFault fault)
+ catch (BaseFault fault)
{
throw new RuntimeException(fault.getMessage(), fault);
}
@@ -753,7 +752,7 @@
}
public synchronized void setResourceProperties(SetRequest request)
- throws SoapFault
+ throws BaseFault
{
List ops = request.getRequestComponents();
@@ -807,7 +806,7 @@
return getResourcePropertyDocument();
}
- catch (SoapFault error)
+ catch (BaseFault error)
{
throw new RuntimeException(error.getMessage(), error);
}
@@ -827,7 +826,7 @@
return (Element)factory.importNode(wsrp, true);
}
- catch (SoapFault error)
+ catch (BaseFault error)
{
throw new RuntimeException(error.getMessage(), error);
}
Modified: webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/set/impl/SimpleSetCapability.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/set/impl/SimpleSetCapability.java?rev=420666&r1=420665&r2=420666&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/set/impl/SimpleSetCapability.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/set/impl/SimpleSetCapability.java Mon Jul 10 17:25:39 2006
@@ -22,10 +22,11 @@
import org.apache.muse.core.routing.MessageHandler;
import org.apache.muse.util.ReflectUtils;
+import org.apache.muse.ws.addressing.soap.SoapFault;
+import org.apache.muse.ws.resource.basefaults.BaseFault;
import org.apache.muse.ws.resource.impl.AbstractWsResourceCapability;
import org.apache.muse.ws.resource.properties.set.SetCapability;
import org.apache.muse.ws.resource.properties.set.SetRequest;
-import org.apache.muse.ws.addressing.soap.SoapFault;
public class SimpleSetCapability
extends AbstractWsResourceCapability implements SetCapability
@@ -49,13 +50,13 @@
}
public Element putResourcePropertyDocument(Element wsrpDoc)
- throws SoapFault
+ throws BaseFault
{
return getWsResource().getPropertyCollection().putResourcePropertyDocument(wsrpDoc);
}
public void setResourceProperties(SetRequest request)
- throws SoapFault
+ throws BaseFault
{
getWsResource().getPropertyCollection().setResourceProperties(request);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org