You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by ip...@apache.org on 2005/03/05 00:11:03 UTC
svn commit: r156208 [1/2] - in incubator/apollo/trunk/src:
java/org/apache/ws/resource/faults/ java/org/apache/ws/resource/i18n/
java/org/apache/ws/resource/lifetime/v1_2_draft01/porttype/impl/
java/org/apache/ws/resource/lifetime/v1_2_draft04/porttype/impl/
java/org/apache/ws/resource/properties/faults/
java/org/apache/ws/resource/properties/impl/
java/org/apache/ws/resource/properties/v1_2_draft01/impl/
java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/
java/org/apache/ws/resource/properties/v1_2_draft05/impl/
java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/
test/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/
Author: ips
Date: Fri Mar 4 15:10:51 2005
New Revision: 156208
URL: http://svn.apache.org/viewcvs?view=rev&rev=156208
Log:
refactored draft01 SetRP portType impl to extend abstract impl; updated unit tests as required
Added:
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/impl/
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/impl/NamespaceVersionHolderImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/impl/XmlBeansResourcePropertyValueChangeEvent.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/impl/
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/impl/NamespaceVersionHolderImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/impl/XmlBeansResourcePropertyValueChangeEvent.java
Removed:
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/XmlBeansResourcePropertyValueChangeEvent.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/XmlBeansResourcePropertyValueChangeEvent.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/i18n/Keys.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft01/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft01/porttype/impl/ScheduledResourceTerminationPortTypeImpl.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/faults/DeleteResourcePropertyRequestFailedFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetResourcePropertyPortTypeImpl.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/DeleteResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.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/GetResourcePropertyPortTypeImpl.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/QueryResourcePropertiesPortTypeImpl.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/test/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/AbstractWsrpPortTypeImplTestCase.java
incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/SetResourcePropertiesProviderTestCase.java
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java?view=diff&r1=156207&r2=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java Fri Mar 4 15:10:51 2005
@@ -226,7 +226,7 @@
private void populateBaseFaultXmlBean( XmlObject baseFaultXBean )
{
- if ( m_namespaceSet instanceof org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.NamespaceVersionHolderImpl )
+ if ( m_namespaceSet instanceof org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl )
{
org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSBaseFaults12Draft03.BaseFaultType baseFaultType = (org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSBaseFaults12Draft03.BaseFaultType) baseFaultXBean;
baseFaultType.setTimestamp( m_timestamp );
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=156207&r2=156208
==============================================================================
--- 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 Fri Mar 4 15:10:51 2005
@@ -539,6 +539,14 @@
*/
String ON_RP_SET = "ON_RP_SET";
/**
+ * @msg All property elements in Insert request must have the same name.
+ */
+ String ERROR_INSERT_ELEMS_NOT_HOMOGENOUS = "ERROR_INSERT_ELEMS_NOT_HOMOGENOUS";
+ /**
+ * @msg All property elements in Update request must have the same name.
+ */
+ String ERROR_UPDATE_ELEMS_NOT_HOMOGENOUS = "ERROR_UPDATE_ELEMS_NOT_HOMOGENOUS";
+ /**
* @msg XML Beans XPath expression evaluator
*/
String XMLBEANS_XPATH_EVAL = "XMLBEANS_XPATH_EVAL";
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft01/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft01/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java?view=diff&r1=156207&r2=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft01/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft01/porttype/impl/ImmediateResourceTerminationPortTypeImpl.java Fri Mar 4 15:10:51 2005
@@ -25,7 +25,8 @@
import org.apache.ws.resource.lifetime.faults.ResourceNotDestroyedFaultException;
import org.apache.ws.resource.lifetime.v1_2_draft01.porttype.ImmediateResourceTerminationPortType;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.v1_2_draft01.porttype.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v1_2_draft01.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v1_2_draft01.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.i18n.Messages;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.DestroyDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.DestroyResponseDocument;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft01/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft01/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java?view=diff&r1=156207&r2=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft01/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2_draft01/porttype/impl/ScheduledResourceTerminationPortTypeImpl.java Fri Mar 4 15:10:51 2005
@@ -26,7 +26,8 @@
import org.apache.ws.resource.lifetime.v1_2_draft01.porttype.ScheduledResourceTerminationPortType;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
-import org.apache.ws.resource.properties.v1_2_draft01.porttype.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v1_2_draft01.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v1_2_draft01.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.i18n.Messages;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.SetTerminationTimeDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.SetTerminationTimeResponseDocument;
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=156207&r2=156208
==============================================================================
--- 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 Fri Mar 4 15:10:51 2005
@@ -25,7 +25,8 @@
import org.apache.ws.resource.lifetime.faults.ResourceNotDestroyedFaultException;
import org.apache.ws.resource.lifetime.v1_2_draft04.porttype.ImmediateResourceTerminationPortType;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.i18n.Messages;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.DestroyDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.DestroyResponseDocument;
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=156207&r2=156208
==============================================================================
--- 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 Fri Mar 4 15:10:51 2005
@@ -26,7 +26,8 @@
import org.apache.ws.resource.lifetime.v1_2_draft04.porttype.ScheduledResourceTerminationPortType;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
-import org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.i18n.Messages;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.SetTerminationTimeDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.SetTerminationTimeResponseDocument;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/DeleteResourcePropertyRequestFailedFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/DeleteResourcePropertyRequestFailedFaultException.java?view=diff&r1=156207&r2=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/DeleteResourcePropertyRequestFailedFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/DeleteResourcePropertyRequestFailedFaultException.java Fri Mar 4 15:10:51 2005
@@ -33,13 +33,12 @@
* Creates a new {@link DeleteResourcePropertyRequestFailedFaultException} object.
*
* @param namespaces DOCUMENT_ME
- * @param propName the name of the property that could not be deleted
+ * @param description a description of why the operation failed
*/
public DeleteResourcePropertyRequestFailedFaultException( NamespaceVersionHolder namespaces,
- QName propName )
+ String description )
{
- super( namespaces,
- "Failed to delete property named " + propName );
+ super( namespaces, description );
m_name = new QName( namespaces.getPropertiesXsdNamespace(),
"DeleteResourcePropertyRequestFailedFault",
"wsrp" );
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java?view=diff&r1=156207&r2=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidInsertResourcePropertiesRequestContentFaultException.java Fri Mar 4 15:10:51 2005
@@ -16,7 +16,6 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
-import org.apache.ws.resource.faults.Description;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import javax.xml.namespace.QName;
@@ -37,14 +36,12 @@
* @param description DOCUMENT_ME
*/
public InvalidInsertResourcePropertiesRequestContentFaultException( NamespaceVersionHolder namespaces,
- Description[] description )
+ String description )
{
- super( namespaces,
- "" );
+ super( namespaces, description );
m_name = new QName( namespaces.getPropertiesXsdNamespace(),
"InvalidInsertResourcePropertiesRequestContentFault",
"wsrp" );
- setDescription( description );
}
/**
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java?view=diff&r1=156207&r2=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidSetResourcePropertiesRequestContentFaultException.java Fri Mar 4 15:10:51 2005
@@ -18,47 +18,44 @@
import org.apache.ws.resource.faults.AbstractBaseFaultException;
import org.apache.ws.resource.properties.MetaDataViolationException;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
import javax.xml.namespace.QName;
/**
- * LOG-DONE
- * WS-ResourceProperties InvalidSetResourcePropertiesRequestContent fault type implemented as a Java exception.
+ * LOG-DONE WS-ResourceProperties InvalidSetResourcePropertiesRequestContent fault type implemented as a Java
+ * exception.
*
* @author Ian P. Springer
*/
public class InvalidSetResourcePropertiesRequestContentFaultException
- extends AbstractBaseFaultException
+ extends AbstractBaseFaultException
{
- private QName m_name;
+ private QName m_name;
- /**
- * Constructs a new InvalidSetResourcePropertiesRequestContentFaultException.
- *
- * @param description a WS-BaseFaults description
- */
- public InvalidSetResourcePropertiesRequestContentFaultException( NamespaceVersionHolder namespaces,String description )
- {
- super(namespaces, description );
- }
-
- /**
- * Constructs a new BaseFaultException with the specified SOAP message and actor.
- *
- * @param mdve
- */
- public InvalidSetResourcePropertiesRequestContentFaultException( NamespaceVersionHolder namespaces,MetaDataViolationException mdve )
- {
- this( namespaces, mdve.toString( ) );
- }
-
- private static QName getQName(NamespaceVersionHolder namespaces)
- {
- return new QName( namespaces.getPropertiesXsdNamespace(), "InvalidSetResourcePropertiesRequestContentFault",
- ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
- }
+ /**
+ * Constructs a new InvalidSetResourcePropertiesRequestContentFaultException.
+ *
+ * @param description a WS-BaseFaults description
+ */
+ public InvalidSetResourcePropertiesRequestContentFaultException( NamespaceVersionHolder namespaces,
+ String description )
+ {
+ super( namespaces, description );
+ m_name = new QName( namespaces.getPropertiesXsdNamespace(), "InvalidSetResourcePropertiesRequestContentFault",
+ "wsrp" );
+ }
+
+ /**
+ * Constructs a new BaseFaultException with the specified SOAP message and actor.
+ *
+ * @param mdve
+ */
+ public InvalidSetResourcePropertiesRequestContentFaultException( NamespaceVersionHolder namespaces,
+ MetaDataViolationException mdve )
+ {
+ this( namespaces, mdve.toString() );
+ }
/**
* Returns the element name for this base fault.
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java?view=diff&r1=156207&r2=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/faults/InvalidUpdateResourcePropertiesRequestContentFaultException.java Fri Mar 4 15:10:51 2005
@@ -16,7 +16,6 @@
package org.apache.ws.resource.properties.faults;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
-import org.apache.ws.resource.faults.Description;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import javax.xml.namespace.QName;
@@ -37,13 +36,12 @@
* @param description DOCUMENT_ME
*/
public InvalidUpdateResourcePropertiesRequestContentFaultException( NamespaceVersionHolder namespaces,
- Description[] description )
+ String description )
{
- super( namespaces, "" );
+ super( namespaces, description );
m_name = new QName( namespaces.getPropertiesXsdNamespace(),
"InvalidUpdateResourcePropertiesRequestContentFault",
"wsrp" );
- setDescription( description );
}
/**
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=156207&r2=156208
==============================================================================
--- 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 Fri Mar 4 15:10:51 2005
@@ -29,7 +29,10 @@
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.resource.properties.faults.DeleteResourcePropertyRequestFailedFaultException;
+import org.apache.ws.resource.properties.faults.InvalidInsertResourcePropertiesRequestContentFaultException;
+import org.apache.ws.resource.properties.faults.InvalidUpdateResourcePropertiesRequestContentFaultException;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.XmlBeansResourcePropertyValueChangeEvent;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlObject;
@@ -66,7 +69,7 @@
}
if ( nameOfPropToBeDeleted == null )
{
- throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(), MSG.getMessage( Keys.DEL_MISSING_RP_ATTRIB ) );
+ throw new DeleteResourcePropertyRequestFailedFaultException( getNamespaceSet(), MSG.getMessage( Keys.DEL_MISSING_RP_ATTRIB ) );
}
ResourceProperty prop = getProperties().get( nameOfPropToBeDeleted );
if ( prop == null )
@@ -74,7 +77,8 @@
if ( getProperties().getMetaData().isOpenContent() )
{
return;
- } else
+ }
+ else
{
throw new InvalidResourcePropertyQNameFaultException( getNamespaceSet(), nameOfPropToBeDeleted );
}
@@ -87,7 +91,7 @@
}
catch ( RuntimeException re )
{
- throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(), re.toString() );
+ throw new DeleteResourcePropertyRequestFailedFaultException( getNamespaceSet(), re.toString() );
}
Object[] oldValue = getValue( prop );
prop.clear();
@@ -98,25 +102,6 @@
}
}
- 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
*
@@ -132,7 +117,10 @@
{
return; // nothing to do
}
- throwFaultIfElementNamesHeterogenous( propElemsToBeInserted );
+ if ( elementNamesNotHomogenous( propElemsToBeInserted ) )
+ {
+ throw new InvalidInsertResourcePropertiesRequestContentFaultException( getNamespaceSet(), MSG.getMessage( Keys.ERROR_INSERT_ELEMS_NOT_HOMOGENOUS ) );
+ }
QName propName = XmlBeanUtils.getName( propElemsToBeInserted[0] );
ResourceProperty prop = getProperty( propName );
@@ -145,8 +133,6 @@
if(!prop.getMetaData().isAny())
{
- //todo probably need to check this for xsd:any to check for possible violations
- //refreshProperty( prop );
throwFaultIfInsertionViolatesSchema( prop, propElemsToBeInserted );
}
@@ -180,11 +166,6 @@
}
}
- private void firePropChangeEvent( ResourceProperty prop, Object[] oldValue, Object[] newValue )
- {
- prop.getChangeListener().propertyChanged( new XmlBeansResourcePropertyValueChangeEvent( oldValue, newValue ) );
- }
-
/**
* DOCUMENT_ME
*
@@ -204,7 +185,10 @@
ResourceProperty prop = getProperty( propName );
throwFaultIfPropertyIsReadOnly( prop );
- throwFaultIfElementNamesHeterogenous( newPropElems );
+ if ( elementNamesNotHomogenous( newPropElems ) )
+ {
+ throw new InvalidUpdateResourcePropertiesRequestContentFaultException( getNamespaceSet(), MSG.getMessage( Keys.ERROR_UPDATE_ELEMS_NOT_HOMOGENOUS ) );
+ }
throwFaultIfUpdateViolatesSchema( prop, newPropElems );
try
@@ -270,7 +254,7 @@
return prop;
}
- private void throwFaultIfElementNamesHeterogenous( XmlObject[] propElems )
+ private boolean elementNamesNotHomogenous( XmlObject[] propElems )
{
QName firstPropElemName = XmlBeanUtils.getName( propElems[0] );
for ( int i = 1; i < propElems.length; i++ )
@@ -278,20 +262,18 @@
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 ) );
+ return true;
}
}
+ return false;
}
private void throwFaultIfInsertionViolatesSchema( ResourceProperty prop, XmlObject[] propElemsToBeInserted )
{
- //todo probably need to check this for xsd:any to check for possible violations
+ // 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,
+ throw new InvalidInsertResourcePropertiesRequestContentFaultException( getNamespaceSet(), MSG.getMessage( Keys.ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA,
( ( propElemsToBeInserted.length > 1 )
? "s" : "" ),
prop.getMetaData().getName() ) );
@@ -302,7 +284,7 @@
{
if ( prop.getMetaData().getMaxOccurs() != -1 && newPropElems.length > prop.getMetaData().getMaxOccurs() )
{
- throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(), MSG.getMessage( Keys.ERROR_PROPERTY_UPDATE_VIOLATES_SCHEMA,
+ throw new InvalidUpdateResourcePropertiesRequestContentFaultException( getNamespaceSet(), MSG.getMessage( Keys.ERROR_PROPERTY_UPDATE_VIOLATES_SCHEMA,
prop.getMetaData().getName() ) );
}
}
@@ -354,5 +336,28 @@
}
}
+ 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 );
+ }
+ }
+
+ private void firePropChangeEvent( ResourceProperty prop, Object[] oldValue, Object[] newValue )
+ {
+ prop.getChangeListener().propertyChanged( new XmlBeansResourcePropertyValueChangeEvent( oldValue, newValue ) );
+ }
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java?view=diff&r1=156207&r2=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java Fri Mar 4 15:10:51 2005
@@ -352,7 +352,7 @@
{
XmlAnySimpleType simplePropXBean = (XmlAnySimpleType) propXBean;
String untrimmedValue = simplePropXBean.getStringValue();
- String trimmedValue = ( untrimmedValue != null ) ? untrimmedValue.trim() : null;
+ String trimmedValue = untrimmedValue != null ? untrimmedValue.trim() : null;
simplePropXBean.setStringValue( trimmedValue );
}
}
Added: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/impl/NamespaceVersionHolderImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/impl/NamespaceVersionHolderImpl.java?view=auto&rev=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/impl/NamespaceVersionHolderImpl.java (added)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/impl/NamespaceVersionHolderImpl.java Fri Mar 4 15:10:51 2005
@@ -0,0 +1,41 @@
+package org.apache.ws.resource.properties.v1_2_draft01.impl;
+
+import org.apache.axis.message.addressing.Constants;
+import org.apache.ws.resource.faults.v1_2_draft01.Faults1_2Constants;
+import org.apache.ws.resource.lifetime.v1_2_draft01.ResourceLifetime1_2Constants;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants;
+import org.apache.ws.resource.servicegroup.v1_2_draft01.ServiceGroup1_2Constants;
+
+
+/**
+ * @author Sal Campana
+ */
+public class NamespaceVersionHolderImpl implements NamespaceVersionHolder
+{
+
+ public String getPropertiesXsdNamespace()
+ {
+ return ResourcePropertiesConstants.NSURI_WSRP_SCHEMA;
+ }
+
+ public String getLifetimeXsdNamespace()
+ {
+ return ResourceLifetime1_2Constants.NSURI_WSRL_SCHEMA;
+ }
+
+ public String getBaseFaultsXsdNamespace()
+ {
+ return Faults1_2Constants.NSURI_BASEFAULTS_SCHEMA;
+ }
+
+ public String getAddressingNamespace()
+ {
+ return Constants.NS_URI_ADDRESSING_2003_03;
+ }
+
+ public String getServiceGroupsXsdNamespace()
+ {
+ return ServiceGroup1_2Constants.NSURI_WSSG_SCHEMA;
+ }
+}
Added: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/impl/XmlBeansResourcePropertyValueChangeEvent.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/impl/XmlBeansResourcePropertyValueChangeEvent.java?view=auto&rev=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/impl/XmlBeansResourcePropertyValueChangeEvent.java (added)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/impl/XmlBeansResourcePropertyValueChangeEvent.java Fri Mar 4 15:10:51 2005
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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.v1_2_draft01.impl;
+
+import org.apache.ws.XmlObjectWrapper;
+import org.apache.ws.resource.properties.ResourcePropertyValueChangeEvent;
+import org.apache.ws.resource.properties.impl.AbstractXmlBeansResourcePropertyValueChangeEvent;
+import org.apache.ws.util.XmlBeanUtils;
+import org.apache.xmlbeans.XmlObject;
+import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.ResourcePropertyValueChangeNotificationDocument;
+import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.ResourcePropertyValueChangeNotificationType;
+
+/**
+ * @author Ian P. Springer (Hewlett-Packard Company)
+ */
+public class XmlBeansResourcePropertyValueChangeEvent extends AbstractXmlBeansResourcePropertyValueChangeEvent implements ResourcePropertyValueChangeEvent, XmlObjectWrapper
+{
+ public XmlBeansResourcePropertyValueChangeEvent(Object[] oldValue, Object[] newValue)
+ {
+ super(oldValue, newValue);
+ }
+
+ protected XmlObject buildPropValueChangeNotifDocXmlBean( Object[] oldValue, Object[] newValue )
+ {
+ ResourcePropertyValueChangeNotificationDocument propValueChangeNotifDocXBean = ResourcePropertyValueChangeNotificationDocument.Factory.newInstance();
+ ResourcePropertyValueChangeNotificationType propValueChangeNotifXBean = propValueChangeNotifDocXBean.addNewResourcePropertyValueChangeNotification();
+ ResourcePropertyValueChangeNotificationType.OldValue oldValueXBean = propValueChangeNotifXBean.addNewOldValue();
+ if ( oldValue != null )
+ {
+ for ( int i = 0; i < oldValue.length; i++ )
+ {
+ XmlBeanUtils.addChildElement( oldValueXBean, (XmlObject) oldValue[i] );
+ }
+ }
+ else
+ {
+ oldValueXBean.setNil();
+ }
+ ResourcePropertyValueChangeNotificationType.NewValue newValueXBean = propValueChangeNotifXBean.addNewNewValue();
+ if ( newValue != null )
+ {
+ for ( int i = 0; i < oldValue.length; i++ )
+ {
+ XmlBeanUtils.addChildElement( newValueXBean, (XmlObject) newValue[i] );
+ }
+ }
+ else
+ {
+ newValueXBean.setNil();
+ }
+ return propValueChangeNotifDocXBean;
+ }
+
+}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java?view=diff&r1=156207&r2=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java Fri Mar 4 15:10:51 2005
@@ -21,6 +21,7 @@
import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
import org.apache.ws.resource.properties.impl.AbstractGetResourcePropertiesPortType;
import org.apache.ws.resource.properties.v1_2_draft01.porttype.GetMultipleResourcePropertiesPortType;
+import org.apache.ws.resource.properties.v1_2_draft01.impl.NamespaceVersionHolderImpl;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesResponseDocument;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetResourcePropertyPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetResourcePropertyPortTypeImpl.java?view=diff&r1=156207&r2=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetResourcePropertyPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft01/porttype/impl/GetResourcePropertyPortTypeImpl.java Fri Mar 4 15:10:51 2005
@@ -25,6 +25,7 @@
import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
import org.apache.ws.resource.properties.impl.AbstractGetResourcePropertiesPortType;
import org.apache.ws.resource.properties.v1_2_draft01.porttype.GetResourcePropertyPortType;
+import org.apache.ws.resource.properties.v1_2_draft01.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.i18n.Messages;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyResponseDocument;
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=156207&r2=156208
==============================================================================
--- 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 Fri Mar 4 15:10:51 2005
@@ -32,6 +32,7 @@
import org.apache.ws.resource.properties.query.impl.QueryEngineImpl;
import org.apache.ws.resource.properties.query.impl.XmlBeansQueryExpression;
import org.apache.ws.resource.properties.v1_2_draft01.porttype.QueryResourcePropertiesPortType;
+import org.apache.ws.resource.properties.v1_2_draft01.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlObject;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/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=156207&r2=156208
==============================================================================
--- 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 Fri Mar 4 15:10:51 2005
@@ -20,21 +20,19 @@
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.InsertResourcePropertyRequestFailedFaultException;
import org.apache.ws.resource.properties.faults.SetResourcePropertyRequestFailedFaultException;
-import org.apache.ws.resource.properties.faults.UnableToModifyResourcePropertyFaultException;
-import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
-import org.apache.ws.resource.properties.impl.AnyResourcePropertyMetaData;
+import org.apache.ws.resource.properties.faults.InvalidInsertResourcePropertiesRequestContentFaultException;
+import org.apache.ws.resource.properties.faults.InvalidSetResourcePropertiesRequestContentFaultException;
+import org.apache.ws.resource.properties.faults.DeleteResourcePropertyRequestFailedFaultException;
+import org.apache.ws.resource.properties.faults.UpdateResourcePropertyRequestFailedFaultException;
+import org.apache.ws.resource.properties.faults.InvalidUpdateResourcePropertiesRequestContentFaultException;
+import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
import org.apache.ws.resource.properties.v1_2_draft01.porttype.SetResourcePropertiesPortType;
-import org.apache.ws.util.XmlBeanUtils;
+import org.apache.ws.resource.properties.v1_2_draft01.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.i18n.Messages;
+import org.apache.ws.util.XmlBeanUtils;
import org.apache.xmlbeans.XmlObject;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.DeleteType;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.InsertType;
@@ -42,16 +40,13 @@
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.SetResourcePropertiesResponseDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.UpdateType;
-import javax.xml.namespace.QName;
-import java.util.Iterator;
-
/**
* LOG-DONE An operation provider for wsrp:SetResourceProperties.
*
* @author Ian P. Springer
*/
public class SetResourcePropertiesPortTypeImpl
- extends AbstractResourcePropertiesPortType
+ extends AbstractSetResourcePropertiesPortType
implements SetResourcePropertiesPortType
{
@@ -69,11 +64,6 @@
super( resourceContext );
}
- protected NamespaceVersionHolder getNamespaceSet()
- {
- return NAMESPACE_SET;
- }
-
/**
* Implementation of the wsrp:SetResourceProperties operation.
*
@@ -90,8 +80,7 @@
{
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();
@@ -100,294 +89,53 @@
InsertType[] insertElems = requestElem.getInsertArray();
for ( int i = 0; i < insertElems.length; i++ )
{
- insertResourceProperty( insertElems[i] );
- }
-
- DeleteType[] deleteElems = requestElem.getDeleteArray();
- for ( int i = 0; i < deleteElems.length; i++ )
- {
- deleteResourceProperty( deleteElems[i] );
- }
-
- UpdateType[] updateElems = requestElem.getUpdateArray();
- for ( int i = 0; i < updateElems.length; i++ )
- {
- updateResourceProperty( updateElems[i] );
- }
-
- 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(NAMESPACE_SET, MSG.getMessage( Keys.DEL_MISSING_RP_ATTRIB ) );
- }
- ResourceProperty prop = getProperties().get( nameOfPropToBeDeleted );
- if ( prop == null )
- {
- if ( getProperties().getMetaData().isOpenContent() )
+ XmlObject[] propElemsToBeInserted = XmlBeanUtils.getChildElements( insertElems[i] );
+ try
{
- return;
- } else
+ insertResourceProperty( propElemsToBeInserted );
+ }
+ catch ( InsertResourcePropertyRequestFailedFaultException fault )
{
- throw new InvalidResourcePropertyQNameFaultException( NAMESPACE_SET,nameOfPropToBeDeleted );
+ throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(), fault.getFaultString() );
+ }
+ catch ( InvalidInsertResourcePropertiesRequestContentFaultException fault )
+ {
+ throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(), fault.getFaultString() );
}
- }
- throwFaultIfPropertyIsReadOnly( prop );
- throwFaultIfDeletionViolatesSchema( prop );
- try
- {
- deletePropertyCallback( prop );
- }
- catch ( RuntimeException re )
- {
- throw new SetResourcePropertyRequestFailedFaultException(NAMESPACE_SET, 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(NAMESPACE_SET, re.toString() );
}
- Object[] oldValue = getValue( prop );
- for ( int i = 0; i < propElemsToBeInserted.length; i++ )
+ DeleteType[] deleteElems = requestElem.getDeleteArray();
+ for ( int i = 0; i < deleteElems.length; i++ )
{
try
{
- prop.add( propElemsToBeInserted[i] );
+ deleteResourceProperty( deleteElems[i].getResourceProperty() );
}
- catch ( MetaDataViolationException mdve )
+ catch ( DeleteResourcePropertyRequestFailedFaultException fault )
{
- throw new InvalidSetResourcePropertiesRequestContentFaultException(NAMESPACE_SET, mdve );
+ throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(), fault.getFaultString() );
}
}
- 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(NAMESPACE_SET, 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
+ UpdateType[] updateElems = requestElem.getUpdateArray();
+ for ( int i = 0; i < updateElems.length; i++ )
{
- prop.clear();
- for ( int i = 0; i < newPropElems.length; i++ )
+ XmlObject[] newPropElems = XmlBeanUtils.getChildElements( updateElems[i] );
+ try
{
- prop.add( newPropElems[i] );
+ updateResourceProperty( newPropElems );
}
- }
- catch ( MetaDataViolationException mdve )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException(NAMESPACE_SET, 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() )
+ catch ( UpdateResourcePropertyRequestFailedFaultException fault )
{
- throw new InvalidResourcePropertyQNameFaultException(NAMESPACE_SET, propName );
+ throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(), fault.getFaultString() );
}
- }
- 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 ) )
+ catch ( InvalidUpdateResourcePropertiesRequestContentFaultException fault )
{
- throw new InvalidSetResourcePropertiesRequestContentFaultException(NAMESPACE_SET, MSG.getMessage( Keys.ERROR_PROPERTY_INSERT_VIOLATES_SCHEMA,
- ( ( propElems.length > 1 )
- ? "s" : "" ),
- firstPropElemName ) );
+ throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(), fault.getFaultString() );
}
}
- }
-
- private void throwFaultIfDeletionViolatesSchema( ResourceProperty prop )
- {
- if ( prop.getMetaData().getMinOccurs() != 0 )
- {
- throw new InvalidSetResourcePropertiesRequestContentFaultException(NAMESPACE_SET, 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(NAMESPACE_SET, 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(NAMESPACE_SET, 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;
+ return responseDoc;
}
private SetResourcePropertiesResponseDocument createResponseDocument()
@@ -398,41 +146,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(NAMESPACE_SET, prop.getMetaData().getName() );
- }
+ return NAMESPACE_SET;
}
- private void updatePropertyCallback( ResourceProperty prop,
- XmlObject[] newPropElems )
- {
- SetResourcePropertyCallback setResourcePropertyCallback = getSetResourcePropertyCallback( prop );
- if ( setResourcePropertyCallback != null )
- {
- setResourcePropertyCallback.updateProperty( newPropElems );
- }
- }
}
Added: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/impl/NamespaceVersionHolderImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/impl/NamespaceVersionHolderImpl.java?view=auto&rev=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/impl/NamespaceVersionHolderImpl.java (added)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/impl/NamespaceVersionHolderImpl.java Fri Mar 4 15:10:51 2005
@@ -0,0 +1,41 @@
+package org.apache.ws.resource.properties.v1_2_draft05.impl;
+
+import org.apache.axis.message.addressing.Constants;
+import org.apache.ws.resource.faults.v1_2_draft03.Faults1_2Constants;
+import org.apache.ws.resource.lifetime.v1_2_draft04.ResourceLifetime1_2Constants;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants;
+import org.apache.ws.resource.servicegroup.v1_2_draft03.ServiceGroup1_2Constants;
+
+
+/**
+ * @author Sal Campana
+ */
+public class NamespaceVersionHolderImpl implements NamespaceVersionHolder
+{
+
+ public String getPropertiesXsdNamespace()
+ {
+ return ResourcePropertiesConstants.NSURI_WSRP_SCHEMA;
+ }
+
+ public String getLifetimeXsdNamespace()
+ {
+ return ResourceLifetime1_2Constants.NSURI_WSRL_SCHEMA;
+ }
+
+ public String getBaseFaultsXsdNamespace()
+ {
+ return Faults1_2Constants.NSURI_BASEFAULTS_SCHEMA;
+ }
+
+ public String getAddressingNamespace()
+ {
+ return Constants.NS_URI_ADDRESSING_2004_08;
+ }
+
+ public String getServiceGroupsXsdNamespace()
+ {
+ return ServiceGroup1_2Constants.NSURI_WSSG_SCHEMA;
+ }
+}
Added: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/impl/XmlBeansResourcePropertyValueChangeEvent.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/impl/XmlBeansResourcePropertyValueChangeEvent.java?view=auto&rev=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/impl/XmlBeansResourcePropertyValueChangeEvent.java (added)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/impl/XmlBeansResourcePropertyValueChangeEvent.java Fri Mar 4 15:10:51 2005
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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.v1_2_draft05.impl;
+
+import org.apache.ws.XmlObjectWrapper;
+import org.apache.ws.resource.properties.ResourcePropertyValueChangeEvent;
+import org.apache.ws.resource.properties.impl.AbstractXmlBeansResourcePropertyValueChangeEvent;
+import org.apache.ws.util.XmlBeanUtils;
+import org.apache.xmlbeans.XmlObject;
+import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.ResourcePropertyValueChangeNotificationDocument;
+import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.ResourcePropertyValueChangeNotificationType;
+
+/**
+ * @author Ian P. Springer (Hewlett-Packard Company)
+ */
+public class XmlBeansResourcePropertyValueChangeEvent extends AbstractXmlBeansResourcePropertyValueChangeEvent implements ResourcePropertyValueChangeEvent, XmlObjectWrapper
+{
+ public XmlBeansResourcePropertyValueChangeEvent(Object[] oldValue, Object[] newValue)
+ {
+ super(oldValue, newValue);
+ }
+
+ protected XmlObject buildPropValueChangeNotifDocXmlBean( Object[] oldValue, Object[] newValue )
+ {
+ ResourcePropertyValueChangeNotificationDocument propValueChangeNotifDocXBean = ResourcePropertyValueChangeNotificationDocument.Factory.newInstance();
+ ResourcePropertyValueChangeNotificationType propValueChangeNotifXBean = propValueChangeNotifDocXBean.addNewResourcePropertyValueChangeNotification();
+ ResourcePropertyValueChangeNotificationType.OldValue oldValueXBean = propValueChangeNotifXBean.addNewOldValue();
+ if ( oldValue != null )
+ {
+ for ( int i = 0; i < oldValue.length; i++ )
+ {
+ XmlBeanUtils.addChildElement( oldValueXBean, (XmlObject) oldValue[i] );
+ }
+ }
+ else
+ {
+ oldValueXBean.setNil();
+ }
+ ResourcePropertyValueChangeNotificationType.NewValue newValueXBean = propValueChangeNotifXBean.addNewNewValue();
+ if ( newValue != null )
+ {
+ for ( int i = 0; i < oldValue.length; i++ )
+ {
+ XmlBeanUtils.addChildElement( newValueXBean, (XmlObject) newValue[i] );
+ }
+ }
+ else
+ {
+ newValueXBean.setNil();
+ }
+ return propValueChangeNotifDocXBean;
+ }
+
+}
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=156207&r2=156208
==============================================================================
--- 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 Fri Mar 4 15:10:51 2005
@@ -2,12 +2,10 @@
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.faults.SetResourcePropertyRequestFailedFaultException;
-import org.apache.ws.resource.properties.faults.InvalidSetResourcePropertiesRequestContentFaultException;
-import org.apache.ws.resource.properties.faults.DeleteResourcePropertyRequestFailedFaultException;
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.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesResponseDocument;
@@ -23,7 +21,7 @@
private static final NamespaceVersionHolder NAMESPACE_SET = new NamespaceVersionHolderImpl();
/**
- * Creates a new {@link AbstractResourcePropertiesPortType} object.
+ * Creates a new {@link DeleteResourcePropertiesPortTypeImpl} object.
*
* @param resourceContext DOCUMENT_ME
*/
@@ -45,25 +43,13 @@
DeleteResourcePropertiesResponseDocument responseDoc = createResponseDocument();
DeleteResourcePropertiesDocument.DeleteResourceProperties requestElem = requestDoc.getDeleteResourceProperties();
QName nameOfPropToBeDeleted = requestElem.getDelete().getResourceProperty();
- try
- {
- deleteResourceProperty( nameOfPropToBeDeleted );
- }
- catch (SetResourcePropertyRequestFailedFaultException se)
- {
- throw new DeleteResourcePropertyRequestFailedFaultException(se.getNamespaceSet(),nameOfPropToBeDeleted);
- }
- catch (InvalidSetResourcePropertiesRequestContentFaultException is)
- {
- throw new DeleteResourcePropertyRequestFailedFaultException(is.getNamespaceSet(),nameOfPropToBeDeleted);
- }
+ deleteResourceProperty( nameOfPropToBeDeleted );
return responseDoc;
}
private DeleteResourcePropertiesResponseDocument createResponseDocument()
{
- DeleteResourcePropertiesResponseDocument responseDoc =
- DeleteResourcePropertiesResponseDocument.Factory.newInstance();
+ DeleteResourcePropertiesResponseDocument responseDoc = DeleteResourcePropertiesResponseDocument.Factory.newInstance();
responseDoc.addNewDeleteResourcePropertiesResponse();
return responseDoc;
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java?view=diff&r1=156207&r2=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java Fri Mar 4 15:10:51 2005
@@ -5,6 +5,7 @@
import org.apache.ws.resource.properties.ResourceProperty;
import org.apache.ws.resource.properties.impl.AbstractGetResourcePropertiesPortType;
import org.apache.ws.resource.properties.v1_2_draft05.porttype.GetMultipleResourcePropertiesPortType;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetMultipleResourcePropertiesResponseDocument;
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=156207&r2=156208
==============================================================================
--- 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 Fri Mar 4 15:10:51 2005
@@ -8,6 +8,7 @@
import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet;
import org.apache.ws.resource.properties.v1_2_draft05.porttype.GetResourcePropertyDocumentPortType;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentDocument1;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyPortTypeImpl.java?view=diff&r1=156207&r2=156208
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyPortTypeImpl.java Fri Mar 4 15:10:51 2005
@@ -21,6 +21,7 @@
import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
import org.apache.ws.resource.properties.impl.AbstractGetResourcePropertiesPortType;
import org.apache.ws.resource.properties.v1_2_draft05.porttype.GetResourcePropertyPortType;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyResponseDocument;
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=156207&r2=156208
==============================================================================
--- 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 Fri Mar 4 15:10:51 2005
@@ -2,12 +2,9 @@
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.faults.InvalidSetResourcePropertiesRequestContentFaultException;
-import org.apache.ws.resource.properties.faults.SetResourcePropertyRequestFailedFaultException;
-import org.apache.ws.resource.properties.faults.InvalidInsertResourcePropertiesRequestContentFaultException;
-import org.apache.ws.resource.properties.faults.InsertResourcePropertyRequestFailedFaultException;
import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
import org.apache.ws.resource.properties.v1_2_draft05.porttype.InsertResourcePropertiesPortType;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.xmlbeans.XmlObject;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.InsertResourcePropertiesDocument;
@@ -45,25 +42,13 @@
InsertResourcePropertiesResponseDocument responseDoc = createResponseDocument();
InsertResourcePropertiesDocument.InsertResourceProperties requestElem = requestDoc.getInsertResourceProperties();
XmlObject[] propElemsToBeInserted = XmlBeanUtils.getChildElements( requestElem.getInsert() );
- try
- {
- insertResourceProperty( propElemsToBeInserted );
- }
- catch (InvalidSetResourcePropertiesRequestContentFaultException e)
- {
- throw new InvalidInsertResourcePropertiesRequestContentFaultException(e.getNamespaceSet(), e.getDescription());
- }
- catch (SetResourcePropertyRequestFailedFaultException sr)
- {
- throw new InsertResourcePropertyRequestFailedFaultException(sr.getNamespaceSet(), sr.getDescription());
- }
+ insertResourceProperty( propElemsToBeInserted );
return responseDoc;
}
private InsertResourcePropertiesResponseDocument createResponseDocument()
{
- InsertResourcePropertiesResponseDocument responseDoc =
- InsertResourcePropertiesResponseDocument.Factory.newInstance();
+ InsertResourcePropertiesResponseDocument responseDoc = InsertResourcePropertiesResponseDocument.Factory.newInstance();
responseDoc.addNewInsertResourcePropertiesResponse();
return responseDoc;
}
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=156207&r2=156208
==============================================================================
--- 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 Fri Mar 4 15:10:51 2005
@@ -32,6 +32,7 @@
import org.apache.ws.resource.properties.query.impl.QueryEngineImpl;
import org.apache.ws.resource.properties.query.impl.XmlBeansQueryExpression;
import org.apache.ws.resource.properties.v1_2_draft05.porttype.QueryResourcePropertiesPortType;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlObject;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/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=156207&r2=156208
==============================================================================
--- 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 Fri Mar 4 15:10:51 2005
@@ -22,8 +22,16 @@
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.properties.faults.InvalidResourcePropertyQNameFaultException;
+import org.apache.ws.resource.properties.faults.InsertResourcePropertyRequestFailedFaultException;
+import org.apache.ws.resource.properties.faults.SetResourcePropertyRequestFailedFaultException;
+import org.apache.ws.resource.properties.faults.InvalidInsertResourcePropertiesRequestContentFaultException;
+import org.apache.ws.resource.properties.faults.InvalidSetResourcePropertiesRequestContentFaultException;
+import org.apache.ws.resource.properties.faults.DeleteResourcePropertyRequestFailedFaultException;
+import org.apache.ws.resource.properties.faults.UpdateResourcePropertyRequestFailedFaultException;
+import org.apache.ws.resource.properties.faults.InvalidUpdateResourcePropertiesRequestContentFaultException;
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.v1_2_draft05.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlObject;
@@ -82,20 +90,49 @@
for ( int i = 0; i < insertElems.length; i++ )
{
XmlObject[] propElemsToBeInserted = XmlBeanUtils.getChildElements( insertElems[i] );
- insertResourceProperty( propElemsToBeInserted );
+ try
+ {
+ insertResourceProperty( propElemsToBeInserted );
+ }
+ catch ( InsertResourcePropertyRequestFailedFaultException fault )
+ {
+ throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(), fault.getFaultString() );
+ }
+ catch ( InvalidInsertResourcePropertiesRequestContentFaultException fault )
+ {
+ throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(), fault.getFaultString() );
+ }
}
DeleteType[] deleteElems = requestElem.getDeleteArray();
for ( int i = 0; i < deleteElems.length; i++ )
{
- deleteResourceProperty( deleteElems[i].getResourceProperty() );
+ try
+ {
+ deleteResourceProperty( deleteElems[i].getResourceProperty() );
+ }
+ catch ( DeleteResourcePropertyRequestFailedFaultException fault )
+ {
+ throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(), fault.getFaultString() );
+ }
}
UpdateType[] updateElems = requestElem.getUpdateArray();
for ( int i = 0; i < updateElems.length; i++ )
{
XmlObject[] newPropElems = XmlBeanUtils.getChildElements( updateElems[i] );
- updateResourceProperty( newPropElems );
+ try
+ {
+ updateResourceProperty( newPropElems );
+ }
+ catch ( UpdateResourcePropertyRequestFailedFaultException fault )
+ {
+ throw new SetResourcePropertyRequestFailedFaultException( getNamespaceSet(), fault.getFaultString() );
+ }
+ catch ( InvalidUpdateResourcePropertiesRequestContentFaultException fault )
+ {
+ throw new InvalidSetResourcePropertiesRequestContentFaultException( getNamespaceSet(), fault.getFaultString() );
+ }
}
return responseDoc;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java?view=diff&r1=156207&r2=156208
==============================================================================
--- 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 Fri Mar 4 15:10:51 2005
@@ -2,13 +2,9 @@
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
-import org.apache.ws.resource.properties.faults.SetResourcePropertyRequestFailedFaultException;
-import org.apache.ws.resource.properties.faults.InvalidSetResourcePropertiesRequestContentFaultException;
-import org.apache.ws.resource.properties.faults.UpdateResourcePropertyRequestFailedFaultException;
-import org.apache.ws.resource.properties.faults.InvalidUpdateResourcePropertiesRequestContentFaultException;
-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.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.xmlbeans.XmlObject;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesDocument;
@@ -23,7 +19,7 @@
private static final NamespaceVersionHolder NAMESPACE_SET = new NamespaceVersionHolderImpl() ;
/**
- * Creates a new {@link AbstractResourcePropertiesPortType} object.
+ * Creates a new {@link UpdateResourcePropertiesPortTypeImpl} object.
*
* @param resourceContext DOCUMENT_ME
*/
@@ -43,25 +39,13 @@
UpdateResourcePropertiesResponseDocument responseDoc = createResponseDocument();
UpdateResourcePropertiesDocument.UpdateResourceProperties requestElem = requestDoc.getUpdateResourceProperties();
XmlObject[] newPropElems = XmlBeanUtils.getChildElements( requestElem.getUpdate() );
- try
- {
- updateResourceProperty( newPropElems );
- }
- catch (SetResourcePropertyRequestFailedFaultException e)
- {
- throw new UpdateResourcePropertyRequestFailedFaultException(e.getNamespaceSet(), e.getDescription());
- }
- catch (InvalidSetResourcePropertiesRequestContentFaultException e)
- {
- throw new InvalidUpdateResourcePropertiesRequestContentFaultException(e.getNamespaceSet(), e.getDescription());
- }
+ updateResourceProperty( newPropElems );
return responseDoc;
}
private UpdateResourcePropertiesResponseDocument createResponseDocument()
{
- UpdateResourcePropertiesResponseDocument responseDoc =
- UpdateResourcePropertiesResponseDocument.Factory.newInstance();
+ UpdateResourcePropertiesResponseDocument responseDoc = UpdateResourcePropertiesResponseDocument.Factory.newInstance();
responseDoc.addNewUpdateResourcePropertiesResponse();
return responseDoc;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org