ws-muse-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject svn commit: r158656 - in incubator/muse/trunk/src/site/content/interop/src/wsdl: blackberry.wsdl ipmiserver.wsdl manageable_resource.xsd mowsfactoryservice.wsdl weatherstation.wsdl
Date Tue, 22 Mar 2005 20:13:12 GMT
Author: scamp
Date: Tue Mar 22 12:13:10 2005
New Revision: 158656

URL: http://svn.apache.org/viewcvs?view=rev&rev=158656
Log:
updated/corrected

Modified:
    incubator/muse/trunk/src/site/content/interop/src/wsdl/blackberry.wsdl
    incubator/muse/trunk/src/site/content/interop/src/wsdl/ipmiserver.wsdl
    incubator/muse/trunk/src/site/content/interop/src/wsdl/manageable_resource.xsd
    incubator/muse/trunk/src/site/content/interop/src/wsdl/mowsfactoryservice.wsdl
    incubator/muse/trunk/src/site/content/interop/src/wsdl/weatherstation.wsdl

Modified: incubator/muse/trunk/src/site/content/interop/src/wsdl/blackberry.wsdl
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/wsdl/blackberry.wsdl?view=diff&r1=158655&r2=158656
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/wsdl/blackberry.wsdl (original)
+++ incubator/muse/trunk/src/site/content/interop/src/wsdl/blackberry.wsdl Tue Mar 22 12:13:10
2005
@@ -22,13 +22,19 @@
 					<element ref="muws-xs1:ManageabilityCapability" minOccurs="0" maxOccurs="unbounded"/>
 					<element ref="muws-xs2:OperationalStatus"/>
 					<!-- other props -->
+					
+					<!-- props for wsnt:NotificationProducer portType -->
+					<element ref="wsnt:Topic" minOccurs="1" maxOccurs="unbounded" /> 
+					<element ref="wsnt:FixedTopicSet" minOccurs="1" maxOccurs="1" /> 
+                  			<element ref="wsnt:TopicExpressionDialects" minOccurs="1" maxOccurs="unbounded"
/>  
+					
 					<element ref="muws-xs2:CurrentTime"/>
 					<element ref="bbry:AllocatedStorage"/>
 					<element ref="bbry:FreeStorage"/>
 					<element ref="bbry:TotalCodeModuleSize"/>
 					<element ref="bbry:CurrentTime"/>
-					<element ref="bbry:Date"/>
-					<element ref="bbry:Time"/>
+					<element ref="bbry:date"/>
+					<element ref="bbry:time"/>
 
 					</sequence>
 				</complexType>
@@ -156,7 +162,7 @@
 	</binding>
 	<service name="Blackberry">
 		<!-- Note: the port name becomes the service name in the wsdd generated by Axis Wsdl2Java
-->
-		<port name="blackberry" binding="tns:WeatherStationSoapHttpBinding">
+		<port name="blackberry" binding="tns:BlackberrySoapHttpBinding">
 			<soap:address location="http://localhost:8080/wsrf/services/blackberry"/>
 		</port>
 	</service>

Modified: incubator/muse/trunk/src/site/content/interop/src/wsdl/ipmiserver.wsdl
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/wsdl/ipmiserver.wsdl?view=diff&r1=158655&r2=158656
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/wsdl/ipmiserver.wsdl (original)
+++ incubator/muse/trunk/src/site/content/interop/src/wsdl/ipmiserver.wsdl Tue Mar 22 12:13:10
2005
@@ -20,6 +20,12 @@
 						<element ref="muws-xs1:ManageabilityCapability" minOccurs="0" maxOccurs="unbounded"/>
 						<element ref="muws-xs2:OperationalStatus"/>
 						<!-- other props -->
+						
+						<!-- props for wsnt:NotificationProducer portType -->
+						<element ref="wsnt:Topic" minOccurs="1" maxOccurs="unbounded" /> 
+						<element ref="wsnt:FixedTopicSet" minOccurs="1" maxOccurs="1" /> 
+                  				<element ref="wsnt:TopicExpressionDialects" minOccurs="1" maxOccurs="unbounded"
/>  
+						
 						<element ref="muws-xs2:CurrentTime"/>
 						<element ref="tns:CpuUsage" minOccurs="0"/>
 					</sequence>

