Author: ips
Date: Thu May 26 16:14:16 2005
New Revision: 178709
URL: http://svn.apache.org/viewcvs?rev=178709&view=rev
Log:
added SetRP op and 2 props to w-c-c.wsdl - WeatherStationReference &
WeatherDataRefreshInterval; added 2 props to w-s.wsdl - Name & Owner; also made
Price a non-metric prop; defined out.dir prop in build.xml
Modified:
incubator/muse/trunk/src/ieeedemo/ (props changed)
incubator/muse/trunk/src/ieeedemo/build.xml
incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-client-config.wsdl
incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-station-dir.wsdl
incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-station.wsdl
Propchange: incubator/muse/trunk/src/ieeedemo/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu May 26 16:14:16 2005
@@ -1 +1 @@
-${out.dir}
+generated
Modified: incubator/muse/trunk/src/ieeedemo/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/build.xml?rev=178709&r1=178708&r2=178709&view=diff
==============================================================================
--- incubator/muse/trunk/src/ieeedemo/build.xml (original)
+++ incubator/muse/trunk/src/ieeedemo/build.xml Thu May 26 16:14:16 2005
@@ -11,10 +11,11 @@
<property name="endpoint.url" value="${base.url}/PrinterPort" />
- <property name="classes.dir" location="${basedir}\classes" />
- <property name="jar.dir" location="${basedir}\lib" />
- <property name="src.dir" location="${basedir}\src\java" />
- <property name="wsdl.dir" location="${basedir}\src\wsdl" />
+ <property name="classes.dir" location="classes" />
+ <property name="jar.dir" location="lib" />
+ <property name="src.dir" location="src/java" />
+ <property name="wsdl.dir" location="src/wsdl" />
+ <property name="out.dir" location="generated" />
<target name="init" unless="muse.classpath">
Modified: incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-client-config.wsdl
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-client-config.wsdl?rev=178709&r1=178708&r2=178709&view=diff
==============================================================================
--- incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-client-config.wsdl
(original)
+++ incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-client-config.wsdl Thu
May 26 16:14:16 2005
@@ -1,17 +1,43 @@
<?xml version="1.0"?>
-<definitions name="WeatherClientConfig"
targetNamespace="http://wsdmdemo.org/service/weather-client-config";
xmlns="http://schemas.xmlsoap.org/wsdl/";
xmlns:tns="http://wsdmdemo.org/service/weather-client-config";
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";
xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl";
xmlns:muws-p2-wsdl="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.wsdl";
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing";>
+<definitions name="WeatherClientConfig"
+ targetNamespace="http://wsdmdemo.org/service/weather-client-config";
+ xmlns="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:tns="http://wsdmdemo.org/service/weather-client-config";
+ 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";
+
xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl";
+
xmlns:muws-p2-wsdl="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.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-Draft_01.wsdl"/>
<import
namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl";
location="../spec/wsn/WS-BaseNotification-1_2-Draft_01.wsdl"/>
<import
namespace="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.wsdl";
location="../spec/wsdm/MUWS-Part2-1_0.wsdl"/>
+
<types>
- <schema elementFormDefault="qualified"
targetNamespace="http://wsdmdemo.org/service/weather-client-config";
xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd";
xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd";
xmlns:muws-p1-xs="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part1.xsd";
xmlns:muws-p2-xs="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.xsd";
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing";>
+ <schema elementFormDefault="qualified"
+ targetNamespace="http://wsdmdemo.org/service/weather-client-config";
+ xmlns="http://www.w3.org/2001/XMLSchema";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:wsa04="http://schemas.xmlsoap.org/ws/2004/08/addressing";
+
xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd";
+
xmlns:muws-p1-xs="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part1.xsd";
+
xmlns:muws-p2-xs="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.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"/>
<xsd:import
namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd";
schemaLocation="../spec/wsn/WS-BaseNotification-1_2-Draft_01.xsd"/>
<xsd:import
namespace="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part1.xsd";
schemaLocation="../spec/wsdm/MUWS-Part1-1_0.xsd"/>
<xsd:import
namespace="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.xsd";
schemaLocation="../spec/wsdm/MUWS-Part2-1_0.xsd"/>
<xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing";
schemaLocation="../spec/wsa/WS-Addressing-2004_08_10.xsd"/>
- <!-- Resource Properties Document Schema -->
+
+ <!-- WeatherStationReference resource property - EPR of current weather
station -->
+ <element name="WeatherStationReference"
type="wsa04:EndpointReferenceType" />
+
+ <!-- WeatherDataRefreshInterval resource property - time interval in
seconds that indicates how often weather data should be refreshed -->
+ <element name="WeatherDataRefreshInterval" type="xsd:int" />
+
+ <!-- resource properties document -->
<element name="WeatherClientConfigResourceProperties">
<complexType>
<sequence>
@@ -22,37 +48,15 @@
<element ref="muws-p1-xs:ManageabilityCapability" minOccurs="0"
maxOccurs="unbounded"/>
<element ref="muws-p2-xs:OperationalStatus"/>
<element ref="muws-p2-xs:Relationship" minOccurs="0"
maxOccurs="unbounded"/>
+ <element ref="tns:WeatherStationReference"/>
+ <element ref="tns:WeatherDataRefreshInterval"/>
</sequence>
</complexType>
</element>
- <element name="SetWeatherStation">
- <complexType>
- <sequence>
- <element ref="wsa:EndpointReference"/>
- </sequence>
- </complexType>
- </element>
- <element name="SetWeatherStationResponse">
- <complexType/>
- </element>
- <element name="SetFailedFault">
- <complexType>
- <complexContent>
- <extension base="wsbf:BaseFaultType"/>
- </complexContent>
- </complexType>
- </element>
+
</schema>
</types>
- <message name="SetWeatherStationRequest">
- <part name="SetWeatherStation" element="tns:SetWeatherStation"/>
- </message>
- <message name="SetWeatherStationResponse">
- <part name="SetWeatherStationResponse"
element="tns:SetWeatherStationResponse"/>
- </message>
- <message name="SetFailedFault">
- <part name="SetFailedFault" element="tns:SetFailedFault"/>
- </message>
+
<portType name="WeatherClientConfigPortType"
wsrp:ResourceProperties="tns:WeatherClientConfigResourceProperties">
<operation name="GetResourceProperty">
<input name="GetResourcePropertyRequest"
message="wsrpw:GetResourcePropertyRequest"/>
@@ -66,6 +70,15 @@
<fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
<fault name="InvalidResourcePropertyQNameFault"
message="wsrpw:InvalidResourcePropertyQNameFault"/>
</operation>
+ <operation name="SetResourceProperties">
+ <input name="SetResourcePropertiesRequest"
message="wsrpw:SetResourcePropertiesRequest"/>
+ <output name="SetResourcePropertiesResponse"
message="wsrpw:SetResourcePropertiesResponse"/>
+ <fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
+ <fault name="InvalidResourcePropertyQNameFault"
message="wsrpw:InvalidResourcePropertyQNameFault"/>
+ <fault name="InvalidSetResourcePropertiesRequestContentFault"
message="wsrpw:InvalidSetResourcePropertiesRequestContentFault"/>
+ <fault name="UnableToModifyResourcePropertyFault"
message="wsrpw:UnableToModifyResourcePropertyFault"/>
+ <fault name="SetResourcePropertyRequestFailedFault"
message="wsrpw:SetResourcePropertyRequestFailedFault"/>
+ </operation>
<operation name="Subscribe">
<input message="wsntw:SubscribeRequest"/>
<output message="wsntw:SubscribeResponse"/>
@@ -85,12 +98,8 @@
<input message="muws-p2-wsdl:QueryRelationshipsByTypeRequest"/>
<output message="muws-p2-wsdl:QueryRelationshipsByTypeResponse"/>
</operation>
- <operation name="SetWeatherStation">
- <input message="tns:SetWeatherStationRequest"/>
- <output message="tns:SetWeatherStationResponse"/>
- <fault name="SetFailedFault" message="tns:SetFailedFault"/>
- </operation>
</portType>
+
<binding name="WeatherClientConfigSoapHttpBinding"
type="tns:WeatherClientConfigPortType">
<soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
<operation name="GetResourceProperty">
@@ -123,6 +132,30 @@
<soap:fault name="InvalidResourcePropertyQNameFault" use="literal"/>
</fault>
</operation>
+ <operation name="SetResourceProperties">
+ <soap:operation style="document"/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ <fault name="ResourceUnknownFault">
+ <soap:fault name="ResourceUnknownFault" use="literal"/>
+ </fault>
+ <fault name="InvalidResourcePropertyQNameFault">
+ <soap:fault name="InvalidResourcePropertyQNameFault" use="literal"/>
+ </fault>
+ <fault name="UnableToModifyResourcePropertyFault">
+ <soap:fault name="UnableToModifyResourcePropertyFault" use="literal"/>
+ </fault>
+ <fault name="InvalidSetResourcePropertiesRequestContentFault">
+ <soap:fault name="InvalidSetResourcePropertiesRequestContentFault"
use="literal"/>
+ </fault>
+ <fault name="SetResourcePropertyRequestFailedFault">
+ <soap:fault name="SetResourcePropertyRequestFailedFault"
use="literal"/>
+ </fault>
+ </operation>
<operation name="Subscribe">
<soap:operation style="document"/>
<input>
@@ -171,19 +204,8 @@
<soap:body use="literal"/>
</output>
</operation>
- <operation name="SetWeatherStation">
- <soap:operation style="document"/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- <fault name="SetFailedFault">
- <soap:fault name="SetFailedFault" use="literal"/>
- </fault>
- </operation>
</binding>
+
<service name="WeatherClientConfigService">
<!-- Note: the port name becomes the service name in the wsdd generated by
Wsdl2Java -->
<!-- *** Change the port name and the soap:address location below to
reflect the desired endpoint URL *** -->
@@ -191,4 +213,5 @@
<soap:address
location="http://localhost:8080/muse/services/weather-client-config"/>
</port>
</service>
+
</definitions>
Modified: incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-station-dir.wsdl
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-station-dir.wsdl?rev=178709&r1=178708&r2=178709&view=diff
==============================================================================
--- incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-station-dir.wsdl
(original)
+++ incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-station-dir.wsdl Thu May
26 16:14:16 2005
@@ -1,9 +1,11 @@
<?xml version="1.0"?>
-<definitions name="WeatherStationDirectory"
targetNamespace="http://wsdmdemo.org/service/weather-station-dir";
xmlns="http://schemas.xmlsoap.org/wsdl/";
xmlns:tns="http://wsdmdemo.org/service/weather-station-dir";
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";
xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl";
xmlns:muws-p2-wsdl="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.wsdl";
xmlns:mex="http://schemas.xmlsoap.org/ws/2004/09/mex";
xmlns:wsa04="http://schemas.xmlsoap.org/ws/2004/08/addressing";>
+<definitions name="WeatherStationDirectory"
targetNamespace="http://wsdmdemo.org/service/weather-station-dir";
xmlns="http://schemas.xmlsoap.org/wsdl/";
xmlns:tns="http://wsdmdemo.org/service/weather-station-dir";
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";
xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl";
xmlns:muws-p2-wsdl="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.wsdl";
xmlns:mex="http://schemas.xmlsoap.org/ws/2004/09/mex";>
+
<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-Draft_01.wsdl"/>
<import
namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl";
location="../spec/wsn/WS-BaseNotification-1_2-Draft_01.wsdl"/>
<import
namespace="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.wsdl";
location="../spec/wsdm/MUWS-Part2-1_0.wsdl"/>
+
<types>
<schema elementFormDefault="qualified"
targetNamespace="http://wsdmdemo.org/service/weather-station-dir";
xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd";
xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd";
xmlns:muws-p1-xs="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part1.xsd";
xmlns:muws-p2-xs="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.xsd";
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing";>
<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"/>
@@ -12,7 +14,7 @@
<xsd:import
namespace="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.xsd";
schemaLocation="../spec/wsdm/MUWS-Part2-1_0.xsd"/>
<xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing";
schemaLocation="../spec/wsa/WS-Addressing-2004_08_10.xsd"/>
- <!-- Resource Properties Document Schema -->
+ <!-- resource properties document -->
<element name="WeatherStationDirectoryResourceProperties">
<complexType>
<sequence>
@@ -221,6 +223,7 @@
</operation>
</binding>
+
<service name="WeatherStationDirectoryService">
<!-- Note: the port name becomes the service name in the wsdd generated by
Wsdl2Java -->
<!-- *** Change the port name and the soap:address location below to
reflect the desired endpoint URL *** -->
@@ -228,4 +231,5 @@
<soap:address
location="http://localhost:8080/muse/services/weather-station-dir"/>
</port>
</service>
+
</definitions>
Modified: incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-station.wsdl
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-station.wsdl?rev=178709&r1=178708&r2=178709&view=diff
==============================================================================
--- incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-station.wsdl (original)
+++ incubator/muse/trunk/src/ieeedemo/src/wsdl/weather-station.wsdl Thu May 26
16:14:16 2005
@@ -45,16 +45,18 @@
<xsd:import
namespace="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.xsd";
schemaLocation="../spec/wsdm/MUWS-Part2-1_0.xsd"/>
- <!-- Some Weather Props As Metrics-->
+ <!-- resource properties-->
- <complexType name="PriceMetricType">
- <simpleContent>
- <extension base="xsd:double">
- <xsd:attributeGroup ref="muws-p2-xs:MetricAttributes"/>
- </extension>
- </simpleContent>
- </complexType>
- <element name="Price" type="tns:PriceMetricType"/>
+ <!-- station name -->
+ <element name="Name" type="xsd:string"/>
+
+ <!-- station owner -->
+ <element name="Owner" type="xsd:string"/>
+
+ <!-- price, in dollars, of each request for weather data -->
+ <element name="Price" type="xsd:double"/>
+
+ <!-- metric types are used for fluctuating props... -->
<!-- Temperature is in degrees Fahrenheit -->
<complexType name="TemperatureMetricType">
@@ -86,10 +88,12 @@
</complexType>
<element name="Visibility" type="tns:VisibilityMetricType"/>
- <!-- Resource Properties Document Schema -->
+ <!-- resource properties document -->
<element name="WeatherStationResourceProperties">
<complexType>
<sequence>
+ <element ref="tns:Name"/>
+ <element ref="tns:Owner"/>
<element ref="tns:Price"/>
<element ref="tns:Temperature"/>
<element ref="tns:Humidity"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
