You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by ip...@apache.org on 2005/03/04 01:45:27 UTC

svn commit: r156111 - in incubator/apollo/trunk/src/java/org/apache/ws: resource/faults/ resource/properties/faults/ resource/properties/v1_2_draft05/porttype/impl/ util/

Author: ips
Date: Thu Mar  3 16:45:23 2005
New Revision: 156111

URL: http://svn.apache.org/viewcvs?view=rev&rev=156111
Log:
more fault work

Modified:
    incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java
    incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/BaseFaultException.java
    incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ErrorCode.java
    incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ResoureKeyHeaderNotFoundFaultException.java
    incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/DeleteResourcePropertyRequestFailedFaultException.java
    incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InsertResourcePropertyRequestFailedFaultException.java
    incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java
    incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java
    incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UpdateResourcePropertyRequestFailedFaultException.java
    incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java
    incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java
    incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java
    incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java?view=diff&r1=156110&r2=156111
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java Thu Mar  3 16:45:23 2005
@@ -47,7 +47,7 @@
 
     private Calendar m_timestamp;
     private EndpointReferenceType m_originator; // TODO: use our EPR facade instead of the Apache Addressing type
-    private NewErrorCode m_errorCode;
+    private ErrorCode m_errorCode;
     private Description[] m_description;
     private AbstractBaseFaultException[] m_faultCause;
     private NamespaceVersionHolder m_namespaceSet;
@@ -90,7 +90,7 @@
      *
      * @param errorCode DOCUMENT_ME
      */
-    public void setErrorCode( NewErrorCode errorCode )
+    public void setErrorCode( ErrorCode errorCode )
     {
         m_errorCode = errorCode;
     }
@@ -100,7 +100,7 @@
      *
      * @return DOCUMENT_ME
      */
-    public NewErrorCode getErrorCode()
+    public ErrorCode getErrorCode()
     {
         return m_errorCode;
     }
@@ -165,7 +165,7 @@
         return m_timestamp;
     }
 
-    protected NamespaceVersionHolder getNamespaceSet()
+    public NamespaceVersionHolder getNamespaceSet()
     {
         return m_namespaceSet;
     }

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/BaseFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/BaseFaultException.java?view=diff&r1=156110&r2=156111
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/BaseFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/BaseFaultException.java Thu Mar  3 16:45:23 2005
@@ -22,11 +22,11 @@
 import javax.xml.namespace.QName;
 
 /**
- * WS-BaseFaults BaseFault element implemented as a Java exception.
+ * WS-BaseFaults BaseFault XSD global element implemented as a Java exception.
  *
  * @author Ian P. Springer
  */
-public final class NewBaseFaultException
+public final class BaseFaultException
         extends AbstractBaseFaultException
 {
 
@@ -37,7 +37,7 @@
      *
      * @param faultString a message describing this fault
      */
-    public NewBaseFaultException( NamespaceVersionHolder namespaces, String faultString )
+    public BaseFaultException( NamespaceVersionHolder namespaces, String faultString )
     {
         super( namespaces, faultString );
     }

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ErrorCode.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ErrorCode.java?view=diff&r1=156110&r2=156111
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ErrorCode.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ErrorCode.java Thu Mar  3 16:45:23 2005
@@ -29,18 +29,18 @@
  *
  * @author Ian P. Springer
  */
-public class NewErrorCode
+public class ErrorCode
 {
    public static final Messages MSG = MessagesImpl.getInstance();
    private URI           m_dialect; // in the XML type, this is a required attribute on the top-level ErrorCode element
    private XmlObject[]   m_content;
 
    /**
-    * Creates a new {@link NewErrorCode} object.
+    * Creates a new ErrorCode with the specified dialect.
     *
     * @param dialect DOCUMENT_ME
     */
-   public NewErrorCode( URI dialect )
+   public ErrorCode( URI dialect )
    {
       m_dialect = dialect;
    }
@@ -86,4 +86,5 @@
                                         .append( MSG.getMessage(Keys.CONTENT),
                                                  Arrays.asList( m_content ) ).toString(  );
    }
+    
 }

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ResoureKeyHeaderNotFoundFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ResoureKeyHeaderNotFoundFaultException.java?view=diff&r1=156110&r2=156111
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ResoureKeyHeaderNotFoundFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ResoureKeyHeaderNotFoundFaultException.java Thu Mar  3 16:45:23 2005
@@ -21,57 +21,48 @@
 import org.apache.ws.resource.NamespaceConstants;
 import org.apache.ws.resource.i18n.Keys;
 import org.apache.ws.resource.i18n.MessagesImpl;