Modified: incubator/muse/trunk/src/site/content/interop/src/wsdl/manageable_resource.xsd
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/wsdl/manageable_resource.xsd?view=diff&r1=158655&r2=158656
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/wsdl/manageable_resource.xsd (original)
+++ incubator/muse/trunk/src/site/content/interop/src/wsdl/manageable_resource.xsd Tue Mar
22 12:13:10 2005
@@ -22,11 +22,11 @@
 		</xs:sequence> 
 	</xs:complexType> 
 </xs:element>
-<xs:element name="BatteryStatus" type="xs:String" />
-<xs:element name="BatteryLevel" type="xs:String" />
+<xs:element name="BatteryStatus" type="xs:string" />
+<xs:element name="BatteryLevel" type="xs:string" />
 <xs:element name="FreeStorage" type="xs:int" />
 <xs:element name="AllocatedStorage" type="xs:int" />
 <xs:element name="TotalCodeModuleSize" type="xs:int" />
 <xs:element name="TotalStorage" type="xs:int" />
-<xs:element name="CurrentTime" type="xs:String" />
+<xs:element name="CurrentTime" type="xs:string" />
 </xs:schema>

Modified: incubator/muse/trunk/src/site/content/interop/src/wsdl/mowsfactoryservice.wsdl
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/wsdl/mowsfactoryservice.wsdl?view=diff&r1=158655&r2=158656
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/wsdl/mowsfactoryservice.wsdl (original)
+++ incubator/muse/trunk/src/site/content/interop/src/wsdl/mowsfactoryservice.wsdl Tue Mar
22 12:13:10 2005
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
-<definitions name="MowsFactory" targetNamespace="http://ws.apache.org/resource/example/mowsfactory"
xmlns:tns="http://ws.apache.org/resource/example/mowsfactory" xmlns="http://www.w3.org/2002/07/wsdl"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:muws-xs1="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part1.xsd"
xmlns:muws-xs2="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.xsd" xmlns:mows-xs="http://docs.oasis-open.org/wsdm/2004/12/mows/wsdm-mows.xsd"
xmlns:mows-wsdl="http://docs.oasis-open.org/wsdm/2004/12/mows/wsdm-mows.wsdl" xmlns:S="http://www.w3.org/2002/12/soap-envelope"
xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"
xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd"
xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl"
xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl"
>
+<definitions name="MowsFactory" targetNamespace="http://ws.apache.org/resource/example/mowsfactory"
xmlns:tns="http://ws.apache.org/resource/example/mowsfactory" xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:muws-xs1="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part1.xsd"
xmlns:muws-xs2="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.xsd" xmlns:mows-xs="http://docs.oasis-open.org/wsdm/2004/12/mows/wsdm-mows.xsd"
xmlns:mows-wsdl="http://docs.oasis-open.org/wsdm/2004/12/mows/wsdm-mows.wsdl" xmlns:S="http://www.w3.org/2002/12/soap-envelope"
xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"
xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd"
xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl"
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-Draft_01.wsdl"/>
 	<import namespace="http://docs.oasis-open.org/wsdm/2004/12/mows/wsdm-mows.wsdl" location="../spec/wsdm/MOWS-1_0.wsdl"/>
 	<types>
 		<schema elementFormDefault="qualified" targetNamespace="http://ws.apache.org/resource/example/mowsfactory"
xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 			<import namespace="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part1.xsd"
schemaLocation="../spec/wsdm/MUWS-Part1-1_0.xsd"/>
 			<import namespace="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.xsd"
schemaLocation="../spec/wsdm/MUWS-Part2-1_0.xsd"/>
+			<import namespace="http://docs.oasis-open.org/wsdm/2004/12/mows/wsdm-mows.xsd" schemaLocation="../spec/wsdm/MOWS-1_0.xsd"/>
 
 			<!-- Resource Properties Document Schema -->
 			<element name="MowsFactoryProperties">
@@ -17,6 +18,18 @@
                         MUWS2 MetricsCapability AND MOWS Metrics capability -->
 						<element ref="muws-xs1:ManageabilityCapability" minOccurs="0" maxOccurs="unbounded"/>
 						<element ref="muws-xs2:OperationalStatus"/>
