Author: scamp
Date: Wed Feb 16 08:59:58 2005
New Revision: 154047
URL: http://svn.apache.org/viewcvs?view=rev&rev=154047
Log:
updated for draftf05
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/AbstractPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/ResoureKeyHeaderNotFoundFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/axis/v1_2_draft01/BaseFaultType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/axis/v1_2_draft03/BaseFaultType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft04/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft04/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/impl/QueryEngineImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XmlBeansXPathExpressionEvaluator.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/NamespaceVersionHolderImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/SetResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/NamespaceVersionHolderImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/AbstractPortType.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/AbstractPortType.java?view=diff&r1=154046&r2=154047
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/AbstractPortType.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/AbstractPortType.java
Wed Feb 16 08:59:58 2005
@@ -21,6 +21,7 @@
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.impl.AbstractResourceHome;
import org.apache.ws.resource.lifetime.faults.ResourceUnknownFaultException;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.util.i18n.Messages;
import javax.xml.rpc.JAXRPCException;
@@ -64,7 +65,7 @@
}
catch ( ResourceUnknownException rue )
{
- throw new ResourceUnknownFaultException( rue );
+ throw new ResourceUnknownFaultException(getNamespaceSet(), rue );
}
catch ( ResourceContextException rce )
{
@@ -125,4 +126,6 @@
{
return m_resourceKey;
}
+
+ protected abstract NamespaceVersionHolder getNamespaceSet();
}
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=154046&r2=154047
==============================================================================
---
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
Wed Feb 16 08:59:58 2005
@@ -15,41 +15,63 @@
*=============================================================================*/
package org.apache.ws.resource.faults;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.Soap1_1Constants;
import org.apache.ws.resource.NamespaceConstants;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.i18n.Keys;
+import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.util.i18n.Messages;
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
* @author Ian P. Springer
*/
public class ResoureKeyHeaderNotFoundFaultException
- extends BaseFaultException
+ extends SOAPFaultException
{
public 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,
"ResoureKeyHeaderNotFoundFault",
+ new QName( NamespaceConstants.NSURI_APACHE_WS_RESOURCE, FAULT_LOCAL_NAME,
NamespaceConstants.NSPREFIX_APACHE_WS_RESOURCE );
- /**
+
+ /**
* Creates a new [EMAIL PROTECTED] ResoureKeyHeaderNotFoundFaultException}
object.
*
* @param expectedHeaderName DOCUMENT_ME
*/
- public ResoureKeyHeaderNotFoundFaultException( NamespaceVersionHolder
namespaces, QName expectedHeaderName )
+ public ResoureKeyHeaderNotFoundFaultException( QName expectedHeaderName )
{
- super(namespaces, NAME );
- setDescription( new String[]
- {
-
MSG.getMessage(Keys.EXPECTED_ADDRESSING_HEADER,String.valueOf(
expectedHeaderName ))
- } );
+ super(Soap1_1Constants.FAULT_CLIENT, null,null,
createDetail(MSG.getMessage(Keys.EXPECTED_ADDRESSING_HEADER,String.valueOf(
expectedHeaderName ) )));
}
+ 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/faults/axis/v1_2_draft01/BaseFaultType.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/axis/v1_2_draft01/BaseFaultType.java?view=diff&r1=154046&r2=154047
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/axis/v1_2_draft01/BaseFaultType.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/axis/v1_2_draft01/BaseFaultType.java
Wed Feb 16 08:59:58 2005
@@ -69,7 +69,7 @@
elemField.setFieldName( "originator" );
elemField.setXmlName( new QName(
Faults1_2Constants.NSURI_BASEFAULTS_SCHEMA, "Originator",
Faults1_2Constants.NSPREFIX_BASEFAULTS_SCHEMA ) );
- elemField.setXmlType( new QName( Constants.NS_URI_ADDRESSING_03,
"EndpointReferenceType" ) );
+ elemField.setXmlType( new QName( Constants.NS_URI_ADDRESSING_2003_03,
"EndpointReferenceType" ) );
elemField.setMinOccurs( 0 );
TYPE_DESC.addFieldDesc( elemField );
elemField = new ElementDesc( );
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/axis/v1_2_draft03/BaseFaultType.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/axis/v1_2_draft03/BaseFaultType.java?view=diff&r1=154046&r2=154047
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/axis/v1_2_draft03/BaseFaultType.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/axis/v1_2_draft03/BaseFaultType.java
Wed Feb 16 08:59:58 2005
@@ -76,7 +76,7 @@
elemField.setFieldName( "originator" );
elemField.setXmlName( new QName(
Faults1_2Constants.NSURI_BASEFAULTS_SCHEMA, "Originator",
Faults1_2Constants.NSPREFIX_BASEFAULTS_SCHEMA ) );
- elemField.setXmlType( new QName( Constants.NS_URI_ADDRESSING_08,
"EndpointReferenceType" ) );
+ elemField.setXmlType( new QName( Constants.NS_URI_ADDRESSING_2004_08,
"EndpointReferenceType" ) );
elemField.setMinOccurs( 0 );
TYPE_DESC.addFieldDesc( elemField );
elemField = new ElementDesc( );
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft04/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft04/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java?view=diff&r1=154046&r2=154047
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft04/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft04/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java
Wed Feb 16 08:59:58 2005
@@ -46,7 +46,8 @@
*/
private static final Log LOG = LogFactory.getLog(
ImmediateResourceTerminationPortTypeImpl.class.getName( ) );
public static final Messages MSG = MessagesImpl.getInstance();
- private NamespaceVersionHolder namespaces = new
NamespaceVersionHolderImpl() ;
+ private static final NamespaceVersionHolder NAMESPACE_SET = new
NamespaceVersionHolderImpl() ;
+
/**
* Creates a new [EMAIL PROTECTED]
ImmediateResourceTerminationPortTypeImpl} object.
*
@@ -57,7 +58,12 @@
super( resourceContext );
}
- /**
+ protected NamespaceVersionHolder getNamespaceSet()
+ {
+ return NAMESPACE_SET;
+ }
+
+ /**
* DOCUMENT_ME
*
* @param requestDoc DOCUMENT_ME
@@ -74,7 +80,7 @@
}
catch ( ResourceException re )
{
- throw new ResourceNotDestroyedFaultException(namespaces,
String.valueOf( getResourceKey( ).getValue( ) ),
+ throw new ResourceNotDestroyedFaultException(NAMESPACE_SET,
String.valueOf( getResourceKey( ).getValue( ) ),
getResourceContext(
).getServiceName( ) );
}
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft04/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft04/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java?view=diff&r1=154046&r2=154047
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft04/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft04/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java
Wed Feb 16 08:59:58 2005
@@ -49,7 +49,7 @@
private static final Log LOG = LogFactory.getLog(
ScheduledResourceTerminationPortTypeImpl.class.getName( ) );
private static final Messages MSG = MessagesImpl.getInstance();
- private NamespaceVersionHolder namespaces = new
NamespaceVersionHolderImpl() ;
+ private static final NamespaceVersionHolder NAMESPACE_SET = new
NamespaceVersionHolderImpl() ;
/**
* Creates a new [EMAIL PROTECTED]
ScheduledResourceTerminationPortTypeImpl} object.
@@ -61,7 +61,12 @@
super( resourceContext );
}
- /**
+ protected NamespaceVersionHolder getNamespaceSet()
+ {
+ return NAMESPACE_SET;
+ }
+
+ /**
* DOCUMENT_ME
*
* @param requestDoc DOCUMENT_ME
@@ -119,7 +124,7 @@
}
catch ( ResourceException re )
{
- throw new UnableToSetTerminationTimeFaultException(namespaces, null );
+ throw new UnableToSetTerminationTimeFaultException(NAMESPACE_SET,
null );
}
}
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java?view=diff&r1=154046&r2=154047
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
Wed Feb 16 08:59:58 2005
@@ -355,6 +355,5 @@
}
}
- protected abstract NamespaceVersionHolder getNamespaceSet();
}
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/impl/QueryEngineImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/impl/QueryEngineImpl.java?view=diff&r1=154046&r2=154047
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/impl/QueryEngineImpl.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/impl/QueryEngineImpl.java
Wed Feb 16 08:59:58 2005
@@ -121,7 +121,7 @@
ExpressionEvaluator evaluator = getEvaluator( queryExpr.getDialect( ) );
if ( evaluator == null )
{
- throw new UnknownQueryExpressionDialectFaultException(
queryExpr.getDialect( ) );
+ throw new UnknownQueryExpressionDialectException(
queryExpr.getDialect( ) );
}
if(LOG.isDebugEnabled())
{
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XmlBeansXPathExpressionEvaluator.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XmlBeansXPathExpressionEvaluator.java?view=diff&r1=154046&r2=154047
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XmlBeansXPathExpressionEvaluator.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/XmlBeansXPathExpressionEvaluator.java
Wed Feb 16 08:59:58 2005
@@ -133,7 +133,7 @@
}
catch ( RuntimeException re )
{
- throw new QueryEvaluationErrorFaultException( MSG.getMessage(
Keys.QUERY_FAILED, xpathExpr.getValue( ),re.getLocalizedMessage( ) ));
+ throw new QueryEvaluationErrorException( MSG.getMessage(
Keys.QUERY_FAILED, xpathExpr.getValue( ),re.getLocalizedMessage( ) ));
}
}
}
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/NamespaceVersionHolderImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/NamespaceVersionHolderImpl.java?view=diff&r1=154046&r2=154047
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/NamespaceVersionHolderImpl.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/NamespaceVersionHolderImpl.java
Wed Feb 16 08:59:58 2005
@@ -31,7 +31,7 @@
public String getAddressingNamespace()
{
- return Constants.NS_URI_ADDRESSING_03;
+ return Constants.NS_URI_ADDRESSING_2003_03;
}
public String getServiceGroupsXsdNamespace()
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/QueryResourcePropertiesPortTypeImpl.java?view=diff&r1=154046&r2=154047
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
Wed Feb 16 08:59:58 2005
@@ -58,7 +58,7 @@
private static final Log LOG = LogFactory.getLog(
QueryResourcePropertiesPortTypeImpl.class );
private static final Messages MSG = MessagesImpl.getInstance();
- private NamespaceVersionHolder namespaces = new
NamespaceVersionHolderImpl() ;
+ private static final NamespaceVersionHolder NAMESPACE_SET = new
NamespaceVersionHolderImpl() ;
/**
* DOCUMENT_ME
@@ -75,6 +75,11 @@
super( resourceContext );
}
+ protected NamespaceVersionHolder getNamespaceSet()
+ {
+ return NAMESPACE_SET;
+ }
+
/**
* Implementation of the wsrp:QueryResourceProperties operation.
*
@@ -124,15 +129,15 @@
}
catch ( UnknownQueryExpressionDialectException uqede )
{
- throw new UnknownQueryExpressionDialectFaultException(namespaces,
uqede.getDialect() );
+ throw new
UnknownQueryExpressionDialectFaultException(NAMESPACE_SET, uqede.getDialect() );
}
catch ( QueryEvaluationErrorException qeee )
{
- throw new QueryEvaluationErrorFaultException(namespaces,
qeee.getMessage() );
+ throw new QueryEvaluationErrorFaultException(NAMESPACE_SET,
qeee.getMessage() );
}
catch ( InvalidQueryExpressionException iqee )
{
- throw new InvalidQueryExpressionFaultException(namespaces,
queryExpr );
+ throw new InvalidQueryExpressionFaultException(NAMESPACE_SET,
queryExpr );
}
QueryResourcePropertiesResponseDocument.QueryResourcePropertiesResponse
responseElem =
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/SetResourcePropertiesPortTypeImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/SetResourcePropertiesPortTypeImpl.java?view=diff&r1=154046&r2=154047
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/SetResourcePropertiesPortTypeImpl.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/SetResourcePropertiesPortTypeImpl.java
Wed Feb 16 08:59:58 2005
@@ -57,7 +57,7 @@
private static final Log LOG = LogFactory.getLog(
SetResourcePropertiesPortTypeImpl.class );
private static final Messages MSG = MessagesImpl.getInstance();
- private NamespaceVersionHolder namespaces = new
NamespaceVersionHolderImpl() ;
+ private static final NamespaceVersionHolder NAMESPACE_SET = new
NamespaceVersionHolderImpl() ;
/**
* Creates a new [EMAIL PROTECTED] SetResourcePropertiesPortTypeImpl}
object.
@@ -69,6 +69,11 @@
super( resourceContext );
}
+ protected NamespaceVersionHolder getNamespaceSet()
+ {
+ return NAMESPACE_SET;
+ }
+
/**
* Implementation of the wsrp:SetResourceProperties operation.
*
@@ -128,7 +133,7 @@
QName nameOfPropToBeDeleted = deleteElem.getResourceProperty();
if ( nameOfPropToBeDeleted == null )
{
- throw new
InvalidSetResourcePropertiesRequestContentFaultException(namespaces,
MSG.getMessage( Keys.DEL_MISSING_RP_ATTRIB ) );
+ throw new
InvalidSetResourcePropertiesRequestContentFaultException(NAMESPACE_SET,
MSG.getMessage( Keys.DEL_MISSING_RP_ATTRIB ) );
}
ResourceProperty prop = getProperties().get( nameOfPropToBeDeleted );
if ( prop == null )
@@ -138,7 +143,7 @@
return;
} else
{
- throw new InvalidResourcePropertyQNameFaultException(
namespaces,nameOfPropToBeDeleted );
+ throw new InvalidResourcePropertyQNameFaultException(
NAMESPACE_SET,nameOfPropToBeDeleted );
}
}
throwFaultIfPropertyIsReadOnly( prop );
@@ -149,7 +154,7 @@
}
catch ( RuntimeException re )
{
- throw new
SetResourcePropertyRequestFailedFaultException(namespaces, re.toString() );
+ throw new
SetResourcePropertyRequestFailedFaultException(NAMESPACE_SET, re.toString() );
}
Object[] oldValue = getValue( prop );
prop.clear();
@@ -204,7 +209,7 @@
}
catch ( RuntimeException re )
{
- throw new
SetResourcePropertyRequestFailedFaultException(namespaces, re.toString() );
+ throw new
SetResourcePropertyRequestFailedFaultException(NAMESPACE_SET, re.toString() );
}
Object[] oldValue = getValue( prop );
@@ -216,7 +221,7 @@
}
catch ( MetaDataViolationException mdve )
{
- throw new
InvalidSetResourcePropertiesRequestContentFaultException(namespaces, mdve );
+ throw new
InvalidSetResourcePropertiesRequestContentFaultException(NAMESPACE_SET, mdve );
}
}
Object[] newValue = getValue( prop );
@@ -263,7 +268,7 @@
}
catch ( RuntimeException re )
{
- throw new
SetResourcePropertyRequestFailedFaultException(namespaces, re.toString() );
+ throw new
SetResourcePropertyRequestFailedFaultException(NAMESPACE_SET, re.toString() );
}
Object[] oldValue = getValue( prop );
@@ -278,7 +283,7 @@
}
catch ( MetaDataViolationException mdve )
{
- throw new
InvalidSetResourcePropertiesRequestContentFaultException(namespaces, mdve );
+ throw new
InvalidSetResourcePropertiesRequestContentFaultException(NAMESPACE_SET, mdve );
}
Object[] newValue = getValue( prop );
if ( prop.getChangeListener() != null )
@@ -314,7 +319,7 @@
{
if ( !getProperties().getMetaData().isOpenContent() )
{
- throw new
InvalidResourcePropertyQNameFaultException(namespaces, propName );
+ throw new
InvalidResourcePropertyQNameFaultException(NAMESPACE_SET, propName );
}
}
return prop;
@@ -328,7 +333,7 @@
QName propElemName = XmlBeanUtils.getName( propElems[i] );
if ( !firstPropElemName.equals( propElemName ) )
{
- throw new
InvalidSetResourcePropertiesRequestContentFaultException(namespaces,
MSG.getMessage( Keys.ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA,
+ throw new
InvalidSetResourcePropertiesRequestContentFaultException(NAMESPACE_SET,
MSG.getMessage( Keys.ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA,
( ( propElems.length > 1 )
? "s" : "" ),
firstPropElemName ) );
@@ -340,7 +345,7 @@
{
if ( prop.getMetaData().getMinOccurs() != 0 )
{
- throw new
InvalidSetResourcePropertiesRequestContentFaultException(namespaces,
MSG.getMessage( Keys.ERROR_PROPERTY_DELETE_VIOLATES_SCHEMA,
+ throw new
InvalidSetResourcePropertiesRequestContentFaultException(NAMESPACE_SET,
MSG.getMessage( Keys.ERROR_PROPERTY_DELETE_VIOLATES_SCHEMA,
prop.getMetaData().getName() ) );
}
}
@@ -350,7 +355,7 @@
//todo probably need to check this for xsd:any to check for possible
violations
if ( prop.getMetaData().getMaxOccurs() != -1 &&( prop.size() +
propElemsToBeInserted.length ) > prop.getMetaData().getMaxOccurs() )
{
- throw new
InvalidSetResourcePropertiesRequestContentFaultException(namespaces,
MSG.getMessage( Keys.ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA,
+ throw new
InvalidSetResourcePropertiesRequestContentFaultException(NAMESPACE_SET,
MSG.getMessage( Keys.ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA,
( ( propElemsToBeInserted.length > 1 )
? "s" : "" ),
prop.getMetaData().getName() ) );
@@ -361,7 +366,7 @@
{
if ( prop.getMetaData().getMaxOccurs() != -1 && newPropElems.length >
prop.getMetaData().getMaxOccurs() )
{
- throw new
InvalidSetResourcePropertiesRequestContentFaultException(namespaces,
MSG.getMessage( Keys.ERROR_PROPERTY_UPDATE_VIOLATES_SCHEMA,
+ throw new
InvalidSetResourcePropertiesRequestContentFaultException(NAMESPACE_SET,
MSG.getMessage( Keys.ERROR_PROPERTY_UPDATE_VIOLATES_SCHEMA,
prop.getMetaData().getName() ) );
}
}
@@ -417,7 +422,7 @@
{
if ( prop.getMetaData().isReadOnly() )
{
- throw new UnableToModifyResourcePropertyFaultException(namespaces,
prop.getMetaData().getName() );
+ throw new
UnableToModifyResourcePropertyFaultException(NAMESPACE_SET,
prop.getMetaData().getName() );
}
}
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java?view=diff&r1=154046&r2=154047
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java
Wed Feb 16 08:59:58 2005
@@ -21,7 +21,7 @@
{
private static final Log LOG = LogFactory.getLog(
GetMultipleResourcePropertiesPortTypeImpl.class );
private static final Messages MSG = MessagesImpl.getInstance();
- private NamespaceVersionHolder namespaces = new
NamespaceVersionHolderImpl() ;
+ private static final NamespaceVersionHolder NAMESPACE_SET = new
NamespaceVersionHolderImpl();
/**
* Creates a new [EMAIL PROTECTED] AbstractResourcePropertiesPortType}
object.
*
@@ -55,5 +55,10 @@
GetResourcePropertyDocumentResponseDocument.Factory.newInstance();
responseDoc.addNewGetResourcePropertyDocumentResponse();
return responseDoc;
+ }
+
+ protected NamespaceVersionHolder getNamespaceSet()
+ {
+ return NAMESPACE_SET;
}
}
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/NamespaceVersionHolderImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/NamespaceVersionHolderImpl.java?view=diff&r1=154046&r2=154047
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/NamespaceVersionHolderImpl.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/NamespaceVersionHolderImpl.java
Wed Feb 16 08:59:58 2005
@@ -31,7 +31,7 @@
public String getAddressingNamespace()
{
- return Constants.NS_URI_ADDRESSING_08;
+ return Constants.NS_URI_ADDRESSING_2004_08;
}
public String getServiceGroupsXsdNamespace()
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/QueryResourcePropertiesPortTypeImpl.java?view=diff&r1=154046&r2=154047
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
Wed Feb 16 08:59:58 2005
@@ -58,7 +58,7 @@
private static final Log LOG = LogFactory.getLog(
QueryResourcePropertiesPortTypeImpl.class );
private static final Messages MSG = MessagesImpl.getInstance();
- private NamespaceVersionHolder namespaces = new
NamespaceVersionHolderImpl() ;
+ private static final NamespaceVersionHolder NAMESPACE_SET = new
NamespaceVersionHolderImpl();
/**
* DOCUMENT_ME
@@ -75,6 +75,11 @@
super( resourceContext );
}
+ protected NamespaceVersionHolder getNamespaceSet()
+ {
+ return NAMESPACE_SET;
+ }
+
/**
* Implementation of the wsrp:QueryResourceProperties operation.
*
@@ -124,15 +129,15 @@
}
catch ( UnknownQueryExpressionDialectException uqede )
{
- throw new UnknownQueryExpressionDialectFaultException( namespaces,
uqede.getDialect() );
+ throw new UnknownQueryExpressionDialectFaultException(
NAMESPACE_SET, uqede.getDialect() );
}
catch ( QueryEvaluationErrorException qeee )
{
- throw new QueryEvaluationErrorFaultException(namespaces,
qeee.getMessage() );
+ throw new QueryEvaluationErrorFaultException(NAMESPACE_SET,
qeee.getMessage() );
}
catch ( InvalidQueryExpressionException iqee )
{
- throw new InvalidQueryExpressionFaultException(namespaces,
queryExpr );
+ throw new InvalidQueryExpressionFaultException(NAMESPACE_SET,
queryExpr );
}
QueryResourcePropertiesResponseDocument.QueryResourcePropertiesResponse
responseElem =
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java?view=diff&r1=154046&r2=154047
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
(original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
Wed Feb 16 08:59:58 2005
@@ -29,7 +29,6 @@
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.impl.ResourceDefinitionImpl;
-import org.apache.ws.resource.tool.velocity.ConstQNames;
import org.apache.ws.resource.tool.velocity.ImplementsListBuilder;
import org.apache.ws.resource.tool.velocity.ServiceProperties;
import org.apache.ws.util.XmlBeanNameUtils;
@@ -536,8 +535,7 @@
//add to context
context.put( "generated", props );
- context.put( "qnames", new ConstQNames() );
-
+
//generate files
File packageDir = getPackageDir(
resourceDef.getDefinition().getTargetNamespace(), serviceDir );
packageDir.mkdirs();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
