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/02/15 23:55:46 UTC
svn commit: r153969 - in incubator/apollo/trunk/src:
java/org/apache/ws/resource/i18n/ java/org/apache/ws/resource/impl/
java/org/apache/ws/resource/properties/impl/
java/org/apache/ws/resource/properties/v1_2_draft05/
java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/
java/org/apache/ws/resource/tool/
java/org/apache/ws/resource/tool/velocity/ templates/1_2_draft01/
Author: ips
Date: Tue Feb 15 14:55:38 2005
New Revision: 153969
URL: http://svn.apache.org/viewcvs?view=rev&rev=153969
Log:
work toward supporting multiple versions of WSRF spec
Added:
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
Removed:
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ConstQNames.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/i18n/Keys.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/ResourcePropertiesConstants.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/SetResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
incubator/apollo/trunk/src/templates/1_2_draft01/GetMultiple.txt
incubator/apollo/trunk/src/templates/1_2_draft01/GetResource.txt
incubator/apollo/trunk/src/templates/1_2_draft01/Query.txt
incubator/apollo/trunk/src/templates/1_2_draft01/Set.txt
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/i18n/Keys.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/i18n/Keys.java?view=diff&r1=153968&r2=153969
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/i18n/Keys.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/i18n/Keys.java Tue Feb 15 14:55:38 2005
@@ -431,11 +431,11 @@
*/
String ADDING_PROP = "ADDING_PROP";
/**
- * @msg Setting ResourceProperties request: {0}
+ * @msg Processing SetResourceProperties request: {0} ...
*/
String SET_RP_REQ = "SET_RP_REQ";
/**
- * @msg Deleting ResourceProperty request: {0}
+ * @msg Deleting resource property: {0} ...
*/
String DEL_RP_REQ = "DEL_RP_REQ";
/**
@@ -443,7 +443,7 @@
*/
String DEL_MISSING_RP_ATTRIB = "DEL_MISSING_RP_ATTRIB";
/**
- * @msg Inserting ResourceProperty request: {0}
+ * @msg Inserting resource property...
*/
String INSERT_RP_REQ = "INSERT_RP_REQ";
/**
@@ -451,11 +451,11 @@
*/
String ERROR_PROPERTY_DELETE_VIOLATES_SCHEMA = "ERROR_PROPERTY_DELETE_VIOLATES_SCHEMA";
/**
- * @msg Element{0} cannot be inserted because maxOccurs for property {1} would be exceeded.
+ * @msg Element {0} cannot be inserted because maxOccurs for property {1} would be exceeded.
*/
String ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA = "ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA";
/**
- * @msg Updating ResourceProperty request: {0}
+ * @msg Updating resource property...
*/
String UPDATE_RP_REQ = "UPDATE_RP_REQ";
/**
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java?view=diff&r1=153968&r2=153969
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java Tue Feb 15 14:55:38 2005
@@ -17,6 +17,8 @@
import org.apache.ws.resource.InvalidWsrfWsdlException;
import org.apache.ws.resource.ResourceCapability;
+import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
+import org.apache.ws.resource.properties.v1_2_draft05.porttype.GetResourcePropertyPortType;
import org.apache.ws.util.WsdlUtils;
import org.apache.ws.util.WsrfWsdlUtils;
@@ -118,10 +120,8 @@
{
if ( hasProperties() )
{
- if ( !m_implementedResourceDefs.containsKey( GetResourcePropertyPortType.NAME ) &&
- !m_implementedResourceDefs.containsKey(
- ResourceProperties1_3Constants.PORT_TYPE_NAME_GET_RESOURCE_PROPERTY )
- )
+ if ( !m_implementedResourceDefs.containsKey( GetResourcePropertyPortType.NAME ) )
+ // TODO: check for 1.2draft05 too
{
throw new InvalidWsrfWsdlException(
"PortType " + m_portType.getQName() +
@@ -130,19 +130,17 @@
}
else
{
- if ( m_implementedResourceDefs.containsKey( GetResourcePropertyPortType.NAME ) ||
- m_implementedResourceDefs.containsKey( ResourcePropertiesConstants.PORT_TYPE_NAME_GET_RESOURCE_PROPERTY ) ||
- m_implementedResourceDefs.containsKey( GetMultipleResourcePropertiesPortType.NAME ) ||
- m_implementedResourceDefs.containsKey( ResourcePropertiesConstants.PORT_TYPE_NAME_GET_MULTIPLE_RESOURCE_PROPERTIES ) ||
- m_implementedResourceDefs.containsKey( SetResourcePropertiesPortType.NAME ) ||
- m_implementedResourceDefs.containsKey( ResourcePropertiesConstants.PORT_TYPE_NAME_SET_RESOURCE_PROPERTIES ) ||
- m_implementedResourceDefs.containsKey( QueryResourcePropertiesPortType.NAME ) ||
- m_implementedResourceDefs.containsKey( ResourcePropertiesConstants.PORT_TYPE_NAME_QUERY_RESOURCE_PROPERTIES )
- )
+ Iterator resourceDefNames = m_implementedResourceDefs.keySet().iterator();
+ while ( resourceDefNames.hasNext() )
{
- throw new InvalidWsrfWsdlException(
+ QName resourceDefName = (QName) resourceDefNames.next();
+ if ( resourceDefName.getNamespaceURI().equals( ResourcePropertiesConstants.NSURI_WSRP_WSDL ) )
+ // TODO: check for 1.2draft05 too
+ {
+ throw new InvalidWsrfWsdlException(
"PortType " + m_portType.getQName() +
" does not define a wsrp:ResourceProperties attribute but implements one or more WSRF-RP portTypes." );
+ }
}
}
}
Added: 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=auto&rev=153969
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java (added)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java Tue Feb 15 14:55:38 2005
@@ -0,0 +1,358 @@
+/*=============================================================================*
+ * 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.properties.impl;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.resource.ResourceContext;
+import org.apache.ws.resource.i18n.Keys;
+import org.apache.ws.resource.i18n.MessagesImpl;
+import org.apache.ws.resource.properties.MetaDataViolationException;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.properties.ResourceProperty;
+import org.apache.ws.resource.properties.ResourcePropertyCallback;
+import org.apache.ws.resource.properties.ResourcePropertyMetaData;
+import org.apache.ws.resource.properties.SetResourcePropertyCallback;
+import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
+import org.apache.ws.resource.properties.faults.InvalidSetResourcePropertiesRequestContentFaultException;
+import org.apache.ws.resource.properties.faults.SetResourcePropertyRequestFailedFaultException;
+import org.apache.ws.resource.properties.faults.UnableToModifyResourcePropertyFaultException;
+import org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.XmlBeansResourcePropertyValueChangeEvent;
+import org.apache.ws.util.XmlBeanUtils;
+import org.apache.ws.util.i18n.Messages;
+import org.apache.xmlbeans.XmlObject;
+
+import javax.xml.namespace.QName;
+import java.util.Iterator;
+
+/**
+ * TODO
+ */
+public abstract class AbstractSetResourcePropertiesPortType extends AbstractResourcePropertiesPortType
+{
+
+ private static final Log LOG = LogFactory.getLog( AbstractSetResourcePropertiesPortType.class );
+ private static final Messages MSG = MessagesImpl.getInstance();
+
+ protected AbstractSetResourcePropertiesPortType( ResourceContext resourceContext )
+ {
+ super( resourceContext );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @param nameOfPropToBeDeleted name of property to be deleted
+ */
+ protected void deleteResourceProperty( QName nameOfPropToBeDeleted )
+ {
+ if ( LOG.isDebugEnabled() )
+ {
+ LOG.debug( MSG.getMessage( Keys.DEL_RP_REQ, nameOfPropToBeDeleted ) );
+ }
+ if ( nameOfPropToBeDeleted == null )
+ {
+ throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(), MSG.getMessage( Keys.DEL_MISSING_RP_ATTRIB ) );
+ }
+ ResourceProperty prop = getProperties().get( nameOfPropToBeDeleted );
+ if ( prop == null )
+ {
+ if ( getProperties().getMetaData().isOpenContent() )
+ {
+ return;
+ } else
+ {
+ throw new InvalidResourcePropertyQNameFaultException( getNamespaceSet(), nameOfPropToBeDeleted );
+ }
+ }
+ throwFaultIfPropertyIsReadOnly( prop );
+ throwFaultIfDeletionViolatesSchema( prop );
+ try
+ {
+ deletePropertyCallback( prop );
+ }
+ catch ( RuntimeException re )
+ {
+ throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(), re.toString() );
+ }
+ Object[] oldValue = getValue( prop );
+ prop.clear();
+ Object[] newValue = null;
+ if ( prop.getChangeListener() != null )
+ {
+ firePropChangeEvent( prop, oldValue, newValue );
+ }
+ }
+
+ private void throwFaultIfDeletionViolatesSchema( ResourceProperty prop )
+ {
+ if ( prop.getMetaData().getMinOccurs() != 0 )
+ {
+ throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(), MSG.getMessage( Keys.ERROR_PROPERTY_DELETE_VIOLATES_SCHEMA,
+ prop.getMetaData().getName() ) );
+ }
+ }
+
+ private void deletePropertyCallback( ResourceProperty prop )
+ {
+ QName nameOfPropToBeDeleted = prop.getMetaData().getName();
+ SetResourcePropertyCallback setResourcePropertyCallback = getSetResourcePropertyCallback( prop );
+ if ( setResourcePropertyCallback != null )
+ {
+ setResourcePropertyCallback.deleteProperty( nameOfPropToBeDeleted );
+ }
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @param propElemsToBeInserted DOCUMENT_ME
+ */
+ protected void insertResourceProperty( XmlObject[] propElemsToBeInserted )
+ {
+ if ( LOG.isDebugEnabled() )
+ {
+ LOG.debug( MSG.getMessage( Keys.INSERT_RP_REQ ) );
+ }
+ if ( propElemsToBeInserted.length == 0 )
+ {
+ return; // nothing to do
+ }
+ throwFaultIfElementNamesHeterogenous( propElemsToBeInserted );
+
+ QName propName = XmlBeanUtils.getName( propElemsToBeInserted[0] );
+ ResourceProperty prop = getProperty( propName );
+
+ if(prop == null)
+ {
+ prop = createAnyProperty(propName);
+ getProperties().add(prop);
+ }
+
+ if(!prop.getMetaData().isAny())
+ {
+ //todo probably need to check this for xsd:any to check for possible violations
+ //refreshProperty( prop );
+ throwFaultIfInsertionViolatesSchema( prop, propElemsToBeInserted );
+ }
+
+ throwFaultIfPropertyIsReadOnly( prop );
+
+ try
+ {
+ insertPropertyCallback( prop, propElemsToBeInserted );
+ }
+ catch ( RuntimeException re )
+ {
+ throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(), re.toString() );
+ }
+
+ Object[] oldValue = getValue( prop );
+ for ( int i = 0; i < propElemsToBeInserted.length; i++ )
+ {
+ try
+ {
+ prop.add( propElemsToBeInserted[i] );
+ }
+ catch ( MetaDataViolationException mdve )
+ {
+ throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(), mdve );
+ }
+ }
+ Object[] newValue = getValue( prop );
+ if ( prop.getChangeListener() != null )
+ {
+ firePropChangeEvent( prop, oldValue, newValue );
+ }
+ }
+
+ private void firePropChangeEvent( ResourceProperty prop, Object[] oldValue, Object[] newValue )
+ {
+ prop.getChangeListener().propertyChanged( new XmlBeansResourcePropertyValueChangeEvent( oldValue, newValue ) );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @param newPropElems DOCUMENT_ME
+ */
+ protected void updateResourceProperty( XmlObject[] newPropElems )
+ {
+ if ( LOG.isDebugEnabled() )
+ {
+ LOG.debug( MSG.getMessage( Keys.UPDATE_RP_REQ ) );
+ }
+ if ( newPropElems.length == 0 )
+ {
+ return; // nothing to do
+ }
+ QName propName = XmlBeanUtils.getName( newPropElems[0] );
+ ResourceProperty prop = getProperty( propName );
+
+ throwFaultIfPropertyIsReadOnly( prop );
+ throwFaultIfElementNamesHeterogenous( newPropElems );
+ throwFaultIfUpdateViolatesSchema( prop, newPropElems );
+
+ try
+ {
+ updatePropertyCallback( prop, newPropElems );
+ }
+ catch ( RuntimeException re )
+ {
+ throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(), re.toString() );
+ }
+
+ Object[] oldValue = getValue( prop );
+ // TODO: we might need to clone the oldValue elems, since we might be destroying them when we call clear() below
+ try
+ {
+ prop.clear();
+ for ( int i = 0; i < newPropElems.length; i++ )
+ {
+ prop.add( newPropElems[i] );
+ }
+ }
+ catch ( MetaDataViolationException mdve )
+ {
+ throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(), mdve );
+ }
+ Object[] newValue = getValue( prop );
+ if ( prop.getChangeListener() != null )
+ {
+ firePropChangeEvent( prop, oldValue, newValue );
+ }
+ }
+
+ private ResourceProperty createAnyProperty(QName propName)
+ {
+ ResourcePropertyMetaData propMetaData = new AnyResourcePropertyMetaData( propName );
+ return propMetaData.create( getProperties() );
+ }
+
+ private Object[] getValue( ResourceProperty prop )
+ {
+ Object[] value = new Object[prop.size()];
+ Iterator propElemIter = prop.iterator();
+ int i = 0;
+ while ( propElemIter.hasNext() )
+ {
+ value[i++] = propElemIter.next();
+ }
+ return value;
+ }
+
+ private ResourceProperty getProperty( QName propName )
+ {
+ LOG.debug( MSG.getMessage( Keys.GET_RP_WITH_NAME,
+ propName.toString() ) );
+ ResourceProperty prop = getProperties().get( propName );
+ if ( prop == null )
+ {
+ if ( !getProperties().getMetaData().isOpenContent() )
+ {
+ throw new InvalidResourcePropertyQNameFaultException( getNamespaceSet(), propName );
+ }
+ }
+ return prop;
+ }
+
+ private void throwFaultIfElementNamesHeterogenous( XmlObject[] propElems )
+ {
+ QName firstPropElemName = XmlBeanUtils.getName( propElems[0] );
+ for ( int i = 1; i < propElems.length; i++ )
+ {
+ QName propElemName = XmlBeanUtils.getName( propElems[i] );
+ if ( !firstPropElemName.equals( propElemName ) )
+ {
+ throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(), MSG.getMessage( Keys.ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA,
+ ( ( propElems.length > 1 )
+ ? "s" : "" ),
+ firstPropElemName ) );
+ }
+ }
+ }
+
+ private void throwFaultIfInsertionViolatesSchema( ResourceProperty prop, XmlObject[] propElemsToBeInserted )
+ {
+ //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( getNamespaceSet(), MSG.getMessage( Keys.ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA,
+ ( ( propElemsToBeInserted.length > 1 )
+ ? "s" : "" ),
+ prop.getMetaData().getName() ) );
+ }
+ }
+
+ private void throwFaultIfUpdateViolatesSchema( ResourceProperty prop, XmlObject[] newPropElems )
+ {
+ if ( prop.getMetaData().getMaxOccurs() != -1 && newPropElems.length > prop.getMetaData().getMaxOccurs() )
+ {
+ throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(), MSG.getMessage( Keys.ERROR_PROPERTY_UPDATE_VIOLATES_SCHEMA,
+ prop.getMetaData().getName() ) );
+ }
+ }
+
+ /**
+ * Returns SetResourcePropertyCallback or null
+ *
+ * @param prop
+ *
+ * @return SetResourcePropertyCallback or null
+ */
+ private SetResourcePropertyCallback getSetResourcePropertyCallback( ResourceProperty prop )
+ {
+ SetResourcePropertyCallback setResourcePropertyCallback = null;
+ ResourcePropertyCallback callBack = prop.getCallBack();
+ if ( callBack instanceof SetResourcePropertyCallback )
+ {
+ setResourcePropertyCallback = (SetResourcePropertyCallback) callBack;
+ }
+
+ return setResourcePropertyCallback;
+ }
+
+ private void insertPropertyCallback( ResourceProperty prop,
+ XmlObject[] propElemsToBeInserted )
+ {
+ SetResourcePropertyCallback setResourcePropertyCallback = getSetResourcePropertyCallback( prop );
+ if ( setResourcePropertyCallback != null )
+ {
+ setResourcePropertyCallback.insertProperty( propElemsToBeInserted );
+ }
+ }
+
+ private void throwFaultIfPropertyIsReadOnly( ResourceProperty prop )
+ {
+ if ( prop.getMetaData().isReadOnly() )
+ {
+ throw new UnableToModifyResourcePropertyFaultException( getNamespaceSet(), prop.getMetaData().getName() );
+ }
+ }
+
+ private void updatePropertyCallback( ResourceProperty prop,
+ XmlObject[] newPropElems )
+ {
+ SetResourcePropertyCallback setResourcePropertyCallback = getSetResourcePropertyCallback( prop );
+ if ( setResourcePropertyCallback != null )
+ {
+ setResourcePropertyCallback.updateProperty( newPropElems );
+ }
+ }
+
+ protected abstract NamespaceVersionHolder getNamespaceSet();
+
+}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/ResourcePropertiesConstants.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/ResourcePropertiesConstants.java?view=diff&r1=153968&r2=153969
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/ResourcePropertiesConstants.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/ResourcePropertiesConstants.java Tue Feb 15 14:55:38 2005
@@ -43,11 +43,6 @@
*/
String NSPREFIX_WSRP_WSDL = "wsrf-rpw";
- QName PORT_TYPE_NAME_GET_RESOURCE_PROPERTY = new QName( NSURI_WSRP_WSDL, "GetResourceProperty", NSPREFIX_WSRP_SCHEMA );
- QName PORT_TYPE_NAME_GET_MULTIPLE_RESOURCE_PROPERTIES = new QName( NSURI_WSRP_WSDL, "GetMultipleResourceProperties", NSPREFIX_WSRP_SCHEMA );
- QName PORT_TYPE_NAME_SET_RESOURCE_PROPERTIES = new QName( NSURI_WSRP_WSDL, "SetResourceProperties", NSPREFIX_WSRP_SCHEMA );
- QName PORT_TYPE_NAME_QUERY_RESOURCE_PROPERTIES = new QName( NSURI_WSRP_WSDL, "QueryResourceProperties", NSPREFIX_WSRP_SCHEMA );
-
/**
* QName of the "ResourceProperties" portType attribute.
*/
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java?view=diff&r1=153968&r2=153969
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java Tue Feb 15 14:55:38 2005
@@ -1,174 +1,59 @@
package org.apache.ws.resource.properties.v1_2_draft05.porttype.impl;
-import org.apache.ws.resource.properties.v1_2_draft05.porttype.DeleteResourcePropertiesPortType;
-import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
-import org.apache.ws.resource.properties.ResourceProperty;
-import org.apache.ws.resource.properties.SetResourcePropertyCallback;
-import org.apache.ws.resource.properties.ResourcePropertyCallback;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.faults.InvalidSetResourcePropertiesRequestContentFaultException;
-import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
-import org.apache.ws.resource.properties.faults.SetResourcePropertyRequestFailedFaultException;
-import org.apache.ws.resource.properties.faults.UnableToModifyResourcePropertyFaultException;
-
import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.i18n.Keys;
-import org.apache.ws.util.i18n.Messages;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesResponseDocument;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
+import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
+import org.apache.ws.resource.properties.v1_2_draft05.porttype.DeleteResourcePropertiesPortType;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteType;
-
-import javax.xml.namespace.QName;
-import java.util.Iterator;
-
+import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesResponseDocument;
/**
- * @author Sal Campana
+ * @author Ian Springer
*/
-public class DeleteResourcePropertiesPortTypeImpl extends AbstractResourcePropertiesPortType implements DeleteResourcePropertiesPortType
+public class DeleteResourcePropertiesPortTypeImpl extends AbstractSetResourcePropertiesPortType
+ implements DeleteResourcePropertiesPortType
{
- 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 {@link AbstractResourcePropertiesPortType} object.
*
* @param resourceContext DOCUMENT_ME
*/
- public DeleteResourcePropertiesPortTypeImpl(ResourceContext resourceContext)
+ public DeleteResourcePropertiesPortTypeImpl( ResourceContext resourceContext )
{
- super(resourceContext);
+ super( resourceContext );
}
-
/**
* DOCUMENT_ME
*
* @param requestDoc DOCUMENT_ME
+ *
* @return DOCUMENT_ME
*/
- public DeleteResourcePropertiesResponseDocument deleteResourceProperties(DeleteResourcePropertiesDocument requestDoc)
+ public DeleteResourcePropertiesResponseDocument deleteResourceProperties(
+ DeleteResourcePropertiesDocument requestDoc )
{
-
- DeleteResourcePropertiesResponseDocument responseDocument = createResponseDocument();
+ DeleteResourcePropertiesResponseDocument responseDoc = createResponseDocument();
DeleteResourcePropertiesDocument.DeleteResourceProperties requestElem = requestDoc.getDeleteResourceProperties();
- deleteResourceProperty(requestElem.getDelete());
-
- return responseDocument;
- }
-
- /**
- * DOCUMENT_ME
- *
- * @param deleteElem DOCUMENT_ME
- */
- protected void deleteResourceProperty( DeleteType deleteElem )
- {
- if ( LOG.isDebugEnabled() )
- {
- LOG.debug( MSG.getMessage( Keys.DEL_RP_REQ,
- deleteElem.toString() ) );
- }
- QName nameOfPropToBeDeleted = deleteElem.getResourceProperty();
- if ( nameOfPropToBeDeleted == null )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException( namespaces, MSG.getMessage( Keys.DEL_MISSING_RP_ATTRIB ) );
- }
- ResourceProperty prop = getProperties().get( nameOfPropToBeDeleted );
- if ( prop == null )
- {
- if ( getProperties().getMetaData().isOpenContent() )
- {
- return;
- } else
- {
- throw new InvalidResourcePropertyQNameFaultException(namespaces, nameOfPropToBeDeleted );
- }
- }
- throwFaultIfPropertyIsReadOnly( prop );
- throwFaultIfDeletionViolatesSchema( prop );
- try
- {
- deletePropertyCallback( prop );
- }
- catch ( RuntimeException re )
- {
- throw new SetResourcePropertyRequestFailedFaultException( namespaces, re.toString() );
- }
- Object[] oldValue = getValue( prop );
- prop.clear();
- Object[] newValue = null;
- if ( prop.getChangeListener() != null )
- {
- firePropChangeEvent( prop, oldValue, newValue );
- }
- }
- private Object[] getValue( ResourceProperty prop )
- {
- Object[] value = new Object[prop.size()];
- Iterator propElemIter = prop.iterator();
- int i = 0;
- while ( propElemIter.hasNext() )
- {
- value[i++] = propElemIter.next();
- }
- return value;
- }
- private void throwFaultIfPropertyIsReadOnly( ResourceProperty prop )
- {
- if ( prop.getMetaData().isReadOnly() )
- {
- throw new UnableToModifyResourcePropertyFaultException(namespaces, prop.getMetaData().getName() );
- }
- }
- private void deletePropertyCallback( ResourceProperty prop )
- {
- QName nameOfPropToBeDeleted = prop.getMetaData().getName();
- SetResourcePropertyCallback setResourcePropertyCallback = getSetResourcePropertyCallback( prop );
- if ( setResourcePropertyCallback != null )
- {
- setResourcePropertyCallback.deleteProperty( nameOfPropToBeDeleted );
- }
+ deleteResourceProperty( requestElem.getDelete().getResourceProperty() );
+ return responseDoc;
}
- private void throwFaultIfDeletionViolatesSchema( ResourceProperty prop )
- {
- if ( prop.getMetaData().getMinOccurs() != 0 )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException(namespaces, MSG.getMessage( Keys.ERROR_PROPERTY_DELETE_VIOLATES_SCHEMA,
- prop.getMetaData().getName() ) );
- }
- }
- /**
- * Returns SetResourcePropertyCallback or null
- *
- * @param prop
- *
- * @return SetResourcePropertyCallback or null
- */
- private SetResourcePropertyCallback getSetResourcePropertyCallback( ResourceProperty prop )
- {
- SetResourcePropertyCallback setResourcePropertyCallback = null;
- ResourcePropertyCallback callBack = prop.getCallBack();
- if ( callBack instanceof SetResourcePropertyCallback )
- {
- setResourcePropertyCallback = (SetResourcePropertyCallback) callBack;
- }
-
- return setResourcePropertyCallback;
- }
- private void firePropChangeEvent( ResourceProperty prop, Object[] oldValue, Object[] newValue )
- {
- prop.getChangeListener().propertyChanged( new XmlBeansResourcePropertyValueChangeEvent( oldValue, newValue ) );
- }
- private DeleteResourcePropertiesResponseDocument createResponseDocument()
+ private DeleteResourcePropertiesResponseDocument createResponseDocument()
{
DeleteResourcePropertiesResponseDocument responseDoc =
DeleteResourcePropertiesResponseDocument.Factory.newInstance();
responseDoc.addNewDeleteResourcePropertiesResponse();
return responseDoc;
}
+
+ protected NamespaceVersionHolder getNamespaceSet()
+ {
+ return NAMESPACE_SET;
+ }
+
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java?view=diff&r1=153968&r2=153969
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java Tue Feb 15 14:55:38 2005
@@ -1,192 +1,51 @@
package org.apache.ws.resource.properties.v1_2_draft05.porttype.impl;
-import org.apache.ws.resource.properties.v1_2_draft05.porttype.InsertResourcePropertiesPortType;
-import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
-import org.apache.ws.resource.properties.impl.AnyResourcePropertyMetaData;
-import org.apache.ws.resource.properties.ResourceProperty;
-import org.apache.ws.resource.properties.MetaDataViolationException;
-import org.apache.ws.resource.properties.ResourcePropertyMetaData;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
-
import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.i18n.Keys;
-import org.apache.ws.util.i18n.Messages;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
+import org.apache.ws.resource.properties.v1_2_draft05.porttype.InsertResourcePropertiesPortType;
import org.apache.ws.util.XmlBeanUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.xmlbeans.XmlObject;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.InsertResourcePropertiesResponseDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.InsertResourcePropertiesDocument;
-
-import javax.xml.namespace.QName;
-import java.util.Iterator;
-
+import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.InsertResourcePropertiesResponseDocument;
/**
* @author Sal Campana
*/
-public class InsertResourcePropertiesPortTypeImpl extends AbstractResourcePropertiesPortType implements InsertResourcePropertiesPortType
+public class InsertResourcePropertiesPortTypeImpl extends AbstractSetResourcePropertiesPortType
+ implements InsertResourcePropertiesPortType
{
- 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 {@link AbstractResourcePropertiesPortType} object.
+ * Creates a new {@link InsertResourcePropertiesPortTypeImpl} object.
*
* @param resourceContext DOCUMENT_ME
*/
- public InsertResourcePropertiesPortTypeImpl(ResourceContext resourceContext)
+ public InsertResourcePropertiesPortTypeImpl( ResourceContext resourceContext )
{
- super(resourceContext);
+ super( resourceContext );
}
-
/**
- * DOCUMENT_ME
- *
- * @param insertElem DOCUMENT_ME
- */
- protected void insertResourceProperty( InsertType insertElem )
- {
- if ( LOG.isDebugEnabled() )
- {
- LOG.debug( MSG.getMessage( Keys.INSERT_RP_REQ,
- insertElem.toString() ) );
- }
-
- XmlObject[] propElemsToBeInserted = XmlBeanUtils.getChildElements( insertElem );
- if ( propElemsToBeInserted.length == 0 )
- {
- return; // nothing to do
- }
- throwFaultIfElementNamesHeterogenous( propElemsToBeInserted );
-
- QName propName = XmlBeanUtils.getName( propElemsToBeInserted[0] );
- ResourceProperty prop = getProperty( propName );
-
- if(prop == null)
- {
- prop = createAnyProperty(propName);
- getProperties().add(prop);
- }
-
- if(!prop.getMetaData().isAny())
- {
- //todo probably need to check this for xsd:any to check for possible violations
- //refreshProperty( prop );
- throwFaultIfInsertionViolatesSchema( prop, propElemsToBeInserted );
- }
-
- throwFaultIfPropertyIsReadOnly( prop );
-
- try
- {
- insertPropertyCallback( prop, propElemsToBeInserted );
- }
- catch ( RuntimeException re )
- {
- throw new SetResourcePropertyRequestFailedFaultException( re.toString() );
- }
-
- Object[] oldValue = getValue( prop );
- for ( int i = 0; i < propElemsToBeInserted.length; i++ )
- {
- try
- {
- prop.add( propElemsToBeInserted[i] );
- }
- catch ( MetaDataViolationException mdve )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException( mdve );
- }
- }
- Object[] newValue = getValue( prop );
- if ( prop.getChangeListener() != null )
- {
- firePropChangeEvent( prop, oldValue, newValue );
- }
- }
-
- private void throwFaultIfInsertionViolatesSchema( ResourceProperty prop, XmlObject[] propElemsToBeInserted )
- {
- //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( MSG.getMessage( Keys.ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA,
- ( ( propElemsToBeInserted.length > 1 )
- ? "s" : "" ),
- prop.getMetaData().getName() ) );
- }
- }
- private void throwFaultIfPropertyIsReadOnly( ResourceProperty prop )
- {
- if ( prop.getMetaData().isReadOnly() )
- {
- throw new UnableToModifyResourcePropertyFaultException( prop.getMetaData().getName() );
- }
- }
- private Object[] getValue( ResourceProperty prop )
- {
- Object[] value = new Object[prop.size()];
- Iterator propElemIter = prop.iterator();
- int i = 0;
- while ( propElemIter.hasNext() )
- {
- value[i++] = propElemIter.next();
- }
- return value;
- }
- private void firePropChangeEvent( ResourceProperty prop, Object[] oldValue, Object[] newValue )
- {
- prop.getChangeListener().propertyChanged( new XmlBeansResourcePropertyValueChangeEvent( oldValue, newValue ) );
- }
-
- private void insertPropertyCallback( ResourceProperty prop,
- XmlObject[] propElemsToBeInserted )
- {
- SetResourcePropertyCallback setResourcePropertyCallback = getSetResourcePropertyCallback( prop );
- if ( setResourcePropertyCallback != null )
- {
- setResourcePropertyCallback.insertProperty( propElemsToBeInserted );
- }
- }
- private ResourceProperty createAnyProperty(QName propName)
- {
- ResourcePropertyMetaData propMetaData = new AnyResourcePropertyMetaData( propName );
- return propMetaData.create( getProperties() );
- }
- private ResourceProperty getProperty( QName propName )
- {
- LOG.debug( MSG.getMessage( Keys.GET_RP_WITH_NAME,
- propName.toString() ) );
- ResourceProperty prop = getProperties().get( propName );
- if ( prop == null )
- {
- if ( !getProperties().getMetaData().isOpenContent() )
- {
- throw new InvalidResourcePropertyQNameFaultException( propName );
- }
- }
- return prop;
- }
- private void throwFaultIfElementNamesHeterogenous( XmlObject[] propElems )
+ * DOCUMENT_ME
+ *
+ * @param requestDoc DOCUMENT_ME
+ *
+ * @return DOCUMENT_ME
+ */
+ public InsertResourcePropertiesResponseDocument insertResourceProperties(
+ InsertResourcePropertiesDocument requestDoc )
{
- QName firstPropElemName = XmlBeanUtils.getName( propElems[0] );
- for ( int i = 1; i < propElems.length; i++ )
- {
- QName propElemName = XmlBeanUtils.getName( propElems[i] );
- if ( !firstPropElemName.equals( propElemName ) )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException( MSG.getMessage( Keys.ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA,
- ( ( propElems.length > 1 )
- ? "s" : "" ),
- firstPropElemName ) );
- }
- }
+ InsertResourcePropertiesResponseDocument responseDoc = createResponseDocument();
+ InsertResourcePropertiesDocument.InsertResourceProperties requestElem = requestDoc.getInsertResourceProperties();
+ XmlObject[] propElemsToBeInserted = XmlBeanUtils.getChildElements( requestElem.getInsert() );
+ updateResourceProperty( propElemsToBeInserted );
+ return responseDoc;
}
- private InsertResourcePropertiesResponseDocument createResponseDocument()
+ private InsertResourcePropertiesResponseDocument createResponseDocument()
{
InsertResourcePropertiesResponseDocument responseDoc =
InsertResourcePropertiesResponseDocument.Factory.newInstance();
@@ -194,14 +53,9 @@
return responseDoc;
}
- /**
- * DOCUMENT_ME
- *
- * @param requestDoc DOCUMENT_ME
- * @return DOCUMENT_ME
- */
- public InsertResourcePropertiesResponseDocument insertResourceProperties(InsertResourcePropertiesDocument requestDoc)
+ protected NamespaceVersionHolder getNamespaceSet()
{
- return null;
+ return NAMESPACE_SET;
}
+
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/SetResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/SetResourcePropertiesPortTypeImpl.java?view=diff&r1=153968&r2=153969
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/SetResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/SetResourcePropertiesPortTypeImpl.java Tue Feb 15 14:55:38 2005
@@ -20,44 +20,32 @@
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.properties.MetaDataViolationException;
-import org.apache.ws.resource.properties.ResourceProperty;
-import org.apache.ws.resource.properties.ResourcePropertyCallback;
-import org.apache.ws.resource.properties.ResourcePropertyMetaData;
-import org.apache.ws.resource.properties.SetResourcePropertyCallback;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.faults.InvalidSetResourcePropertiesRequestContentFaultException;
import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
-import org.apache.ws.resource.properties.faults.SetResourcePropertyRequestFailedFaultException;
-import org.apache.ws.resource.properties.faults.UnableToModifyResourcePropertyFaultException;
+import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
import org.apache.ws.resource.properties.v1_2_draft05.porttype.SetResourcePropertiesPortType;
-import org.apache.ws.resource.properties.impl.AnyResourcePropertyMetaData;
-import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlObject;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.SetResourcePropertiesResponseDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.SetResourcePropertiesDocument;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.InsertType;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteType;
+import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.InsertType;
+import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.SetResourcePropertiesDocument;
+import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.SetResourcePropertiesResponseDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateType;
-import javax.xml.namespace.QName;
-import java.util.Iterator;
-
/**
- * LOG-DONE An operation provider for wsrp:SetResourceProperties.
+ * An implementation of the wsrpw:SetResourceProperties portType.
*
* @author Ian P. Springer
*/
public class SetResourcePropertiesPortTypeImpl
- extends AbstractResourcePropertiesPortType
+ extends AbstractSetResourcePropertiesPortType
implements SetResourcePropertiesPortType
{
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 {@link SetResourcePropertiesPortTypeImpl} object.
@@ -70,7 +58,7 @@
}
/**
- * Implementation of the wsrp:SetResourceProperties operation.
+ * Implementation of the wsrpw:SetResourceProperties operation.
*
* @param requestDoc the requestDoc XMLBean
*
@@ -79,14 +67,12 @@
* @throws InvalidResourcePropertyQNameFaultException
*
* @throws org.apache.ws.resource.faults.ResoureKeyHeaderNotFoundFaultException
- *
*/
public SetResourcePropertiesResponseDocument setResourceProperties( SetResourcePropertiesDocument requestDoc )
{
if ( LOG.isDebugEnabled() )
{
- LOG.debug( MSG.getMessage( Keys.SET_RP_REQ,
- requestDoc.toString() ) );
+ LOG.debug( MSG.getMessage( Keys.SET_RP_REQ, requestDoc ) );
}
SetResourcePropertiesResponseDocument responseDoc = createResponseDocument();
@@ -95,296 +81,26 @@
InsertType[] insertElems = requestElem.getInsertArray();
for ( int i = 0; i < insertElems.length; i++ )
{
- insertResourceProperty( insertElems[i] );
+ XmlObject[] propElemsToBeInserted = XmlBeanUtils.getChildElements( insertElems[i] );
+ insertResourceProperty( propElemsToBeInserted );
}
DeleteType[] deleteElems = requestElem.getDeleteArray();
for ( int i = 0; i < deleteElems.length; i++ )
{
- deleteResourceProperty( deleteElems[i] );
+ deleteResourceProperty( deleteElems[i].getResourceProperty() );
}
UpdateType[] updateElems = requestElem.getUpdateArray();
for ( int i = 0; i < updateElems.length; i++ )
{
- updateResourceProperty( updateElems[i] );
+ XmlObject[] newPropElems = XmlBeanUtils.getChildElements( updateElems[i] );
+ updateResourceProperty( newPropElems );
}
return responseDoc;
}
- /**
- * DOCUMENT_ME
- *
- * @param deleteElem DOCUMENT_ME
- */
- protected void deleteResourceProperty( DeleteType deleteElem )
- {
- if ( LOG.isDebugEnabled() )
- {
- LOG.debug( MSG.getMessage( Keys.DEL_RP_REQ,
- deleteElem.toString() ) );
- }
- QName nameOfPropToBeDeleted = deleteElem.getResourceProperty();
- if ( nameOfPropToBeDeleted == null )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException(namespaces, MSG.getMessage( Keys.DEL_MISSING_RP_ATTRIB ) );
- }
- ResourceProperty prop = getProperties().get( nameOfPropToBeDeleted );
- if ( prop == null )
- {
- if ( getProperties().getMetaData().isOpenContent() )
- {
- return;
- } else
- {
- throw new InvalidResourcePropertyQNameFaultException(namespaces, nameOfPropToBeDeleted );
- }
- }
- throwFaultIfPropertyIsReadOnly( prop );
- throwFaultIfDeletionViolatesSchema( prop );
- try
- {
- deletePropertyCallback( prop );
- }
- catch ( RuntimeException re )
- {
- throw new SetResourcePropertyRequestFailedFaultException( namespaces,re.toString() );
- }
- Object[] oldValue = getValue( prop );
- prop.clear();
- Object[] newValue = null;
- if ( prop.getChangeListener() != null )
- {
- firePropChangeEvent( prop, oldValue, newValue );
- }
- }
-
- /**
- * DOCUMENT_ME
- *
- * @param insertElem DOCUMENT_ME
- */
- protected void insertResourceProperty( InsertType insertElem )
- {
- if ( LOG.isDebugEnabled() )
- {
- LOG.debug( MSG.getMessage( Keys.INSERT_RP_REQ,
- insertElem.toString() ) );
- }
-
- XmlObject[] propElemsToBeInserted = XmlBeanUtils.getChildElements( insertElem );
- if ( propElemsToBeInserted.length == 0 )
- {
- return; // nothing to do
- }
- throwFaultIfElementNamesHeterogenous( propElemsToBeInserted );
-
- QName propName = XmlBeanUtils.getName( propElemsToBeInserted[0] );
- ResourceProperty prop = getProperty( propName );
-
- if(prop == null)
- {
- prop = createAnyProperty(propName);
- getProperties().add(prop);
- }
-
- if(!prop.getMetaData().isAny())
- {
- //todo probably need to check this for xsd:any to check for possible violations
- //refreshProperty( prop );
- throwFaultIfInsertionViolatesSchema( prop, propElemsToBeInserted );
- }
-
- throwFaultIfPropertyIsReadOnly( prop );
-
- try
- {
- insertPropertyCallback( prop, propElemsToBeInserted );
- }
- catch ( RuntimeException re )
- {
- throw new SetResourcePropertyRequestFailedFaultException(namespaces, re.toString() );
- }
-
- Object[] oldValue = getValue( prop );
- for ( int i = 0; i < propElemsToBeInserted.length; i++ )
- {
- try
- {
- prop.add( propElemsToBeInserted[i] );
- }
- catch ( MetaDataViolationException mdve )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException(namespaces, mdve );
- }
- }
- Object[] newValue = getValue( prop );
- if ( prop.getChangeListener() != null )
- {
- firePropChangeEvent( prop, oldValue, newValue );
- }
- }
-
- private void firePropChangeEvent( ResourceProperty prop, Object[] oldValue, Object[] newValue )
- {
- prop.getChangeListener().propertyChanged( new XmlBeansResourcePropertyValueChangeEvent( oldValue, newValue ) );
- }
-
- /**
- * DOCUMENT_ME
- *
- * @param updateElem DOCUMENT_ME
- */
- protected void updateResourceProperty( UpdateType updateElem )
- {
- if ( LOG.isDebugEnabled() )
- {
- LOG.debug( MSG.getMessage( Keys.UPDATE_RP_REQ,
- updateElem.toString() ) );
- }
-
- XmlObject[] newPropElems = XmlBeanUtils.getChildElements( updateElem );
- if ( newPropElems.length == 0 )
- {
- return; // nothing to do
- }
-
- QName propName = XmlBeanUtils.getName( newPropElems[0] );
- ResourceProperty prop = getProperty( propName );
-
- throwFaultIfPropertyIsReadOnly( prop );
- throwFaultIfElementNamesHeterogenous( newPropElems );
- throwFaultIfUpdateViolatesSchema( prop, newPropElems );
-
- try
- {
- updatePropertyCallback( prop, newPropElems );
- }
- catch ( RuntimeException re )
- {
- throw new SetResourcePropertyRequestFailedFaultException(namespaces, re.toString() );
- }
-
- Object[] oldValue = getValue( prop );
- // TODO: we might need to clone the oldValue elems, since we might be destroying them when we call clear() below
- try
- {
- prop.clear();
- for ( int i = 0; i < newPropElems.length; i++ )
- {
- prop.add( newPropElems[i] );
- }
- }
- catch ( MetaDataViolationException mdve )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException(namespaces, mdve );
- }
- Object[] newValue = getValue( prop );
- if ( prop.getChangeListener() != null )
- {
- firePropChangeEvent( prop, oldValue, newValue );
- }
- }
-
- private ResourceProperty createAnyProperty(QName propName)
- {
- ResourcePropertyMetaData propMetaData = new AnyResourcePropertyMetaData( propName );
- return propMetaData.create( getProperties() );
- }
-
- private Object[] getValue( ResourceProperty prop )
- {
- Object[] value = new Object[prop.size()];
- Iterator propElemIter = prop.iterator();
- int i = 0;
- while ( propElemIter.hasNext() )
- {
- value[i++] = propElemIter.next();
- }
- return value;
- }
-
- private ResourceProperty getProperty( QName propName )
- {
- LOG.debug( MSG.getMessage( Keys.GET_RP_WITH_NAME,
- propName.toString() ) );
- ResourceProperty prop = getProperties().get( propName );
- if ( prop == null )
- {
- if ( !getProperties().getMetaData().isOpenContent() )
- {
- throw new InvalidResourcePropertyQNameFaultException(namespaces, propName );
- }
- }
- return prop;
- }
-
- private void throwFaultIfElementNamesHeterogenous( XmlObject[] propElems )
- {
- QName firstPropElemName = XmlBeanUtils.getName( propElems[0] );
- for ( int i = 1; i < propElems.length; i++ )
- {
- QName propElemName = XmlBeanUtils.getName( propElems[i] );
- if ( !firstPropElemName.equals( propElemName ) )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException(namespaces, MSG.getMessage( Keys.ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA,
- ( ( propElems.length > 1 )
- ? "s" : "" ),
- firstPropElemName ) );
- }
- }
- }
-
- private void throwFaultIfDeletionViolatesSchema( ResourceProperty prop )
- {
- if ( prop.getMetaData().getMinOccurs() != 0 )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException( namespaces,MSG.getMessage( Keys.ERROR_PROPERTY_DELETE_VIOLATES_SCHEMA,
- prop.getMetaData().getName() ) );
- }
- }
-
- private void throwFaultIfInsertionViolatesSchema( ResourceProperty prop, XmlObject[] propElemsToBeInserted )
- {
- //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,
- ( ( propElemsToBeInserted.length > 1 )
- ? "s" : "" ),
- prop.getMetaData().getName() ) );
- }
- }
-
- private void throwFaultIfUpdateViolatesSchema( ResourceProperty prop, XmlObject[] newPropElems )
- {
- if ( prop.getMetaData().getMaxOccurs() != -1 && newPropElems.length > prop.getMetaData().getMaxOccurs() )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException(namespaces, MSG.getMessage( Keys.ERROR_PROPERTY_UPDATE_VIOLATES_SCHEMA,
- prop.getMetaData().getName() ) );
- }
- }
-
- /**
- * Returns SetResourcePropertyCallback or null
- *
- * @param prop
- *
- * @return SetResourcePropertyCallback or null
- */
- private SetResourcePropertyCallback getSetResourcePropertyCallback( ResourceProperty prop )
- {
- SetResourcePropertyCallback setResourcePropertyCallback = null;
- ResourcePropertyCallback callBack = prop.getCallBack();
- if ( callBack instanceof SetResourcePropertyCallback )
- {
- setResourcePropertyCallback = (SetResourcePropertyCallback) callBack;
- }
-
- return setResourcePropertyCallback;
- }
-
private SetResourcePropertiesResponseDocument createResponseDocument()
{
SetResourcePropertiesResponseDocument responseDoc =
@@ -393,41 +109,9 @@
return responseDoc;
}
- private void deletePropertyCallback( ResourceProperty prop )
- {
- QName nameOfPropToBeDeleted = prop.getMetaData().getName();
- SetResourcePropertyCallback setResourcePropertyCallback = getSetResourcePropertyCallback( prop );
- if ( setResourcePropertyCallback != null )
- {
- setResourcePropertyCallback.deleteProperty( nameOfPropToBeDeleted );
- }
- }
-
- private void insertPropertyCallback( ResourceProperty prop,
- XmlObject[] propElemsToBeInserted )
- {
- SetResourcePropertyCallback setResourcePropertyCallback = getSetResourcePropertyCallback( prop );
- if ( setResourcePropertyCallback != null )
- {
- setResourcePropertyCallback.insertProperty( propElemsToBeInserted );
- }
- }
-
- private void throwFaultIfPropertyIsReadOnly( ResourceProperty prop )
+ protected NamespaceVersionHolder getNamespaceSet()
{
- if ( prop.getMetaData().isReadOnly() )
- {
- throw new UnableToModifyResourcePropertyFaultException( namespaces,prop.getMetaData().getName() );
- }
+ return NAMESPACE_SET;
}
- private void updatePropertyCallback( ResourceProperty prop,
- XmlObject[] newPropElems )
- {
- SetResourcePropertyCallback setResourcePropertyCallback = getSetResourcePropertyCallback( prop );
- if ( setResourcePropertyCallback != null )
- {
- setResourcePropertyCallback.updateProperty( newPropElems );
- }
- }
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java?view=diff&r1=153968&r2=153969
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java Tue Feb 15 14:55:38 2005
@@ -1,34 +1,23 @@
package org.apache.ws.resource.properties.v1_2_draft05.porttype.impl;
-import org.apache.ws.resource.properties.v1_2_draft05.porttype.UpdateResourcePropertiesPortType;
-import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
-import org.apache.ws.resource.properties.ResourceProperty;
-import org.apache.ws.resource.properties.MetaDataViolationException;
-import org.apache.ws.resource.properties.SetResourcePropertyCallback;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.i18n.Keys;
-import org.apache.ws.util.i18n.Messages;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
+import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
+import org.apache.ws.resource.properties.v1_2_draft05.porttype.UpdateResourcePropertiesPortType;
import org.apache.ws.util.XmlBeanUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.xmlbeans.XmlObject;
-import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesResponseDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesDocument;
-
-import javax.xml.namespace.QName;
-import java.util.Iterator;
-
+import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesResponseDocument;
/**
- * @author Sal Campana
+ * @author Ian Springer
*/
-public class UpdateResourcePropertiesPortTypeImpl extends AbstractResourcePropertiesPortType implements UpdateResourcePropertiesPortType
+public class UpdateResourcePropertiesPortTypeImpl extends AbstractSetResourcePropertiesPortType implements UpdateResourcePropertiesPortType
{
- 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 {@link AbstractResourcePropertiesPortType} object.
*
@@ -39,7 +28,6 @@
super(resourceContext);
}
-
/**
* DOCUMENT_ME
*
@@ -48,124 +36,24 @@
*/
public UpdateResourcePropertiesResponseDocument updateResourceProperties(UpdateResourcePropertiesDocument requestDoc)
{
- return null;
- }
- /**
- * DOCUMENT_ME
- *
- * @param updateElem DOCUMENT_ME
- */
- protected void updateResourceProperty( UpdateType updateElem )
- {
- if ( LOG.isDebugEnabled() )
- {
- LOG.debug( MSG.getMessage( Keys.UPDATE_RP_REQ,
- updateElem.toString() ) );
- }
-
- XmlObject[] newPropElems = XmlBeanUtils.getChildElements( updateElem );
- if ( newPropElems.length == 0 )
- {
- return; // nothing to do
- }
-
- QName propName = XmlBeanUtils.getName( newPropElems[0] );
- ResourceProperty prop = getProperty( propName );
-
- throwFaultIfPropertyIsReadOnly( prop );
- throwFaultIfElementNamesHeterogenous( newPropElems );
- throwFaultIfUpdateViolatesSchema( prop, newPropElems );
-
- try
- {
- updatePropertyCallback( prop, newPropElems );
- }
- catch ( RuntimeException re )
- {
- throw new SetResourcePropertyRequestFailedFaultException( re.toString() );
- }
-
- Object[] oldValue = getValue( prop );
- // TODO: we might need to clone the oldValue elems, since we might be destroying them when we call clear() below
- try
- {
- prop.clear();
- for ( int i = 0; i < newPropElems.length; i++ )
- {
- prop.add( newPropElems[i] );
- }
- }
- catch ( MetaDataViolationException mdve )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException( mdve );
- }
- Object[] newValue = getValue( prop );
- if ( prop.getChangeListener() != null )
- {
- firePropChangeEvent( prop, oldValue, newValue );
- }
- }
-
- private void updatePropertyCallback( ResourceProperty prop,
- XmlObject[] newPropElems )
- {
- SetResourcePropertyCallback setResourcePropertyCallback = getSetResourcePropertyCallback( prop );
- if ( setResourcePropertyCallback != null )
- {
- setResourcePropertyCallback.updateProperty( newPropElems );
- }
- }
- private void firePropChangeEvent( ResourceProperty prop, Object[] oldValue, Object[] newValue )
- {
- prop.getChangeListener().propertyChanged( new XmlBeansResourcePropertyValueChangeEvent( oldValue, newValue ) );
- }
- private void throwFaultIfElementNamesHeterogenous( XmlObject[] propElems )
- {
- QName firstPropElemName = XmlBeanUtils.getName( propElems[0] );
- for ( int i = 1; i < propElems.length; i++ )
- {
- QName propElemName = XmlBeanUtils.getName( propElems[i] );
- if ( !firstPropElemName.equals( propElemName ) )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException( MSG.getMessage( Keys.ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA,
- ( ( propElems.length > 1 )
- ? "s" : "" ),
- firstPropElemName ) );
- }
- }
- }
- private void throwFaultIfPropertyIsReadOnly( ResourceProperty prop )
- {
- if ( prop.getMetaData().isReadOnly() )
- {
- throw new UnableToModifyResourcePropertyFaultException( prop.getMetaData().getName() );
- }
- }
- private void throwFaultIfUpdateViolatesSchema( ResourceProperty prop, XmlObject[] newPropElems )
- {
- if ( prop.getMetaData().getMaxOccurs() != -1 && newPropElems.length > prop.getMetaData().getMaxOccurs() )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException( MSG.getMessage( Keys.ERROR_PROPERTY_UPDATE_VIOLATES_SCHEMA,
- prop.getMetaData().getName() ) );
- }
+ UpdateResourcePropertiesResponseDocument responseDoc = createResponseDocument();
+ UpdateResourcePropertiesDocument.UpdateResourceProperties requestElem = requestDoc.getUpdateResourceProperties();
+ XmlObject[] newPropElems = XmlBeanUtils.getChildElements( requestElem.getUpdate() );
+ updateResourceProperty( newPropElems );
+ return responseDoc;
}
- private Object[] getValue( ResourceProperty prop )
- {
- Object[] value = new Object[prop.size()];
- Iterator propElemIter = prop.iterator();
- int i = 0;
- while ( propElemIter.hasNext() )
- {
- value[i++] = propElemIter.next();
- }
- return value;
- }
- private UpdateResourcePropertiesResponseDocument createResponseDocument()
+ private UpdateResourcePropertiesResponseDocument createResponseDocument()
{
UpdateResourcePropertiesResponseDocument responseDoc =
UpdateResourcePropertiesResponseDocument.Factory.newInstance();
responseDoc.addNewUpdateResourcePropertiesResponse();
return responseDoc;
}
+
+ protected NamespaceVersionHolder getNamespaceSet()
+ {
+ return NAMESPACE_SET;
+ }
+
}
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=153968&r2=153969
==============================================================================
--- 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 Tue Feb 15 14:55:38 2005
@@ -536,8 +536,7 @@
//add to context
context.put( "generated", props );
- context.put( "qnames",
- new ConstQNames() );
+ context.put( "qnames", new ConstQNames() );
//generate files
File packageDir = getPackageDir( resourceDef.getDefinition().getTargetNamespace(), serviceDir );
Modified: incubator/apollo/trunk/src/templates/1_2_draft01/GetMultiple.txt
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/1_2_draft01/GetMultiple.txt?view=diff&r1=153968&r2=153969
==============================================================================
--- incubator/apollo/trunk/src/templates/1_2_draft01/GetMultiple.txt (original)
+++ incubator/apollo/trunk/src/templates/1_2_draft01/GetMultiple.txt Tue Feb 15 14:55:38 2005
@@ -7,5 +7,5 @@
*/
public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesResponseDocument getMultipleResourceProperties( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesDocument requestDoc )
{
- return new org.apache.ws.resource.properties.v1_2.porttype.impl.GetMultipleResourcePropertiesProvider( getResourceContext( ) ).getMultipleResourceProperties( requestDoc );
+ return new org.apache.ws.resource.properties.v1_2.porttype.impl.GetMultipleResourcePropertiesPortTypeImpl( getResourceContext( ) ).getMultipleResourceProperties( requestDoc );
}
Modified: incubator/apollo/trunk/src/templates/1_2_draft01/GetResource.txt
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/1_2_draft01/GetResource.txt?view=diff&r1=153968&r2=153969
==============================================================================
--- incubator/apollo/trunk/src/templates/1_2_draft01/GetResource.txt (original)
+++ incubator/apollo/trunk/src/templates/1_2_draft01/GetResource.txt Tue Feb 15 14:55:38 2005
@@ -7,5 +7,5 @@
*/
public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyResponseDocument getResourceProperty( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyDocument requestDoc )
{
- return new org.apache.ws.resource.properties.v1_2.porttype.impl.GetResourcePropertyProvider( getResourceContext( ) ).getResourceProperty( requestDoc );
+ return new org.apache.ws.resource.properties.v1_2.porttype.impl.GetResourcePropertyPortTypeImpl( getResourceContext( ) ).getResourceProperty( requestDoc );
}
Modified: incubator/apollo/trunk/src/templates/1_2_draft01/Query.txt
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/1_2_draft01/Query.txt?view=diff&r1=153968&r2=153969
==============================================================================
--- incubator/apollo/trunk/src/templates/1_2_draft01/Query.txt (original)
+++ incubator/apollo/trunk/src/templates/1_2_draft01/Query.txt Tue Feb 15 14:55:38 2005
@@ -7,5 +7,5 @@
*/
public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryResourcePropertiesResponseDocument queryResourceProperties( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryResourcePropertiesDocument requestDoc )
{
- return new org.apache.ws.resource.properties.v1_2.porttype.impl.QueryResourcePropertiesProvider( getResourceContext( ) ).queryResourceProperties( requestDoc );
+ return new org.apache.ws.resource.properties.v1_2.porttype.impl.QueryResourcePropertiesPortTypeImpl( getResourceContext( ) ).queryResourceProperties( requestDoc );
}
Modified: incubator/apollo/trunk/src/templates/1_2_draft01/Set.txt
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/1_2_draft01/Set.txt?view=diff&r1=153968&r2=153969
==============================================================================
--- incubator/apollo/trunk/src/templates/1_2_draft01/Set.txt (original)
+++ incubator/apollo/trunk/src/templates/1_2_draft01/Set.txt Tue Feb 15 14:55:38 2005
@@ -7,5 +7,5 @@
*/
public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.SetResourcePropertiesResponseDocument setResourceProperties( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.SetResourcePropertiesDocument requestDoc )
{
- return new org.apache.ws.resource.properties.v1_2.porttype.impl.SetResourcePropertiesProvider( getResourceContext( ) ).setResourceProperties( requestDoc );
+ return new org.apache.ws.resource.properties.v1_2.porttype.impl.SetResourcePropertiesPortTypeImpl( getResourceContext( ) ).setResourceProperties( requestDoc );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org