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 sc...@apache.org on 2005/02/16 19:49:09 UTC
svn commit: r154060 - in incubator/apollo/trunk/src:
java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
site/content/tutorial/FileSystem.wsdl site/content/tutorial/SysProps.wsdl
Author: scamp
Date: Wed Feb 16 10:49:06 2005
New Revision: 154060
URL: http://svn.apache.org/viewcvs?view=rev&rev=154060
Log:
updated / fixed
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceCapabilityImpl.java
incubator/apollo/trunk/src/site/content/tutorial/FileSystem.wsdl
incubator/apollo/trunk/src/site/content/tutorial/SysProps.wsdl
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=154059&r2=154060
==============================================================================
--- 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 Wed Feb 16 10:49:06 2005
@@ -17,8 +17,7 @@
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;
@@ -120,8 +119,7 @@
{
if ( hasProperties() )
{
- if ( !m_implementedResourceDefs.containsKey( GetResourcePropertyPortType.NAME ) )
- // TODO: check for 1.2draft05 too
+ if ( !m_implementedResourceDefs.containsKey( org.apache.ws.resource.properties.v1_2_draft05.porttype.GetResourcePropertyPortType.NAME ) && !m_implementedResourceDefs.containsKey( org.apache.ws.resource.properties.v1_2_draft01.porttype.GetResourcePropertyPortType.NAME ) )
{
throw new InvalidWsrfWsdlException(
"PortType " + m_portType.getQName() +
@@ -134,8 +132,8 @@
while ( resourceDefNames.hasNext() )
{
QName resourceDefName = (QName) resourceDefNames.next();
- if ( resourceDefName.getNamespaceURI().equals( ResourcePropertiesConstants.NSURI_WSRP_WSDL ) )
- // TODO: check for 1.2draft05 too
+ if ( resourceDefName.getNamespaceURI().equals( org.apache.ws.resource.properties.v1_2_draft05.ResourcePropertiesConstants.NSURI_WSRP_WSDL ) ||
+ resourceDefName.getNamespaceURI().equals( org.apache.ws.resource.properties.v1_2_draft01.ResourcePropertiesConstants.NSURI_WSRP_WSDL ))
{
throw new InvalidWsrfWsdlException(
"PortType " + m_portType.getQName() +
Modified: incubator/apollo/trunk/src/site/content/tutorial/FileSystem.wsdl
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/FileSystem.wsdl?view=diff&r1=154059&r2=154060
==============================================================================
--- incubator/apollo/trunk/src/site/content/tutorial/FileSystem.wsdl (original)
+++ incubator/apollo/trunk/src/site/content/tutorial/FileSystem.wsdl Wed Feb 16 10:49:06 2005
@@ -11,10 +11,10 @@
xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl">
<import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl"
- location="../spec/wsrf/WS-ResourceProperties-1_2.wsdl"/>
+ location="../spec/wsrf/WS-ResourceProperties-1_2-Draft_01.wsdl"/>
<import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl"
- location="../spec/wsrf/WS-ResourceLifetime-1_2.wsdl"/>
+ location="../spec/wsrf/WS-ResourceLifetime-1_2-Draft_01.wsdl"/>
<types>
<schema elementFormDefault="qualified"
@@ -25,10 +25,10 @@
xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd">
<xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd"
- schemaLocation="../spec/wsrf/WS-BaseFaults-1_2.xsd"/>
+ schemaLocation="../spec/wsrf/WS-BaseFaults-1_2-Draft_01.xsd"/>
<xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd"
- schemaLocation="../spec/wsrf/WS-ResourceLifetime-1_2.xsd"/>
+ schemaLocation="../spec/wsrf/WS-ResourceLifetime-1_2-Draft_01.xsd"/>
<element name="DeviceSpecialFile" type="xsd:string"/>
<element name="MountPointDirectory" type="xsd:string"/>
Modified: incubator/apollo/trunk/src/site/content/tutorial/SysProps.wsdl
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/SysProps.wsdl?view=diff&r1=154059&r2=154060
==============================================================================
--- incubator/apollo/trunk/src/site/content/tutorial/SysProps.wsdl (original)
+++ incubator/apollo/trunk/src/site/content/tutorial/SysProps.wsdl Wed Feb 16 10:49:06 2005
@@ -2,7 +2,7 @@
<definitions name="JavaSystemPropertiesResourceDefinition" targetNamespace="http://ws.apache.org/resource/example/sysprops" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://ws.apache.org/resource/example/sysprops" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl">
- <import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" location="../spec/wsrf/WS-ResourceProperties-1_2.wsdl"/>
+ <import namespace="http://docs.oasis-open.org/wsrf/2004/06/WS-ResourceProperties-1_2-Draft_01.wsdl" location="../spec/wsrf/WS-ResourceProperties-1_2.wsdl"/>
<types>
<schema elementFormDefault="qualified" targetNamespace="http://ws.apache.org/resource/example/sysprops" xmlns="http://www.w3.org/2001/XMLSchema">
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org