+						
+						<element ref="mows-xs:EndpointReference"/>
+						<element ref="mows-xs:EndpointDescriptions" minOccurs="0"/>
+						<element ref="mows-xs:CurrentOperationalState"/>
+						<element ref="mows-xs:LastOperationalStateTransition" minOccurs="0"/>
+						<element ref="mows-xs:NumberOfRequests" minOccurs="0"/>
+						<element ref="mows-xs:NumberOfFailedRequests" minOccurs="0"/>
+						<element ref="mows-xs:NumberOfSuccessfulRequests"
+							 minOccurs="0"/>
+						<element ref="mows-xs:ServiceTime" minOccurs="0"/>
+						<element ref="mows-xs:MaxResponseTime" minOccurs="0"/>
+						<element ref="mows-xs:LastResponseTime" minOccurs="0"/>
 					</sequence>
 				</complexType>
 			</element>
@@ -65,7 +78,7 @@
 	</binding>
 	<service name="MowsFactoryService">
 		<!-- Note: the port name becomes the service name in the wsdd generated by Axis Wsdl2Java
-->
-		<port name="mowsfactory" binding="tns:WeatherStationSoapHttpBinding">
+		<port name="mowsfactory" binding="tns:MowsFactorySoapHttpBinding">
 			<soap:address location="http://localhost:8080/wsrf/services/mowsfactory"/>
 		</port>
 	</service>

Modified: incubator/muse/trunk/src/site/content/interop/src/wsdl/weatherstation.wsdl
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/wsdl/weatherstation.wsdl?view=diff&r1=158655&r2=158656
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/wsdl/weatherstation.wsdl (original)
+++ incubator/muse/trunk/src/site/content/interop/src/wsdl/weatherstation.wsdl Tue Mar 22
12:13:10 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<definitions name="WeatherStation" targetNamespace="http://everest-weather.org/wsdm/samples/2005/04/schema"
xmlns:tns="http://everest-weather.org/wsdm/samples/2005/04/schema" xmlns="http://www.w3.org/2002/07/wsdl"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:muws-xs1="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part1.xsd"
xmlns:muws-xs2="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.xsd" xmlns:mows-xs="http://docs.oasis-open.org/wsdm/2004/12/mows/wsdm-mows.xsd"
xmlns:mows-wsdl="http://docs.oasis-open.org/wsdm/2004/12/mows/wsdm-mows.wsdl" xmlns:S="http://www.w3.org/2002/12/soap-envelope"
xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"
xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd"

+<definitions name="WeatherStation" targetNamespace="http://everest-weather.org/wsdm/samples/2005/04/schema"
xmlns:tns="http://everest-weather.org/wsdm/samples/2005/04/schema" xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:muws-xs1="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part1.xsd"
xmlns:muws-xs2="http://docs.oasis-open.org/wsdm/2004/12/muws/wsdm-muws-part2.xsd" xmlns:mows-xs="http://docs.oasis-open.org/wsdm/2004/12/mows/wsdm-mows.xsd"
xmlns:mows-wsdl="http://docs.oasis-open.org/wsdm/2004/12/mows/wsdm-mows.wsdl" xmlns:S="http://www.w3.org/2002/12/soap-envelope"
xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"
xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd"

 xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl"
 xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl"
 
@@ -24,6 +24,15 @@
 						<element ref="muws-xs1:ManageabilityCapability" minOccurs="0" maxOccurs="unbounded"/>
 						<element ref="muws-xs2:OperationalStatus"/>
 						<!-- other props -->
+						<element ref="mows-xs:CurrentOperationalState"/>
+						<element ref="mows-xs:LastOperationalStateTransition" minOccurs="0"/>
+						
+						
+						<!-- props for wsnt:NotificationProducer portType -->
+		                                <element ref="wsnt:Topic" minOccurs="1" maxOccurs="unbounded"
/> 
+		  	 	                <element ref="wsnt:FixedTopicSet" minOccurs="1" maxOccurs="1" />

+                  				<element ref="wsnt:TopicExpressionDialects" minOccurs="1" maxOccurs="unbounded"
/>
+                  				
 						<element ref="muws-xs2:Relationship" minOccurs="0" maxOccurs="unbounded"/>
 						<element ref="mows-xs:EndpointReference"/>
 						<element ref="mows-xs:EndpointDescriptions" minOccurs="0"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: muse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-dev-help@ws.apache.org


Mime
View raw message