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 00:57:55 UTC
svn commit: r156103 - in incubator/apollo/trunk/src/java/org/apache/ws:
resource/faults/ resource/faults/axis/ resource/handler/axis/
resource/lifetime/faults/ resource/properties/faults/
resource/properties/impl/ util/
Author: ips
Date: Thu Mar 3 15:57:50 2005
New Revision: 156103
URL: http://svn.apache.org/viewcvs?view=rev&rev=156103
Log:
completed new Faults infrastructure
Added:
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/FaultException.java
Removed:
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/BaseFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/axis/
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/NewInvalidResourcePropertyQNameFaultException.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/NewBaseFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceNotDestroyedFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceUnknownFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidQueryExpressionFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidResourcePropertyQNameFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/QueryEvaluationErrorFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/ResourceUnknownFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/SetResourcePropertyRequestFailedFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnableToModifyResourcePropertyFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnknownQueryExpressionDialectFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractGetResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java
Added: 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=auto&rev=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java (added)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java Thu Mar 3 15:57:50 2005
@@ -0,0 +1,317 @@
+/*=============================================================================*
+ * Copyright 2005 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *=============================================================================*/
+package org.apache.ws.resource.faults;
+
+import org.apache.axis.message.addressing.EndpointReferenceType;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.ws.Soap1_1Constants;
+import org.apache.ws.resource.i18n.Keys;
+import org.apache.ws.resource.i18n.MessagesImpl;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.util.XmlBeanNameUtils;
+import org.apache.ws.util.XmlBeanUtils;
+import org.apache.ws.util.i18n.Messages;
+import org.apache.xmlbeans.XmlObject;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.JAXRPCException;
+import javax.xml.soap.Detail;
+import javax.xml.soap.DetailEntry;
+import java.lang.reflect.Method;
+import java.util.Calendar;
+
+/**
+ * The WS-BaseFaults base fault type implemented as a Java exception.
+ *
+ * @author Ian P. Springer
+ */
+public abstract class AbstractBaseFaultException extends FaultException
+{
+
+ private static final Messages MSG = MessagesImpl.getInstance();
+
+ private static final QName DEFAULT_FAULT_CODE = Soap1_1Constants.FAULT_CLIENT;
+
+ private Calendar m_timestamp;
+ private EndpointReferenceType m_originator; // TODO: use our EPR facade instead of the Apache Addressing type
+ private NewErrorCode m_errorCode;
+ private Description[] m_description;
+ private AbstractBaseFaultException[] m_faultCause;
+ private NamespaceVersionHolder m_namespaceSet;
+ private DetailEntry m_detailEntry;
+
+ public AbstractBaseFaultException( NamespaceVersionHolder namespaceSet, String faultString, QName faultCode )
+ {
+ super( faultCode, faultString );
+ m_namespaceSet = namespaceSet;
+ m_timestamp = Calendar.getInstance();
+ }
+
+ public AbstractBaseFaultException( NamespaceVersionHolder namespaceSet, String faultString )
+ {
+ this( namespaceSet, faultString, DEFAULT_FAULT_CODE );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @param description DOCUMENT_ME
+ */
+ public void setDescription( Description[] description )
+ {
+ m_description = description;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public Description[] getDescription()
+ {
+ return m_description;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @param errorCode DOCUMENT_ME
+ */
+ public void setErrorCode( NewErrorCode errorCode )
+ {
+ m_errorCode = errorCode;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public NewErrorCode getErrorCode()
+ {
+ return m_errorCode;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @param faultCause DOCUMENT_ME
+ */
+ public void setFaultCause( AbstractBaseFaultException[] faultCause )
+ {
+ m_faultCause = faultCause;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public AbstractBaseFaultException[] getFaultCause()
+ {
+ return m_faultCause;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @param originator DOCUMENT_ME
+ */
+ public void setOriginator( EndpointReferenceType originator )
+ {
+ m_originator = originator;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public EndpointReferenceType getOriginator()
+ {
+ return m_originator;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @param timestamp DOCUMENT_ME
+ */
+ public void setTimestamp( Calendar timestamp )
+ {
+ m_timestamp = timestamp;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public Calendar getTimestamp()
+ {
+ return m_timestamp;
+ }
+
+ protected NamespaceVersionHolder getNamespaceSet()
+ {
+ return m_namespaceSet;
+ }
+
+ public abstract QName getBaseFaultName();
+
+ public Detail getDetail()
+ {
+ updateDetail();
+ return super.getDetail();
+ }
+
+ public XmlObject toXmlObject()
+ {
+ if ( m_description == null )
+ {
+ m_description = new Description[]{new Description( getFaultString() )};
+ }
+ XmlObject baseFaultXBean = createBaseFaultXmlBean();
+ populateBaseFaultXmlBean( baseFaultXBean );
+ return baseFaultXBean;
+ }
+
+ /**
+ * Returns a string representation of this exception.
+ *
+ * @return a string representation of this exception
+ */
+ public String toString()
+ {
+ return new ToStringBuilder( this ).append( MSG.getMessage( Keys.FAULTCODE ),
+ getFaultCode() )
+ .append( MSG.getMessage( Keys.FAULTSTRING ),
+ getFaultString() ).append( MSG.getMessage( Keys.DESCRIPTION ), m_description )
+ .append( MSG.getMessage( Keys.ERRORCODE ), m_errorCode ).append( MSG.getMessage( Keys.FAULTCAUSE ),
+ m_faultCause )
+ .toString();
+ }
+
+ private XmlObject createBaseFaultXmlBean()
+ {
+ try
+ {
+ String docFactoryClassName = XmlBeanNameUtils.getDocumentElementXmlBeanFactoryClassName( getBaseFaultName() );
+ Class docFactoryClass = Class.forName( docFactoryClassName );
+ Method newInstanceMethod = docFactoryClass.getMethod( "newInstance", new Class[0] );
+ XmlObject docXBean = (XmlObject) newInstanceMethod.invoke( null, new Object[0] );
+ Class docXBeanClass = docXBean.getClass();
+ Method addNewMethod = docXBeanClass.getMethod( "addNew" + XmlBeanNameUtils.getElementXmlBeanUnqualifiedClassName( getBaseFaultName() ), new Class[0] );
+ XmlObject xBean = (XmlObject) addNewMethod.invoke( docXBean, new Object[0] );
+ return xBean;
+ }
+ catch ( Exception e )
+ {
+ throw new JAXRPCException( "Failed to create strongly-typed XmlBean for global element with name " + getBaseFaultName() );
+ }
+ }
+
+ private void populateBaseFaultXmlBean( XmlObject baseFaultXBean )
+ {
+ if ( m_namespaceSet instanceof org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.NamespaceVersionHolderImpl )
+ {
+ org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSBaseFaults12Draft03.BaseFaultType baseFaultType = (org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSBaseFaults12Draft03.BaseFaultType) baseFaultXBean;
+ baseFaultType.setTimestamp( m_timestamp );
+ if ( m_description != null )
+ {
+ for ( int i = 0; i < m_description.length; i++ )
+ {
+ org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSBaseFaults12Draft03.BaseFaultType.Description description = baseFaultType.addNewDescription();
+ description.setStringValue( m_description[i].getValue() );
+ if ( m_description[i].getLang() != null )
+ {
+ description.setLang( m_description[i].getLang() );
+ }
+ }
+ }
+ if ( m_errorCode != null )
+ {
+ org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSBaseFaults12Draft03.BaseFaultType.ErrorCode errorCode = baseFaultType.addNewErrorCode();
+ errorCode.setDialect( m_errorCode.getDialect().toString() );
+ XmlObject[] elems = m_errorCode.getContent();
+ for ( int i = 0; i < elems.length; i++ )
+ {
+ XmlBeanUtils.addChildElement( errorCode, elems[i] );
+ }
+ }
+ if ( m_faultCause != null )
+ {
+ for ( int i = 0; i < m_faultCause.length; i++ )
+ {
+ XmlBeanUtils.addChildElement( baseFaultType, m_faultCause[i].toXmlObject() );
+ }
+ }
+ if ( m_originator != null )
+ {
+ // TODO
+ }
+ }
+ else
+ {
+ org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSBaseFaults12Draft01.BaseFaultType baseFaultType = (org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSBaseFaults12Draft01.BaseFaultType) baseFaultXBean;
+ baseFaultType.setTimestamp( m_timestamp );
+ if ( m_description != null )
+ {
+ for ( int i = 0; i < m_description.length; i++ )
+ {
+ org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSBaseFaults12Draft01.BaseFaultType.Description description = baseFaultType.addNewDescription();
+ description.setStringValue( m_description[i].getValue() );
+ if ( m_description[i].getLang() != null )
+ {
+ description.setLang( m_description[i].getLang() );
+ }
+ }
+ }
+ if ( m_errorCode != null )
+ {
+ org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSBaseFaults12Draft01.BaseFaultType.ErrorCode errorCode = baseFaultType.addNewErrorCode();
+ errorCode.setDialect( m_errorCode.getDialect().toString() );
+ XmlObject[] elems = m_errorCode.getContent();
+ for ( int i = 0; i < elems.length; i++ )
+ {
+ XmlBeanUtils.addChildElement( errorCode, elems[i] );
+ }
+ }
+ if ( m_faultCause != null )
+ {
+ for ( int i = 0; i < m_faultCause.length; i++ )
+ {
+ XmlBeanUtils.addChildElement( baseFaultType, m_faultCause[i].toXmlObject() );
+ }
+ }
+ if ( m_originator != null )
+ {
+ // TODO
+ }
+ }
+ }
+
+ private void updateDetail()
+ {
+ XmlObject baseFaultDocXBean = toXmlObject();
+ if ( m_detailEntry != null )
+ {
+ m_detailEntry.detachNode();
+ }
+ m_detailEntry = addDetailEntry( baseFaultDocXBean );
+ }
+
+}
Added: incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/FaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/FaultException.java?view=auto&rev=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/FaultException.java (added)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/FaultException.java Thu Mar 3 15:57:50 2005
@@ -0,0 +1,98 @@
+/*=============================================================================*
+ * Copyright 2005 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *=============================================================================*/
+package org.apache.ws.resource.faults;
+
+import org.apache.ws.util.SaajUtils;
+import org.apache.ws.util.XmlBeanUtils;
+import org.apache.xmlbeans.XmlObject;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.JAXRPCException;
+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;
+
+/**
+ * Subclass of JAX-RPC {@link SOAPFaultException} that adds convenient methods for
+ * adding Detail entries. The entries may be specified as either DOM nodes or XmlBeans.
+ *
+ * @author Ian P. Springer
+ */
+public class FaultException extends SOAPFaultException
+{
+
+ private Detail m_detail;
+
+ protected FaultException( QName faultCode, String faultString, String faultActor, Detail detail )
+ {
+ super( faultCode, faultString, faultActor, detail );
+ m_detail = detail;
+ }
+
+ protected FaultException( QName faultCode, String faultString, String faultActor )
+ {
+ this( faultCode, faultString, faultActor, createDetail() );
+ }
+
+ protected FaultException( QName faultCode, String faultString )
+ {
+ this( faultCode, faultString, null );
+ }
+
+ private static Detail createDetail()
+ {
+ try
+ {
+ return SOAPFactory.newInstance().createDetail();
+ }
+ catch ( SOAPException soape )
+ {
+ throw new JAXRPCException( soape );
+ }
+ }
+
+ public DetailEntry addDetailEntry( XmlObject xmlElem )
+ {
+ XmlObject docXBean = XmlBeanUtils.getDocument( xmlElem );
+ return addDetailEntry( ((Document)docXBean.newDomNode()).getDocumentElement() );
+ }
+
+ public DetailEntry addDetailEntry( Element domElem )
+ {
+ if ( m_detail == null )
+ {
+ throw new IllegalStateException( "Detail entry cannot be added because detail is null." );
+ }
+ try
+ {
+ return SaajUtils.addDetailEntry( m_detail, domElem );
+ }
+ catch ( SOAPException soape )
+ {
+ throw new JAXRPCException( soape );
+ }
+ }
+
+ public Detail getDetail()
+ {
+ return m_detail;
+ }
+
+}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/NewBaseFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/NewBaseFaultException.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/NewBaseFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/NewBaseFaultException.java Thu Mar 3 15:57:50 2005
@@ -1,5 +1,5 @@
/*=============================================================================*
- * Copyright 2005 The Apache Software Foundation
+ * Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,277 +15,41 @@
*=============================================================================*/
package org.apache.ws.resource.faults;
-import org.apache.axis.message.addressing.EndpointReferenceType;
+import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.util.XmlBeanUtils;
-import org.apache.ws.Soap1_1Constants;
-import org.apache.xmlbeans.XmlObject;
+import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
-import javax.xml.soap.Detail;
-import javax.xml.soap.DetailEntry;
-import java.util.Calendar;
/**
- * The WS-BaseFaults base fault type implemented as a Java exception.
+ * WS-BaseFaults BaseFault element implemented as a Java exception.
*
* @author Ian P. Springer
*/
-public class NewBaseFaultException extends AbstractFaultException
+public final class NewBaseFaultException
+ extends AbstractBaseFaultException
{
- private static final QName DEFAULT_FAULT_CODE = Soap1_1Constants.FAULT_CLIENT;
-
- private Calendar m_timestamp;
- private EndpointReferenceType m_originator; // TODO: use our EPR facade instead of the Apache Addressing type
- private NewErrorCode m_errorCode;
- private Description[] m_description;
- private NewBaseFaultException[] m_faultCause;
- private NamespaceVersionHolder m_namespaceSet;
- private DetailEntry m_detailEntry;
-
- public NewBaseFaultException( NamespaceVersionHolder namespaceSet, String faultString, QName faultCode )
- {
- super( faultCode, faultString );
- m_namespaceSet = namespaceSet;
- m_timestamp = Calendar.getInstance();
- }
-
- public NewBaseFaultException( NamespaceVersionHolder namespaceSet, String faultString )
- {
- this( namespaceSet, faultString, DEFAULT_FAULT_CODE );
- }
-
- /**
- * DOCUMENT_ME
- *
- * @param description DOCUMENT_ME
- */
- public void setDescription( Description[] description )
- {
- m_description = description;
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public Description[] getDescription()
- {
- return m_description;
- }
-
- /**
- * DOCUMENT_ME
- *
- * @param errorCode DOCUMENT_ME
- */
- public void setErrorCode( NewErrorCode errorCode )
- {
- m_errorCode = errorCode;
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public NewErrorCode getErrorCode()
- {
- return m_errorCode;
- }
-
- /**
- * DOCUMENT_ME
- *
- * @param faultCause DOCUMENT_ME
- */
- public void setFaultCause( NewBaseFaultException[] faultCause )
- {
- m_faultCause = faultCause;
- }
+ public static final Messages MSG = MessagesImpl.getInstance();
/**
- * DOCUMENT_ME
+ * Constructs a new NewBaseFaultException.
*
- * @return DOCUMENT_ME
+ * @param faultString a message describing this fault
*/
- public NewBaseFaultException[] getFaultCause()
+ public NewBaseFaultException( NamespaceVersionHolder namespaces, String faultString )
{
- return m_faultCause;
+ super( namespaces, faultString );
}
/**
- * DOCUMENT_ME
+ * Returns the element name for this base fault.
*
- * @param originator DOCUMENT_ME
+ * @return the element name for this base fault
*/
- public void setOriginator( EndpointReferenceType originator )
- {
- m_originator = originator;
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public EndpointReferenceType getOriginator()
- {
- return m_originator;
- }
-
- /**
- * DOCUMENT_ME
- *
- * @param timestamp DOCUMENT_ME
- */
- public void setTimestamp( Calendar timestamp )
- {
- m_timestamp = timestamp;
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public Calendar getTimestamp()
- {
- return m_timestamp;
- }
-
- protected NamespaceVersionHolder getNamespaceSet()
- {
- return m_namespaceSet;
- }
-
- /**
- * This method should be overridden by subclasses to create the appropriate
- * type of BaseFault document XmlBean. It should only create the XmlBean,
- * not populate it - this class will take care of populating it.
- *
- * @return a document XmlBean enclosing an XmlBean that extends BaseFaultType
- */
- protected XmlObject createBaseFaultDocumentXmlBean()
- {
- XmlObject baseFaultDocXBean;
- if ( m_namespaceSet instanceof org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.NamespaceVersionHolderImpl )
- {
- baseFaultDocXBean =
- org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSBaseFaults12Draft03.BaseFaultDocument.Factory.newInstance();
- }
- else
- {
- baseFaultDocXBean =
- org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSBaseFaults12Draft01.BaseFaultDocument.Factory.newInstance();
- }
- return baseFaultDocXBean;
- }
-
- public Detail getDetail()
- {
- updateDetail();
- return super.getDetail();
- }
-
- private void updateDetail()
- {
- XmlObject baseFaultDocXBean = toXmlObject();
- if ( m_detailEntry != null )
- {
- m_detailEntry.detachNode();
- }
- m_detailEntry = addDetailEntry( baseFaultDocXBean );
- }
-
- public XmlObject toXmlObject()
+ public QName getBaseFaultName()
{
- XmlObject baseFaultDocXBean = createBaseFaultDocumentXmlBean();
- if ( m_description == null )
- {
- m_description = new Description[] { new Description( getFaultString() ) };
- }
- if ( m_namespaceSet instanceof org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.NamespaceVersionHolderImpl )
- {
- org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSBaseFaults12Draft03.BaseFaultDocument baseFaultDoc = (org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSBaseFaults12Draft03.BaseFaultDocument) baseFaultDocXBean;
- org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSBaseFaults12Draft03.BaseFaultType baseFaultType = baseFaultDoc.addNewBaseFault();
- baseFaultType.setTimestamp( m_timestamp );
- if ( m_description != null )
- {
- for ( int i = 0; i < m_description.length; i++ )
- {
- org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSBaseFaults12Draft03.BaseFaultType.Description description = baseFaultType.addNewDescription();
- description.setStringValue( m_description[i].getValue() );
- if ( m_description[i].getLang() != null )
- {
- description.setLang( m_description[i].getLang() );
- }
- }
- }
- if ( m_errorCode != null )
- {
- org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSBaseFaults12Draft03.BaseFaultType.ErrorCode errorCode = baseFaultType.addNewErrorCode();
- errorCode.setDialect( m_errorCode.getDialect().toString() );
- XmlObject[] elems = m_errorCode.getContent();
- for ( int i = 0; i < elems.length; i++ )
- {
- XmlBeanUtils.addChildElement( errorCode, elems[i] );
- }
- }
- if ( m_faultCause != null )
- {
- for ( int i = 0; i < m_faultCause.length; i++ )
- {
- XmlBeanUtils.addChildElement( baseFaultType, m_faultCause[i].toXmlObject() );
- }
- }
- if ( m_originator != null )
- {
- // TODO
- }
- }
- else
- {
- org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSBaseFaults12Draft01.BaseFaultDocument baseFaultDoc = (org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSBaseFaults12Draft01.BaseFaultDocument) baseFaultDocXBean;
- org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSBaseFaults12Draft01.BaseFaultType baseFaultType = baseFaultDoc.addNewBaseFault();
- baseFaultType.setTimestamp( m_timestamp );
- if ( m_description != null )
- {
- for ( int i = 0; i < m_description.length; i++ )
- {
- org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSBaseFaults12Draft01.BaseFaultType.Description description = baseFaultType.addNewDescription();
- description.setStringValue( m_description[i].getValue() );
- if ( m_description[i].getLang() != null )
- {
- description.setLang( m_description[i].getLang() );
- }
- }
- }
- if ( m_errorCode != null )
- {
- org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSBaseFaults12Draft01.BaseFaultType.ErrorCode errorCode = baseFaultType.addNewErrorCode();
- errorCode.setDialect( m_errorCode.getDialect().toString() );
- XmlObject[] elems = m_errorCode.getContent();
- for ( int i = 0; i < elems.length; i++ )
- {
- XmlBeanUtils.addChildElement( errorCode, elems[i] );
- }
- }
- if ( m_faultCause != null )
- {
- for ( int i = 0; i < m_faultCause.length; i++ )
- {
- XmlBeanUtils.addChildElement( baseFaultType, m_faultCause[i].toXmlObject() );
- }
- }
- if ( m_originator != null )
- {
- // TODO
- }
- }
- return baseFaultDocXBean;
+ return new QName( getNamespaceSet().getBaseFaultsXsdNamespace(), "BaseFault", "wsbf" );
}
-}
+}
\ No newline at end of file
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java Thu Mar 3 15:57:50 2005
@@ -24,7 +24,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.faults.BaseFaultException;
import org.apache.ws.resource.handler.ResourceHandler;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
@@ -191,7 +190,7 @@
*
* @param msgContext Axis SOAP message context
*
- * @throws AxisFault if a SOAP fault needs to be returned
+ * @throws AxisFault if a SOAP fault needs to be returned to the client
*/
public void invoke( MessageContext msgContext )
throws AxisFault
@@ -200,18 +199,6 @@
{
handleRequest( msgContext );
handleResponse( msgContext );
- }
- catch ( BaseFaultException bfe )
- {
- org.apache.ws.resource.properties.NamespaceVersionHolder namespaces = bfe.getNamespaces();
- if ( namespaces instanceof org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.NamespaceVersionHolderImpl )
- {
- throw new org.apache.ws.resource.faults.axis.v1_2_draft03.BaseFaultType( bfe );
- }
- else
- {
- throw new org.apache.ws.resource.faults.axis.v1_2_draft01.BaseFaultType( bfe );
- }
}
catch ( SOAPFaultException soapfe )
{
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceNotDestroyedFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceNotDestroyedFaultException.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceNotDestroyedFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceNotDestroyedFaultException.java Thu Mar 3 15:57:50 2005
@@ -16,82 +16,83 @@
package org.apache.ws.resource.lifetime.faults;
import org.apache.ws.resource.ResourceUnknownException;
-import org.apache.ws.resource.faults.BaseFaultException;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.lifetime.v1_2_draft01.ResourceLifetime1_2Constants;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
/**
- * LOG-DONE
- * Indicates that a WS-Resource could not be destroyed for some reason.
+ * LOG-DONE Indicates that a WS-Resource could not be destroyed for some reason.
*
* @author Ian P. Springer
*/
public class ResourceNotDestroyedFaultException
- extends BaseFaultException
+ extends AbstractBaseFaultException
{
- public static final Messages MSG = MessagesImpl.getInstance();
+ private static final Messages MSG = MessagesImpl.getInstance();
- private Object m_resourceId;
- private String m_serviceName;
-
- /**
- * Constructs a new ResourceUnknownFaultException, specifying the resource id and service name of the unknown
- * resource.
- *
- * @param resourceId
- * @param serviceName
- */
- public ResourceNotDestroyedFaultException( NamespaceVersionHolder namespaces, Object resourceId,
- String serviceName )
- {
- super(namespaces, getQName(namespaces) );
- setDescription( new String[]
- {
- MSG.getMessage( Keys.UNABLE_TO_DESTROY_RESOURCE,serviceName,resourceId)
- } );
- m_resourceId = resourceId;
- m_serviceName = serviceName;
- }
-
- /**
- * @param rue
- */
- public ResourceNotDestroyedFaultException( NamespaceVersionHolder namespaces, ResourceUnknownException rue )
- {
- // TODO
- this( namespaces, rue.getResourceId( ),
- rue.getServiceName( ) );
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public Object getResourceId( )
- {
- return m_resourceId;
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public String getServiceName( )
- {
- return m_serviceName;
- }
-
- private static QName getQName(NamespaceVersionHolder namespaces)
- {
- return new QName( namespaces.getLifetimeXsdNamespace(), "ResourceUnknownFault",
- ResourceLifetime1_2Constants.NSPREFIX_WSRL_SCHEMA );
- }
+ private QName m_name;
+ private Object m_resourceId;
+ private String m_serviceName;
+
+ /**
+ * Constructs a new ResourceUnknownFaultException, specifying the resource id and service name of the unknown
+ * resource.
+ *
+ * @param resourceId
+ * @param serviceName
+ */
+ public ResourceNotDestroyedFaultException( NamespaceVersionHolder namespaces, Object resourceId,
+ String serviceName )
+ {
+ super( namespaces, MSG.getMessage( Keys.UNABLE_TO_DESTROY_RESOURCE, serviceName, resourceId ) );
+ m_name = new QName( namespaces.getLifetimeXsdNamespace(), "ResourceUnknownFault",
+ "wsrl" );
+ m_resourceId = resourceId;
+ m_serviceName = serviceName;
+ }
+
+ /**
+ * @param rue
+ */
+ public ResourceNotDestroyedFaultException( NamespaceVersionHolder namespaces, ResourceUnknownException rue )
+ {
+ // TODO
+ this( namespaces, rue.getResourceId(),
+ rue.getServiceName() );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public Object getResourceId()
+ {
+ return m_resourceId;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getServiceName()
+ {
+ return m_serviceName;
+ }
+
+ /**
+ * 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/lifetime/faults/ResourceUnknownFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceUnknownFaultException.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceUnknownFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/ResourceUnknownFaultException.java Thu Mar 3 15:57:50 2005
@@ -16,80 +16,80 @@
package org.apache.ws.resource.lifetime.faults;
import org.apache.ws.resource.ResourceUnknownException;
-import org.apache.ws.resource.faults.BaseFaultException;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.lifetime.v1_2_draft01.ResourceLifetime1_2Constants;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
/**
- * LOG-DONE
- * Indicates that the resource identified in the message is not known to the Web service.
+ * LOG-DONE Indicates that the resource identified in the message is not known to the Web service.
*
* @author Ian P. Springer
*/
public class ResourceUnknownFaultException
- extends BaseFaultException
+ extends AbstractBaseFaultException
{
- public static final Messages MSG = MessagesImpl.getInstance();
+ private static final Messages MSG = MessagesImpl.getInstance();
- private Object m_resourceId;
- private String m_serviceName;
+ private QName m_name;
+ private Object m_resourceId;
+ private String m_serviceName;
+
+ /**
+ * Constructs a new ResourceUnknownFaultException, specifying the resource id and service name of the unknown
+ * resource.
+ *
+ * @param resourceId
+ * @param serviceName
+ */
+ public ResourceUnknownFaultException( NamespaceVersionHolder namespaces, Object resourceId,
+ String serviceName )
+ {
+ super( namespaces, MSG.getMessage( Keys.RESOURCEID_NOT_FOUND_FOR_SERVICE, resourceId, serviceName ) );
+ m_name = new QName( namespaces.getLifetimeXsdNamespace(), "ResourceUnknownFault", "wsrl" );
+ m_resourceId = resourceId;
+ m_serviceName = serviceName;
+ }
+
+ /**
+ * @param rue
+ */
+ public ResourceUnknownFaultException( NamespaceVersionHolder namespaces, ResourceUnknownException rue )
+ {
+ this( namespaces, rue.getResourceId(),
+ rue.getServiceName() );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public Object getResourceId()
+ {
+ return m_resourceId;
+ }
- /**
- * Constructs a new ResourceUnknownFaultException, specifying the resource id and service name of the unknown
- * resource.
- *
- * @param resourceId
- * @param serviceName
- */
- public ResourceUnknownFaultException( NamespaceVersionHolder namespaces, Object resourceId,
- String serviceName )
- {
- super(namespaces, getQName(namespaces) );
- setDescription( new String[]
- {
- MSG.getMessage( Keys.RESOURCEID_NOT_FOUND_FOR_SERVICE,resourceId,serviceName)
- } );
- m_resourceId = resourceId;
- m_serviceName = serviceName;
- }
-
- /**
- * @param rue
- */
- public ResourceUnknownFaultException( NamespaceVersionHolder namespaces, ResourceUnknownException rue )
- {
- this( namespaces,rue.getResourceId( ),
- rue.getServiceName( ) );
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public Object getResourceId( )
- {
- return m_resourceId;
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public String getServiceName( )
- {
- return m_serviceName;
- }
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getServiceName()
+ {
+ return m_serviceName;
+ }
- private static QName getQName(NamespaceVersionHolder namespaces)
+ /**
+ * Returns the element name for this base fault.
+ *
+ * @return the element name for this base fault
+ */
+ public QName getBaseFaultName()
{
- return new QName( namespaces.getLifetimeXsdNamespace(), "ResourceUnknownFault",
- ResourceLifetime1_2Constants.NSPREFIX_WSRL_SCHEMA );
- }
+ return m_name;
+ }
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java Thu Mar 3 15:57:50 2005
@@ -16,78 +16,84 @@
package org.apache.ws.resource.lifetime.faults;
import org.apache.ws.resource.ResourceUnknownException;
-import org.apache.ws.resource.faults.BaseFaultException;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
import org.apache.ws.resource.i18n.Keys;
-import org.apache.ws.resource.lifetime.v1_2_draft01.ResourceLifetime1_2Constants;
+import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
/**
- * LOG-DONE
- * Indicates that a WS-Resource could not be destroyed for some reason.
+ * LOG-DONE Indicates that a WS-Resource could not be destroyed for some reason.
*
* @author Ian P. Springer
*/
public class TerminationTimeChangeRejectedFaultException
- extends BaseFaultException
+ extends AbstractBaseFaultException
{
- private Object m_resourceId;
- private String m_serviceName;
+ private static final Messages MSG = MessagesImpl.getInstance();
- /**
- * Constructs a new ResourceUnknownFaultException, specifying the resource id and service name of the unknown
- * resource.
- *
- * @param resourceId
- * @param serviceName
- */
- public TerminationTimeChangeRejectedFaultException( NamespaceVersionHolder namespaces, Object resourceId,
- String serviceName )
- {
- super(namespaces, getQName(namespaces) );
- setDescription( new String[]
- {
- MSG.getMessage( Keys.UNABLE_TO_SET_TERM_TIME, serviceName, resourceId)
- } );
- m_resourceId = resourceId;
- m_serviceName = serviceName;
- }
-
- /**
- * @param rue
- */
- public TerminationTimeChangeRejectedFaultException( NamespaceVersionHolder namespaces, ResourceUnknownException rue )
- {
- // TODO
- this( namespaces, rue.getResourceId( ),
- rue.getServiceName( ) );
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public Object getResourceId( )
- {
- return m_resourceId;
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public String getServiceName( )
- {
- return m_serviceName;
- }
-
- private static QName getQName(NamespaceVersionHolder namespaces)
- {
- return new QName( namespaces.getLifetimeXsdNamespace(), "TerminationTimeChangeRejectedFault",
- ResourceLifetime1_2Constants.NSPREFIX_WSRL_SCHEMA );
- }
+ private QName m_name;
+ private Object m_resourceId;
+ private String m_serviceName;
+
+ /**
+ * Constructs a new TerminationTimeChangeRejectedFaultException, specifying the resource id and service name of the unknown
+ * resource.
+ *
+ * @param resourceId
+ * @param serviceName
+ */
+ public TerminationTimeChangeRejectedFaultException( NamespaceVersionHolder namespaces, Object resourceId,
+ String serviceName )
+ {
+ super( namespaces, MSG.getMessage( Keys.UNABLE_TO_SET_TERM_TIME, serviceName, resourceId ) );
+ m_name = new QName( namespaces.getLifetimeXsdNamespace(), "TerminationTimeChangeRejectedFault",
+ "wsrl" );
+ m_resourceId = resourceId;
+ m_serviceName = serviceName;
+ }
+
+ /**
+ * @param rue
+ */
+ public TerminationTimeChangeRejectedFaultException( NamespaceVersionHolder namespaces,
+ ResourceUnknownException rue )
+ {
+ // TODO
+ this( namespaces, rue.getResourceId(),
+ rue.getServiceName() );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public Object getResourceId()
+ {
+ return m_resourceId;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getServiceName()
+ {
+ return m_serviceName;
+ }
+
+ /**
+ * 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/lifetime/faults/UnableToSetTerminationTimeFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java Thu Mar 3 15:57:50 2005
@@ -16,80 +16,81 @@
package org.apache.ws.resource.lifetime.faults;
import org.apache.ws.resource.ResourceUnknownException;
-import org.apache.ws.resource.faults.BaseFaultException;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.lifetime.v1_2_draft01.ResourceLifetime1_2Constants;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
/**
- * LOG-DONE
- * Indicates that a WS-Resource could not be destroyed for some reason.
+ * LOG-DONE Indicates that a WS-Resource could not be destroyed for some reason.
*
* @author Ian P. Springer
*/
public class UnableToSetTerminationTimeFaultException
- extends BaseFaultException
+ extends AbstractBaseFaultException
{
- public static final Messages MSG = MessagesImpl.getInstance();
+ private static final Messages MSG = MessagesImpl.getInstance();
- private Object m_resourceId;
- private String m_serviceName;
-
- /**
- * Constructs a new ResourceUnknownFaultException, specifying the resource id and service name of the unknown
- * resource.
- *
- * @param resourceId
- * @param serviceName
- */
- public UnableToSetTerminationTimeFaultException( NamespaceVersionHolder namespaces, Object resourceId,
- String serviceName )
- {
- super(namespaces, getQName(namespaces) );
- setDescription( new String[]
- {
- MSG.getMessage(Keys.UNABLE_TO_SET_TERM_TIME, serviceName, resourceId)
- } );
- m_resourceId = resourceId;
- m_serviceName = serviceName;
- }
-
- /**
- * @param rue
- */
- public UnableToSetTerminationTimeFaultException( NamespaceVersionHolder namespaces, ResourceUnknownException rue )
- {
- // TODO
- this( namespaces, rue.getResourceId( ),
- rue.getServiceName( ) );
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public Object getResourceId( )
- {
- return m_resourceId;
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public String getServiceName( )
- {
- return m_serviceName;
- }
- private static QName getQName(NamespaceVersionHolder namespaces)
- {
- return new QName( namespaces.getLifetimeXsdNamespace(), "UnableToSetTerminationTimeFault",
- ResourceLifetime1_2Constants.NSPREFIX_WSRL_SCHEMA );
- }
+ private QName m_name;
+ private Object m_resourceId;
+ private String m_serviceName;
+
+ /**
+ * Constructs a new UnableToSetTerminationTimeFaultException, specifying the resource id and service name of the unknown
+ * resource.
+ *
+ * @param resourceId
+ * @param serviceName
+ */
+ public UnableToSetTerminationTimeFaultException( NamespaceVersionHolder namespaces, Object resourceId,
+ String serviceName )
+ {
+ super( namespaces, MSG.getMessage( Keys.UNABLE_TO_SET_TERM_TIME, serviceName, resourceId ) );
+ m_name = new QName( namespaces.getLifetimeXsdNamespace(), "UnableToSetTerminationTimeFault", "wsrl" );
+ m_resourceId = resourceId;
+ m_serviceName = serviceName;
+ }
+
+ /**
+ * @param rue
+ */
+ public UnableToSetTerminationTimeFaultException( NamespaceVersionHolder namespaces, ResourceUnknownException rue )
+ {
+ // TODO
+ this( namespaces, rue.getResourceId(),
+ rue.getServiceName() );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public Object getResourceId()
+ {
+ return m_resourceId;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getServiceName()
+ {
+ return m_serviceName;
+ }
+
+ /**
+ * 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/InvalidQueryExpressionFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidQueryExpressionFaultException.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidQueryExpressionFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidQueryExpressionFaultException.java Thu Mar 3 15:57:50 2005
@@ -15,59 +15,58 @@
*=============================================================================*/
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.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.properties.query.QueryExpression;
import org.apache.ws.resource.properties.query.xpath.XPathExpression;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
/**
- * LOG-DONE
- * WS-ResourceProperties InvalidQueryExpression fault type implemented as a Java exception.
+ * LOG-DONE WS-ResourceProperties InvalidQueryExpression fault type implemented as a Java exception.
*
* @author Ian P. Springer
*/
public class InvalidQueryExpressionFaultException
- extends BaseFaultException
+ extends AbstractBaseFaultException
{
- public static final Messages MSG = MessagesImpl.getInstance();
- /**
- * Constructs a new BaseFaultException with the specified SOAP message and actor.
- *
- * @param queryExpr the invalid expression
- */
- public InvalidQueryExpressionFaultException(NamespaceVersionHolder namespaces, QueryExpression queryExpr )
- {
- super(namespaces, getQName(namespaces) );
- setDescription( new String[]
- {
- MSG.getMessage( Keys.INVALID_EXPRESSION,queryExpr)
- } );
- }
-
- /**
- * Constructs a new BaseFaultException with the specified SOAP message and actor.
- *
- * @param xpathExpr the invalid expression
- */
- public InvalidQueryExpressionFaultException(NamespaceVersionHolder namespaces, XPathExpression xpathExpr )
- {
- super(namespaces, getQName(namespaces) );
- setDescription( new String[]
- {
- MSG.getMessage( Keys.INVALID_EXPRESSION,xpathExpr)
- } );
- }
-
- private static QName getQName(NamespaceVersionHolder namespaces)
- {
- return new QName( namespaces.getPropertiesXsdNamespace(), "InvalidQueryExpressionFault",
- ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
- }
+ private static final Messages MSG = MessagesImpl.getInstance();
+
+ private QName m_name;
+
+ /**
+ * Constructs a new InvalidQueryExpressionFaultException.
+ *
+ * @param queryExpr the invalid expression
+ */
+ public InvalidQueryExpressionFaultException( NamespaceVersionHolder namespaces, QueryExpression queryExpr )
+ {
+ super( namespaces, MSG.getMessage( Keys.INVALID_EXPRESSION, queryExpr ) );
+ m_name = new QName( getNamespaceSet().getPropertiesXsdNamespace(), "InvalidQueryExpressionFault", "wsrp" );
+ }
+
+ /**
+ * Constructs a new BaseFaultException with the specified SOAP message and actor.
+ *
+ * @param xpathExpr the invalid expression
+ */
+ public InvalidQueryExpressionFaultException( NamespaceVersionHolder namespaces, XPathExpression xpathExpr )
+ {
+ super( namespaces, MSG.getMessage( Keys.INVALID_EXPRESSION, xpathExpr ) );
+ }
+
+ /**
+ * 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/InvalidResourcePropertyQNameFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidResourcePropertyQNameFaultException.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidResourcePropertyQNameFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidResourcePropertyQNameFaultException.java Thu Mar 3 15:57:50 2005
@@ -15,44 +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.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
/**
- * LOG-DONE
- * WS-ResourceProperties InvalidResourcePropertyQName fault type implemented as a Java exception.
+ * LOG-DONE WS-ResourceProperties InvalidResourcePropertyQName fault type implemented as a Java exception.
*
* @author Ian P. Springer
*/
public class InvalidResourcePropertyQNameFaultException
- extends BaseFaultException
+ extends AbstractBaseFaultException
{
- public static final Messages MSG = MessagesImpl.getInstance();
-
- /**
- * Constructs a new BaseFaultException with the specified SOAP message and actor.
- *
- * @param propName the invalid property QName
- */
- public InvalidResourcePropertyQNameFaultException( NamespaceVersionHolder namespaces,QName propName )
- {
- super(namespaces, getQName(namespaces) );
- setDescription( new String[]
- {
- MSG.getMessage( Keys.INVALID_PROP_NAME,propName)
- } );
- }
-
- private static QName getQName(NamespaceVersionHolder namespaces)
- {
- return new QName( namespaces.getPropertiesXsdNamespace(), "SetResourcePropertyRequestFailedFault",
- ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
- }
+
+ private static final Messages MSG = MessagesImpl.getInstance();
+
+ private QName m_name;
+
+ /**
+ * Constructs a new InvalidResourcePropertyQNameFaultException.
+ *
+ * @param propName the invalid property QName
+ */
+ public InvalidResourcePropertyQNameFaultException( NamespaceVersionHolder namespaces, QName propName )
+ {
+ super( namespaces, MSG.getMessage( Keys.INVALID_PROP_NAME, propName ) );
+ m_name = new QName( getNamespaceSet().getPropertiesXsdNamespace(), "InvalidResourcePropertyQNameFault", "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/InvalidSetResourcePropertiesRequestContentFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java Thu Mar 3 15:57:50 2005
@@ -15,7 +15,7 @@
*=============================================================================*/
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.MetaDataViolationException;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
@@ -29,21 +29,19 @@
* @author Ian P. Springer
*/
public class InvalidSetResourcePropertiesRequestContentFaultException
- extends BaseFaultException
+ extends AbstractBaseFaultException
{
+ private QName m_name;
+
/**
- * Constructs a new BaseFaultException with the specified SOAP message and actor.
+ * Constructs a new InvalidSetResourcePropertiesRequestContentFaultException.
*
* @param description a WS-BaseFaults description
*/
public InvalidSetResourcePropertiesRequestContentFaultException( NamespaceVersionHolder namespaces,String description )
{
- super(namespaces, getQName(namespaces) );
- setDescription( new String[]
- {
- description
- } );
+ super(namespaces, description );
}
/**
@@ -62,4 +60,13 @@
ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
}
+ /**
+ * 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/QueryEvaluationErrorFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/QueryEvaluationErrorFaultException.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/QueryEvaluationErrorFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/QueryEvaluationErrorFaultException.java Thu Mar 3 15:57:50 2005
@@ -15,39 +15,40 @@
*=============================================================================*/
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_draft01.ResourcePropertiesConstants;
import javax.xml.namespace.QName;
/**
- * LOG-DONE
- * WS-ResourceProperties QueryEvaluationError fault type implemented as a Java exception.
+ * LOG-DONE WS-ResourceProperties QueryEvaluationError fault type implemented as a Java exception.
*
* @author Ian P. Springer
*/
public class QueryEvaluationErrorFaultException
- extends BaseFaultException
+ extends AbstractBaseFaultException
{
- /**
- * Constructs a new BaseFaultException with the specified SOAP message and actor.
- *
- * @param description a WS-BaseFaults description
- */
- public QueryEvaluationErrorFaultException( NamespaceVersionHolder namespaces,String description )
- {
- super(namespaces, getQName(namespaces) );
- setDescription( new String[]
- {
- description
- } );
- }
- private static QName getQName(NamespaceVersionHolder namespaces)
- {
- return new QName( namespaces.getPropertiesXsdNamespace(), "QueryEvaluationErrorFault",
- ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
- }
+ private QName m_name;
+ /**
+ * Constructs a new QueryEvaluationErrorFaultException.
+ *
+ * @param faultString a WS-BaseFaults description
+ */
+ public QueryEvaluationErrorFaultException( NamespaceVersionHolder namespaces, String faultString )
+ {
+ super( namespaces, faultString );
+ m_name = new QName( namespaces.getPropertiesXsdNamespace(), "QueryEvaluationErrorFault", "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/ResourceUnknownFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/ResourceUnknownFaultException.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/ResourceUnknownFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/ResourceUnknownFaultException.java Thu Mar 3 15:57:50 2005
@@ -16,81 +16,82 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.resource.ResourceUnknownException;
-import org.apache.ws.resource.faults.BaseFaultException;
+import org.apache.ws.resource.faults.AbstractBaseFaultException;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
/**
- * LOG-DONE
- * Indicates that the resource identified in the message is not known to the Web service.
+ * LOG-DONE Indicates that the resource identified in the message is not known to the Web service.
*
* @author Ian P. Springer
*/
public class ResourceUnknownFaultException
- extends BaseFaultException
+ extends AbstractBaseFaultException
{
- public static final Messages MSG = MessagesImpl.getInstance();
-
- private Object m_resourceId;
- private String m_serviceName;
-
- /**
- * Constructs a new ResourceUnknownFaultException, specifying the resource id and service name of the unknown
- * resource.
- *
- * @param resourceId
- * @param serviceName
- */
- public ResourceUnknownFaultException( NamespaceVersionHolder namespaces,Object resourceId,
- String serviceName )
- {
- super(namespaces, getQName(namespaces));
- setDescription( new String[]
- {
- MSG.getMessage( Keys.RESOURCEID_NOT_FOUND_FOR_SERVICE, resourceId, serviceName)
- } );
- m_resourceId = resourceId;
- m_serviceName = serviceName;
- }
-
- /**
- * @param rue
- */
- public ResourceUnknownFaultException( NamespaceVersionHolder namespaces,ResourceUnknownException rue )
- {
- this( namespaces,rue.getResourceId( ),
- rue.getServiceName( ) );
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public Object getResourceId( )
- {
- return m_resourceId;
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public String getServiceName( )
- {
- return m_serviceName;
- }
-
- private static QName getQName(NamespaceVersionHolder namespaces)
- {
- return new QName( namespaces.getPropertiesXsdNamespace(), "ResourceUnknownFault",
- ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
- }
+
+ private static final Messages MSG = MessagesImpl.getInstance();
+
+ private Object m_resourceId;
+ private String m_serviceName;
+ private QName m_name;
+
+ /**
+ * Constructs a new ResourceUnknownFaultException, specifying the resource id and service name of the unknown
+ * resource.
+ *
+ * @param resourceId
+ * @param serviceName
+ */
+ public ResourceUnknownFaultException( NamespaceVersionHolder namespaces, Object resourceId,
+ String serviceName )
+ {
+ super( namespaces, MSG.getMessage( Keys.RESOURCEID_NOT_FOUND_FOR_SERVICE, resourceId, serviceName ) );
+ m_name = new QName( namespaces.getPropertiesXsdNamespace(), "ResourceUnknownFault", "wsrp" );
+ m_resourceId = resourceId;
+ m_serviceName = serviceName;
+ }
+
+ /**
+ * @param rue
+ */
+ public ResourceUnknownFaultException( NamespaceVersionHolder namespaces, ResourceUnknownException rue )
+ {
+ this( namespaces, rue.getResourceId(),
+ rue.getServiceName() );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public Object getResourceId()
+ {
+ return m_resourceId;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public String getServiceName()
+ {
+ return m_serviceName;
+ }
+
+ /**
+ * 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/SetResourcePropertyRequestFailedFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/SetResourcePropertyRequestFailedFaultException.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/SetResourcePropertyRequestFailedFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/SetResourcePropertyRequestFailedFaultException.java Thu Mar 3 15:57:50 2005
@@ -16,40 +16,42 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.Soap1_1Constants;
-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_draft01.ResourcePropertiesConstants;
import javax.xml.namespace.QName;
/**
- * LOG-DONE
- * WS-ResourceProperties SetResourcePropertyRequestFailed fault type implemented as a Java exception.
+ * LOG-DONE WS-ResourceProperties SetResourcePropertyRequestFailed fault type implemented as a Java exception.
*
* @author Ian P. Springer
*/
public class SetResourcePropertyRequestFailedFaultException
- extends BaseFaultException
+ extends AbstractBaseFaultException
{
- /**
- * Constructs a new BaseFaultException with the specified SOAP message and actor.
- *
- * @param namespaces
- * @param description a WS-BaseFaults description
- */
- public SetResourcePropertyRequestFailedFaultException(NamespaceVersionHolder namespaces, String description)
- {
- super(namespaces, getQName(namespaces), Soap1_1Constants.FAULT_SERVER );
- setDescription( new String[]
- {
- description
- } );
- }
+ private QName m_name;
- private static QName getQName(NamespaceVersionHolder namespaces)
- {
- return new QName( namespaces.getPropertiesXsdNamespace(), "SetResourcePropertyRequestFailedFault",
- ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
- }
+ /**
+ * Constructs a new SetResourcePropertyRequestFailedFaultException.
+ *
+ * @param namespaces
+ * @param faultString a description of the error that occurred
+ */
+ public SetResourcePropertyRequestFailedFaultException( NamespaceVersionHolder namespaces, String faultString )
+ {
+ super( namespaces, faultString, Soap1_1Constants.FAULT_SERVER );
+ m_name = new QName( namespaces.getPropertiesXsdNamespace(), "SetResourcePropertyRequestFailedFault",
+ "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/UnableToModifyResourcePropertyFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnableToModifyResourcePropertyFaultException.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnableToModifyResourcePropertyFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnableToModifyResourcePropertyFaultException.java Thu Mar 3 15:57:50 2005
@@ -15,57 +15,57 @@
*=============================================================================*/
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.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
/**
- * LOG-DONE
- * WS-ResourceProperties UnableToModifyResourceProperty fault type implemented as a Java exception.
+ * LOG-DONE WS-ResourceProperties UnableToModifyResourceProperty fault type implemented as a Java exception.
*
* @author Ian P. Springer
*/
public class UnableToModifyResourcePropertyFaultException
- extends BaseFaultException
+ extends AbstractBaseFaultException
{
- public static final Messages MSG = MessagesImpl.getInstance();
+ private static final Messages MSG = MessagesImpl.getInstance();
- private QName m_propName;
-
- /**
- * Constructs a new UnableToModifyResourcePropertyFaultException.
- *
- * @param propName the name of the read-only property that the user attempted to modify
- */
- public UnableToModifyResourcePropertyFaultException( NamespaceVersionHolder namespaces, QName propName )
- {
- super(namespaces, getQName(namespaces) );
- m_propName = propName;
- setDescription( new String[]
- {
- MSG.getMessage( Keys.READ_ONLY_PROP,propName)
- } );
- }
-
- /**
- * DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- public QName getPropertyName( )
- {
- return m_propName;
- }
-
- private static QName getQName(NamespaceVersionHolder namespaces)
- {
- return new QName( namespaces.getPropertiesXsdNamespace(), "UnableToModifyResourcePropertyFault",
- ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
- }
+ private QName m_name;
+ private QName m_propName;
+ /**
+ * Constructs a new UnableToModifyResourcePropertyFaultException.
+ *
+ * @param propName the name of the read-only property that the user attempted to modify
+ */
+ public UnableToModifyResourcePropertyFaultException( NamespaceVersionHolder namespaces, QName propName )
+ {
+ super( namespaces, MSG.getMessage( Keys.READ_ONLY_PROP, propName ) );
+ m_propName = propName;
+ m_name = new QName( namespaces.getPropertiesXsdNamespace(), "UnableToModifyResourcePropertyFault",
+ "wsrp" );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public QName getPropertyName()
+ {
+ return m_propName;
+ }
+
+ /**
+ * 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/UnknownQueryExpressionDialectFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnknownQueryExpressionDialectFaultException.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnknownQueryExpressionDialectFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/UnknownQueryExpressionDialectFaultException.java Thu Mar 3 15:57:50 2005
@@ -15,10 +15,11 @@
*=============================================================================*/
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.i18n.Keys;
+import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
+import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
import java.net.URI;
@@ -29,9 +30,12 @@
* @author Ian P. Springer
*/
public class UnknownQueryExpressionDialectFaultException
- extends BaseFaultException
+ extends AbstractBaseFaultException
{
+ private static final Messages MSG = MessagesImpl.getInstance();
+
+ private QName m_name;
private URI m_dialect;
/**
@@ -39,14 +43,12 @@
*
* @param dialect the URI of the unsupported dialect
*/
- public UnknownQueryExpressionDialectFaultException(NamespaceVersionHolder namespaces, URI dialect )
+ public UnknownQueryExpressionDialectFaultException( NamespaceVersionHolder namespaces, URI dialect )
{
- super(namespaces, getQName(namespaces) );
+ super( namespaces, MSG.getMessage( Keys.DIALECT, dialect ) );
+ m_name = new QName( namespaces.getPropertiesXsdNamespace(), "UnknownQueryExpressionDialectFault",
+ "wsrp" );
m_dialect = dialect;
- setDescription( new String[]
- {
- MSG.getMessage( Keys.DIALECT, dialect )
- } );
}
/**
@@ -59,10 +61,14 @@
return m_dialect;
}
- private static QName getQName(NamespaceVersionHolder namespaces)
- {
- return new QName( namespaces.getPropertiesXsdNamespace(), "UnknownQueryExpressionDialectFault",
- ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
- }
+ /**
+ * 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/impl/AbstractGetResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractGetResourcePropertiesPortType.java?view=diff&r1=156102&r2=156103
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractGetResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractGetResourcePropertiesPortType.java Thu Mar 3 15:57:50 2005
@@ -23,6 +23,7 @@
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.properties.ResourceProperty;
import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
+import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlObject;
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=156102&r2=156103
==============================================================================
--- 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 15:57:50 2005
@@ -88,13 +88,29 @@
/**
* DOCUMENT_ME
*
- * @param docXBean DOCUMENT_ME
+ * @param xBean DOCUMENT_ME
*
* @return DOCUMENT_ME
*/
- public static boolean isDocument( XmlObject docXBean )
+ public static boolean isDocument( XmlObject xBean )
{
- return docXBean.schemaType().isDocumentType();
+ return xBean.schemaType().isDocumentType();
+ }
+
+ /**
+ * Returns the document XmlBean that is associated with the specified XmlBean.
+ *
+ * @param xBean an XmlBean
+ *
+ * @return the document XmlBean that is associated with the specified XmlBean
+ */
+ public static XmlObject getDocument( XmlObject xBean )
+ {
+ XmlCursor xCursor = xBean.newCursor();
+ xCursor.toStartDoc();
+ XmlObject docXBean = xCursor.getObject();
+ xCursor.dispose();
+ return docXBean;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org