+import org.apache.ws.util.XmlBeanUtils;
 import org.apache.ws.util.i18n.Messages;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
 
 import javax.xml.namespace.QName;
-import javax.xml.rpc.soap.SOAPFaultException;
-import javax.xml.soap.Detail;
-import javax.xml.soap.DetailEntry;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
 
 /**
- * LOG-DONE
+ * A fault that is thrown when the expected resourceKey header is not found in a SOAP request.
+ *
  * @author Ian P. Springer
  */
 public class ResoureKeyHeaderNotFoundFaultException
-   extends SOAPFaultException
+        extends FaultException
 {
-   public static final Messages MSG = MessagesImpl.getInstance();
+    private static final Messages MSG = MessagesImpl.getInstance();
     private static final Log LOG = LogFactory.getLog( ResoureKeyHeaderNotFoundFaultException.class );
-   /**
-    * DOCUMENT_ME
-    */
-   private static final String FAULT_LOCAL_NAME = "ResoureKeyHeaderNotFoundFault";
-   private static final QName NAME =
-      new QName( NamespaceConstants.NSURI_APACHE_WS_RESOURCE, FAULT_LOCAL_NAME,
-                 NamespaceConstants.NSPREFIX_APACHE_WS_RESOURCE );
-
+    /**
+     * DOCUMENT_ME
+     */
+    private static final String FAULT_LOCAL_NAME = "ResoureKeyHeaderNotFoundFault";
 
     /**
-    * Creates a new {@link ResoureKeyHeaderNotFoundFaultException} object.
-    *
-    * @param expectedHeaderName DOCUMENT_ME
-    */
-   public ResoureKeyHeaderNotFoundFaultException( QName expectedHeaderName )
-   {
-      super(Soap1_1Constants.FAULT_CLIENT, null,null, createDetail(MSG.getMessage(Keys.EXPECTED_ADDRESSING_HEADER,String.valueOf( expectedHeaderName ) )));
-   }
+     * Creates a new {@link ResoureKeyHeaderNotFoundFaultException} object.
+     *
+     * @param expectedHeaderName DOCUMENT_ME
+     */
+    public ResoureKeyHeaderNotFoundFaultException( QName expectedHeaderName )
+    {
+        super( Soap1_1Constants.FAULT_CLIENT, null );
+        try
+        {
+            XmlObject xBean = XmlObject.Factory.parse(
+                    "<" + FAULT_LOCAL_NAME + " xmlns=\"" + NamespaceConstants.NSURI_APACHE_WS_RESOURCE + "\" />" );
+            XmlBeanUtils.setValue( xBean,
+                    MSG.getMessage( Keys.EXPECTED_ADDRESSING_HEADER, String.valueOf( expectedHeaderName ) ) );
+            addDetailEntry( xBean );
+        }
+        catch ( XmlException xe )
+        {
+            LOG.error( xe );
+        }
+    }
 
-   private static Detail createDetail(String msg)
-   {
-       try
-       {
-           SOAPFactory soapFactory = SOAPFactory.newInstance();
-           Detail detail = soapFactory.createDetail();
-           DetailEntry detailEntry = detail.addDetailEntry(soapFactory.createName(FAULT_LOCAL_NAME,NamespaceConstants.NSPREFIX_APACHE_WS_RESOURCE, NamespaceConstants.NSURI_APACHE_WS_RESOURCE ));
-           detailEntry.addTextNode(msg);
-           return detail;
-       }
-       catch (SOAPException e)
-       {
-           LOG.error(e);
-       }
-       return null;
-   }
 }

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/DeleteResourcePropertyRequestFailedFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/DeleteResourcePropertyRequestFailedFaultException.java?view=diff&r1=156110&r2=156111
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/DeleteResourcePropertyRequestFailedFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/DeleteResourcePropertyRequestFailedFaultException.java Thu Mar  3 16:45:23 2005
@@ -15,35 +15,44 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.faults;
 
-import org.apache.ws.resource.faults.BaseFaultException;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
 import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
+
 import javax.xml.namespace.QName;
 
 /**
  * @author Sal Campana
  */
 public class DeleteResourcePropertyRequestFailedFaultException
