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 2004/12/23 22:16:15 UTC
svn commit: r123223 - in incubator/apollo/trunk/src/java/org/apache/ws: resource resource/impl resource/lifetime/faults util
Author: ips
Date: Thu Dec 23 13:16:14 2004
New Revision: 123223
URL: http://svn.apache.org/viewcvs?view=rev&rev=123223
Log:
added getPropertiesDocumentName() method to ResourceCapability
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCapability.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java
incubator/apollo/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCapability.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCapability.java?view=diff&rev=123223&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCapability.java&r1=123222&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCapability.java&r2=123223
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCapability.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceCapability.java Thu Dec 23 13:16:14 2004
@@ -27,7 +27,7 @@
*/
public interface ResourceCapability
{
-
+
/**
* @return the names of all custom operations (i.e. operations that are not derived from a "base"
* ResourceDefinition)
@@ -82,4 +82,13 @@
*/
boolean hasProperties();
+ /**
+ * Returns the name of the resource properties document element, as specified by
+ * the wsrf-rp:ResourceProperties attribute on the portType, or null if this
+ * resource does not define a properties document.
+ *
+ * @return
+ */
+ QName getPropertiesDocumentName();
+
}
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&rev=123223&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java&r1=123222&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java&r2=123223
==============================================================================
--- 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 Thu Dec 23 13:16:14 2004
@@ -41,7 +41,7 @@
/**
* A {@link ResourceCapability} implementation.
*
- * @author Ian Springer
+ * @author Ian Springer (ian DOT springer AT hp DOT com)
*/
public class ResourceCapabilityImpl
implements ResourceCapability
@@ -53,6 +53,7 @@
private QName[] m_propNames;
private String[] m_customOpNames;
private QName[] m_customPropNames;
+ private QName m_propsDocName;
/**
* Creates a new {@link ResourceCapabilityImpl} based on the specified JWSDL definition and portType.
@@ -141,7 +142,8 @@
private void initPropertyNames()
{
- m_propNames = WsrfWsdlUtils.getResourcePropertyNames( m_portType, m_def );
+ m_propsDocName = WsrfWsdlUtils.getResourcePropertiesDocumentName( m_portType );
+ m_propNames = WsrfWsdlUtils.getResourcePropertyNames( m_propsDocName, m_def );
Set customPropNames = new HashSet();
if ( hasProperties() )
{
@@ -457,6 +459,11 @@
public boolean implementsResourceCapability( QName capabilityName )
{
return m_implementedResourceDefs.containsKey( capabilityName );
+ }
+
+ public QName getPropertiesDocumentName()
+ {
+ return m_propsDocName;
}
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java?view=diff&rev=123223&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java&r1=123222&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java&r2=123223
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java Thu Dec 23 13:16:14 2004
@@ -26,7 +26,7 @@
import java.util.Map;
/**
- * TODO
+ * A {@link ResourceDefinition} implementation.
*
* @author Ian Springer (ian DOT springer AT hp DOT com)
*/
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java?view=diff&rev=123223&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java&r1=123222&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java&r2=123223
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/TerminationTimeChangeRejectedFaultException.java Thu Dec 23 13:16:14 2004
@@ -18,7 +18,7 @@
import org.apache.ws.resource.ResourceUnknownException;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.faults.BaseFaultException;
-import org.apache.ws.resource.lifetime.ResourceLifetime1_2Constants;
+import org.apache.ws.resource.lifetime.v1_2.ResourceLifetime1_2Constants;
import javax.xml.namespace.QName;
/**
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java?view=diff&rev=123223&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java&r1=123222&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java&r2=123223
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/faults/UnableToSetTerminationTimeFaultException.java Thu Dec 23 13:16:14 2004
@@ -19,7 +19,7 @@
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.faults.BaseFaultException;
-import org.apache.ws.resource.lifetime.ResourceLifetime1_2Constants;
+import org.apache.ws.resource.lifetime.v1_2.ResourceLifetime1_2Constants;
import org.apache.ws.util.i18n.Messages;
import javax.xml.namespace.QName;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java?view=diff&rev=123223&p1=incubator/apollo/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java&r1=123222&p2=incubator/apollo/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java&r2=123223
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java Thu Dec 23 13:16:14 2004
@@ -38,7 +38,7 @@
/**
* Utility methods for working with a WSRF WSDL definition.
*
- * @author Ian Springer
+ * @author Ian Springer (ian DOT springer AT hp DOT com)
*/
public abstract class WsrfWsdlUtils
{
@@ -90,22 +90,20 @@
}
/**
- * @param portType
+ * @param propsDocName
* @param def
*
* @return the names of the resource properties associated with the specified portType
*/
- public static QName[] getResourcePropertyNames( PortType portType,
+ public static QName[] getResourcePropertyNames( QName propsDocName,
Definition def )
{
- QName rpDocTypeElemQName = getResourcePropertiesTypeElementName( portType );
- if ( rpDocTypeElemQName == null )
+ if ( propsDocName == null )
{
return null;
}
-
Element schemaElem = getSchemaElement( def );
- Element rpDocElementElem = getElementByName( schemaElem, rpDocTypeElemQName );
+ Element rpDocElementElem = getElementByName( schemaElem, propsDocName );
String type = rpDocElementElem.getAttribute( "type" );
Element rpDocTypeElem;
if ( !"".equals( type ) )
@@ -190,17 +188,14 @@
return null;
}
- private static QName getResourcePropertiesTypeElementName( PortType portType )
+ public static QName getResourcePropertiesDocumentName( PortType portType )
{
Map extAttribs = portType.getExtensionAttributes();
- QName rpDocDefQName =
- (QName) extAttribs.get( ResourceProperties1_3Constants.RESOURCE_PROPERTIES_PORTTYPE_ATTRIB );
+ QName rpDocDefQName = (QName) extAttribs.get( ResourceProperties1_3Constants.RESOURCE_PROPERTIES_PORTTYPE_ATTRIB );
if ( rpDocDefQName == null )
{
- rpDocDefQName =
- (QName) extAttribs.get( ResourceProperties1_2Constants.RESOURCE_PROPERTIES_PORTTYPE_ATTRIB );
+ rpDocDefQName = (QName) extAttribs.get( ResourceProperties1_2Constants.RESOURCE_PROPERTIES_PORTTYPE_ATTRIB );
}
-
return rpDocDefQName;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org