-   extends BaseFaultException
+        extends AbstractBaseFaultException
 {
-   /**
-    * Creates a new {@link DeleteResourcePropertyRequestFailedFaultException} object.
-    *
-    * @param namespaces DOCUMENT_ME
-    * @param description DOCUMENT_ME
-    */
-   public DeleteResourcePropertyRequestFailedFaultException( NamespaceVersionHolder namespaces,
-                                                             String[]               description )
-   {
-      super( namespaces,
-             getQName( namespaces ) );
-      setDescription( description );
-   }
-
-   private static QName getQName( NamespaceVersionHolder namespaces )
-   {
-      return new QName( namespaces.getPropertiesXsdNamespace(  ),
-                        "DeleteResourcePropertyRequestFailedFault",
-                        ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
-   }
+
+    private QName m_name;
+
+    /**
+     * Creates a new {@link DeleteResourcePropertyRequestFailedFaultException} object.
+     *
+     * @param namespaces  DOCUMENT_ME
+     * @param propName the name of the property that could not be deleted
+     */
+    public DeleteResourcePropertyRequestFailedFaultException( NamespaceVersionHolder namespaces,
+                                                              QName propName )
+    {
+        super( namespaces,
+                "Failed to delete property named " + propName );
+        m_name = new QName( namespaces.getPropertiesXsdNamespace(),
+                "DeleteResourcePropertyRequestFailedFault",
+                "wsrp" );
+    }
+
+    /**
+     * Returns the element name for this base fault.
+     *
+     * @return the element name for this base fault
+     */
+    public QName getBaseFaultName()
+    {
+        return m_name;
+    }
+
 }

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InsertResourcePropertyRequestFailedFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InsertResourcePropertyRequestFailedFaultException.java?view=diff&r1=156110&r2=156111
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InsertResourcePropertyRequestFailedFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InsertResourcePropertyRequestFailedFaultException.java Thu Mar  3 16:45:23 2005
@@ -15,35 +15,44 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.faults;
 
-import org.apache.ws.resource.faults.BaseFaultException;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
+import org.apache.ws.resource.faults.Description;
 import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
+
 import javax.xml.namespace.QName;
 
 /**
  * @author Sal Campana
  */
 public class InsertResourcePropertyRequestFailedFaultException
-   extends BaseFaultException
+        extends AbstractBaseFaultException
 {
-   /**
-    * Creates a new {@link InsertResourcePropertyRequestFailedFaultException} object.
-    *
-    * @param namespaces DOCUMENT_ME
-    * @param description DOCUMENT_ME
-    */
-   public InsertResourcePropertyRequestFailedFaultException( NamespaceVersionHolder namespaces,
-                                                             String[]               description )
-   {
-      super( namespaces,
-             getQName( namespaces ) );
-      setDescription( description );
-   }
 
-   private static QName getQName( NamespaceVersionHolder namespaces )
-   {
-      return new QName( namespaces.getPropertiesXsdNamespace(  ),
-                        "InsertResourcePropertyRequestFailedFault",
-                        ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
-   }
+    private QName m_name;
+
+    /**
+     * Creates a new {@link InsertResourcePropertyRequestFailedFaultException} object.
+     *
+     * @param namespaces  DOCUMENT_ME
+     * @param description DOCUMENT_ME
+     */
+    public InsertResourcePropertyRequestFailedFaultException( NamespaceVersionHolder namespaces,
+                                                              Description[] description )
+    {
+        super( namespaces,
+                "" );
+        m_name = new QName( namespaces.getPropertiesXsdNamespace(),
+                "InsertResourcePropertyRequestFailedFault",
+                "wsrp" );
+    }
+
+    /**
+     * Returns the element name for this base fault.
+     *
+     * @return the element name for this base fault
+     */
+    public QName getBaseFaultName()
+    {
+        return m_name;
+    }
 }

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java?view=diff&r1=156110&r2=156111
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java Thu Mar  3 16:45:23 2005
@@ -15,35 +15,46 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.faults;
 
-import org.apache.ws.resource.faults.BaseFaultException;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
+import org.apache.ws.resource.faults.Description;
 import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
+
 import javax.xml.namespace.QName;
 
 /**
  * @author Sal Campana
  */
 public class InvalidInsertResourcePropertiesRequestContentFaultException
-   extends BaseFaultException
+        extends AbstractBaseFaultException
 {
-   /**
-    * Creates a new {@link InvalidInsertResourcePropertiesRequestContentFaultException} object.
-    *
-    * @param namespaces DOCUMENT_ME
-    * @param description DOCUMENT_ME
-    */
-   public InvalidInsertResourcePropertiesRequestContentFaultException( NamespaceVersionHolder namespaces,
-                                                                       String[]               description )
-   {
-      super( namespaces,
-             getQName( namespaces ) );
-      setDescription( description );
-   }
-
-   private static QName getQName( NamespaceVersionHolder namespaces )
-   {
-      return new QName( namespaces.getPropertiesXsdNamespace(  ),
-                        "InvalidInsertResourcePropertiesRequestContentFault",
-                        ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
-   }
+
+    private QName m_name;
+
+    /**
+     * Creates a new {@link InvalidInsertResourcePropertiesRequestContentFaultException} object.
+     *
+     * @param namespaces  DOCUMENT_ME
+     * @param description DOCUMENT_ME
+     */
+    public InvalidInsertResourcePropertiesRequestContentFaultException( NamespaceVersionHolder namespaces,
+                                                                        Description[] description )
+    {
+        super( namespaces,
+                "" );
+        m_name = new QName( namespaces.getPropertiesXsdNamespace(),
+                "InvalidInsertResourcePropertiesRequestContentFault",
+                "wsrp" );
+        setDescription( description );
+    }
+
+    /**
+     * Returns the element name for this base fault.
+     *
+     * @return the element name for this base fault
+     */
+    public QName getBaseFaultName()
+    {
+        return m_name;
+    }
+
 }

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java?view=diff&r1=156110&r2=156111
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java Thu Mar  3 16:45:23 2005
@@ -15,35 +15,45 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.faults;
 
-import org.apache.ws.resource.faults.BaseFaultException;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
+import org.apache.ws.resource.faults.Description;
 import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
+
 import javax.xml.namespace.QName;
 
 /**
  * @author Sal Campana
  */
 public class InvalidUpdateResourcePropertiesRequestContentFaultException
-   extends BaseFaultException
+        extends AbstractBaseFaultException
 {
-   /**
-    * Creates a new {@link InvalidUpdateResourcePropertiesRequestContentFaultException} object.
-    *
-    * @param namespaces DOCUMENT_ME
-    * @param description DOCUMENT_ME
-    */
-   public InvalidUpdateResourcePropertiesRequestContentFaultException( NamespaceVersionHolder namespaces,
-                                                                       String[]               description )
-   {
-      super( namespaces,
-             getQName( namespaces ) );
-      setDescription( description );
-   }
-
-   private static QName getQName( NamespaceVersionHolder namespaces )
-   {
-      return new QName( namespaces.getPropertiesXsdNamespace(  ),
-                        "InvalidUpdateResourcePropertiesRequestContentFault",
-                        ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
-   }
+
+    private QName m_name;
+
+    /**
+     * Creates a new {@link InvalidUpdateResourcePropertiesRequestContentFaultException} object.
+     *
+     * @param namespaces  DOCUMENT_ME
+     * @param description DOCUMENT_ME
+     */
+    public InvalidUpdateResourcePropertiesRequestContentFaultException( NamespaceVersionHolder namespaces,
+                                                                        Description[] description )
+    {
+        super( namespaces, "" );
+        m_name = new QName( namespaces.getPropertiesXsdNamespace(),
+                "InvalidUpdateResourcePropertiesRequestContentFault",
+                "wsrp" );
+        setDescription( description );
+    }
+
+    /**
+     * Returns the element name for this base fault.
+     *
+     * @return the element name for this base fault
+     */
+    public QName getBaseFaultName()
+    {
+        return m_name;
+    }
+
 }

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UpdateResourcePropertyRequestFailedFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UpdateResourcePropertyRequestFailedFaultException.java?view=diff&r1=156110&r2=156111
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UpdateResourcePropertyRequestFailedFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UpdateResourcePropertyRequestFailedFaultException.java Thu Mar  3 16:45:23 2005
@@ -15,35 +15,45 @@
  *=============================================================================*/
 package org.apache.ws.resource.properties.faults;
 
-import org.apache.ws.resource.faults.BaseFaultException;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
+import org.apache.ws.resource.faults.Description;
 import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
+
 import javax.xml.namespace.QName;
 
 /**
  * @author Sal Campana
  */
 public class UpdateResourcePropertyRequestFailedFaultException
-   extends BaseFaultException
+        extends AbstractBaseFaultException
 {
-   /**
-    * Creates a new {@link UpdateResourcePropertyRequestFailedFaultException} object.
-    *
-    * @param namespaces DOCUMENT_ME
-    * @param description DOCUMENT_ME
-    */
-   public UpdateResourcePropertyRequestFailedFaultException( NamespaceVersionHolder namespaces,
-                                                             String[]               description )
-   {
-      super( namespaces,
-             getQName( namespaces ) );
-      setDescription( description );
-   }
 
-   private static QName getQName( NamespaceVersionHolder namespaces )
-   {
-      return new QName( namespaces.getPropertiesXsdNamespace(  ),
-                        "UpdateResourcePropertyRequestFailedFault",
-                        ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
-   }
+    private QName m_name;
+
+    /**
+     * Creates a new {@link UpdateResourcePropertyRequestFailedFaultException} object.
+     *
+     * @param namespaces  DOCUMENT_ME
+     * @param description DOCUMENT_ME
+     */
+    public UpdateResourcePropertyRequestFailedFaultException( NamespaceVersionHolder namespaces,
+                                                              Description[] description )
+    {
+        super( namespaces,
+                "" );
+        m_name = new QName( namespaces.getPropertiesXsdNamespace(),
+                "UpdateResourcePropertyRequestFailedFault",
+                "wsrf-rp" );
+        setDescription( description );
+    }
+
+    /**
+     * Returns the element name for this base fault.
+     *
+     * @return the element name for this base fault
+     */
+    public QName getBaseFaultName()
+    {
+        return m_name;
+    }
 }

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java?view=diff&r1=156110&r2=156111
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java Thu Mar  3 16:45:23 2005
@@ -11,6 +11,8 @@
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesDocument;
 import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesResponseDocument;
 
+import javax.xml.namespace.QName;
+
 /**
  * @author Ian Springer
  */
@@ -42,17 +44,18 @@
     {
         DeleteResourcePropertiesResponseDocument responseDoc = createResponseDocument();
         DeleteResourcePropertiesDocument.DeleteResourceProperties requestElem = requestDoc.getDeleteResourceProperties();
+        QName nameOfPropToBeDeleted = requestElem.getDelete().getResourceProperty();
         try
         {
-            deleteResourceProperty( requestElem.getDelete().getResourceProperty() );
+            deleteResourceProperty( nameOfPropToBeDeleted );
         }
         catch (SetResourcePropertyRequestFailedFaultException se)
         {
-            throw new DeleteResourcePropertyRequestFailedFaultException(se.getNamespaces(),se.getDescription());
+            throw new DeleteResourcePropertyRequestFailedFaultException(se.getNamespaceSet(),nameOfPropToBeDeleted);
         }
         catch (InvalidSetResourcePropertiesRequestContentFaultException  is)
         {
-            throw new DeleteResourcePropertyRequestFailedFaultException(is.getNamespaces(),is.getDescription());
+            throw new DeleteResourcePropertyRequestFailedFaultException(is.getNamespaceSet(),nameOfPropToBeDeleted);
         }
         return responseDoc;
     }

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java?view=diff&r1=156110&r2=156111
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java Thu Mar  3 16:45:23 2005
@@ -51,11 +51,11 @@
         }
         catch (InvalidSetResourcePropertiesRequestContentFaultException e)
         {
-            throw new InvalidInsertResourcePropertiesRequestContentFaultException(e.getNamespaces(), e.getDescription());
+            throw new InvalidInsertResourcePropertiesRequestContentFaultException(e.getNamespaceSet(), e.getDescription());
         }
         catch (SetResourcePropertyRequestFailedFaultException sr)
         {
-            throw new InsertResourcePropertyRequestFailedFaultException(sr.getNamespaces(), sr.getDescription());
+            throw new InsertResourcePropertyRequestFailedFaultException(sr.getNamespaceSet(), sr.getDescription());
         }
         return responseDoc;
     }

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java?view=diff&r1=156110&r2=156111
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java Thu Mar  3 16:45:23 2005
@@ -49,11 +49,11 @@
         }
         catch (SetResourcePropertyRequestFailedFaultException e)
         {
-            throw new UpdateResourcePropertyRequestFailedFaultException(e.getNamespaces(), e.getDescription());
+            throw new UpdateResourcePropertyRequestFailedFaultException(e.getNamespaceSet(), e.getDescription());
         }
         catch (InvalidSetResourcePropertiesRequestContentFaultException e)
         {
-            throw new InvalidUpdateResourcePropertiesRequestContentFaultException(e.getNamespaces(), e.getDescription());
+            throw new InvalidUpdateResourcePropertiesRequestContentFaultException(e.getNamespaceSet(), e.getDescription());
         }
         return responseDoc;
     }

Modified: incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java?view=diff&r1=156110&r2=156111
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java Thu Mar  3 16:45:23 2005
@@ -522,6 +522,18 @@
         return xBean;
     }
 
+    /**
+     * 
+     * @param elemName
+     * @return
+     */
+    public XmlObject newInstance( QName elemName )
+    {
+        XmlObject xBean = XmlObject.Factory.newInstance();
+        // TODO: finish implementing
+        return xBean;
+    }
+
     private static QName toQName( String value, XmlObject xBean )
     {
         int colonIndex = value.indexOf( ':' );



---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org