You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2010/02/12 05:38:57 UTC

svn commit: r909229 [5/5] - in /qpid/branches/0.6-release/qpid: cpp/examples/ cpp/src/qpid/framing/ cpp/src/tests/ cpp/src/tests/cluster_test_scripts/ dotnet/client-010/client/client/ dotnet/client-010/client/transport/ dotnet/client-010/demo/Propertie...

Modified: qpid/branches/0.6-release/qpid/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part2-1_1.xsd
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part2-1_1.xsd?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part2-1_1.xsd (original)
+++ qpid/branches/0.6-release/qpid/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part2-1_1.xsd Fri Feb 12 04:38:52 2010
@@ -1,656 +1,677 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema targetNamespace="http://docs.oasis-open.org/wsdm/muws2-2.xsd"
-	xmlns:muws2="http://docs.oasis-open.org/wsdm/muws2-2.xsd"
-	xmlns:muws1="http://docs.oasis-open.org/wsdm/muws1-2.xsd"
-	xmlns:wsa="http://www.w3.org/2005/08/addressing"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:import namespace="http://docs.oasis-open.org/wsdm/muws1-2.xsd"
-		schemaLocation="WSDM-MUWS-Part1-1_1.xsd" />
-	<xs:import namespace="http://www.w3.org/2005/08/addressing"
-		schemaLocation="WS-Addressing-2005_08.xsd" />
-	<xs:import namespace="http://www.w3.org/XML/1998/namespace"
-		schemaLocation="XML-Namespace-1998.xsd" />
-	<xs:complexType name="LangString">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute ref="xml:lang" use="required" />
-				<xs:anyAttribute namespace="##other" />
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- Begin properties for the Description capability -->
-	<xs:element name="Caption" type="muws2:LangString" />
-	<xs:element name="Description" type="muws2:LangString" />
-	<xs:element name="Version" type="xs:string" />
-	<!-- End   properties for the Description capability -->
-	<xs:complexType name="CategoryType">
-		<xs:sequence>
-			<xs:any minOccurs="0" namespace="##any"
-				processContents="lax" />
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="StateType">
-		<xs:complexContent>
-			<xs:extension base="muws2:CategoryType" />
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:element name="State" type="muws2:StateType" />
-	<xs:element name="EnteredState" type="muws2:StateType" />
-	<xs:element name="PreviousState" type="muws2:StateType" />
-	<xs:complexType name="StateTransitionType">
-		<xs:sequence>
-			<xs:element ref="muws2:EnteredState" />
-			<xs:element ref="muws2:PreviousState" minOccurs="0" />
-			<xs:any minOccurs="0" maxOccurs="unbounded"
-				namespace="##other" processContents="lax" />
-		</xs:sequence>
-		<xs:attribute name="TransitionIdentifier" type="xs:anyURI"
-			use="optional" />
-		<xs:attribute name="Time" type="xs:dateTime" use="required" />
-		<xs:anyAttribute namespace="##other" />
-	</xs:complexType>
-	<xs:element name="StateTransition" type="muws2:StateTransitionType" />
-	<!-- Begin properties for the OperationalStatus capability -->
-	<xs:element name="OperationalStatus">
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-				<xs:enumeration value="Available" />
-				<xs:enumeration value="PartiallyAvailable" />
-				<xs:enumeration value="Unavailable" />
-				<xs:enumeration value="Unknown" />
-			</xs:restriction>
-		</xs:simpleType>
-	</xs:element>
-	<!-- End   properties for the OperationalStatus capability -->
-	<xs:attributeGroup name="MetricAttributes">
-		<xs:attribute name="ResetAt" type="xs:dateTime" />
-		<xs:attribute name="LastUpdated" type="xs:dateTime" />
-		<xs:attribute name="Duration" type="xs:duration" />
-	</xs:attributeGroup>
-	<!-- Begin properties for the Metrics capability -->
-	<xs:element name="CurrentTime" type="xs:dateTime" />
-	<!-- End   properties for the Metrics capability -->
-	<xs:complexType name="RelationshipTypeType">
-		<xs:complexContent>
-			<xs:extension base="muws2:CategoryType" />
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:element name="Self">
-		<xs:complexType />
-	</xs:element>
-	<xs:complexType name="RelationshipParticipantType">
-		<xs:sequence>
-			<xs:element ref="muws2:Self" minOccurs="0" />
-			<xs:element ref="muws1:ManageabilityEndpointReference"
-				minOccurs="0" maxOccurs="unbounded" />
-			<xs:element ref="wsa:EndpointReference" minOccurs="0"
-				maxOccurs="unbounded" />
-			<xs:element ref="muws1:ResourceId" minOccurs="0" />
-			<xs:element name="Role" type="xs:anyURI" />
-			<xs:any minOccurs="0" maxOccurs="unbounded"
-				namespace="##other" processContents="lax" />
-		</xs:sequence>
-		<xs:anyAttribute namespace="##other" />
-	</xs:complexType>
-	<!-- Begin properties for the RelationshipResource capability -->
-	<xs:element name="Name" type="xs:string" />
-	<xs:element name="Type" type="muws2:RelationshipTypeType" />
-	<xs:element name="Participant"
-		type="muws2:RelationshipParticipantType" />
-	<!-- End   properties for the RelationshipResource capability -->
-	<xs:complexType name="RelationshipType">
-		<xs:sequence>
-			<xs:element ref="muws2:Name" minOccurs="0" />
-			<xs:element ref="muws2:Type" />
-			<xs:element ref="muws2:Participant" minOccurs="2"
-				maxOccurs="unbounded" />
-			<xs:element name="AccessEndpointReference"
-				type="wsa:EndpointReferenceType" minOccurs="0" />
-			<xs:any minOccurs="0" maxOccurs="unbounded"
-				namespace="##other" processContents="lax" />
-		</xs:sequence>
-		<xs:anyAttribute namespace="##other" />
-	</xs:complexType>
-	<!-- Begin properties for the Relationship capability -->
-	<xs:element name="Relationship" type="muws2:RelationshipType" />
-	<!-- End   properties for the Relationship capability -->
-	<xs:element name="RelationshipCreatedNotification">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="muws2:Relationship" />
-				<xs:any minOccurs="0" maxOccurs="unbounded"
-					namespace="##other" processContents="lax" />
-			</xs:sequence>
-			<xs:anyAttribute namespace="##other" />
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="RelationshipDeletedNotification">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="muws2:Relationship" />
-				<xs:any minOccurs="0" maxOccurs="unbounded"
-					namespace="##other" processContents="lax" />
-			</xs:sequence>
-			<xs:anyAttribute namespace="##other" />
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="QueryRelationshipsByType">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="RequestedType" type="xs:QName" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="QueryRelationshipsByTypeResponse">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="muws2:Relationship" minOccurs="0"
-					maxOccurs="unbounded" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="CreationNotification">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="muws1:ManageabilityEndpointReference"
-					minOccurs="0" maxOccurs="unbounded" />
-			</xs:sequence>
-			<xs:anyAttribute namespace="##other" />
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="DestructionNotification">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="muws1:ResourceId" minOccurs="0" />
-			</xs:sequence>
-			<xs:anyAttribute namespace="##other" />
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="SituationCategoryType">
-		<xs:complexContent>
-			<xs:extension base="muws2:CategoryType" />
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="SubstitutableMsgType">
-		<xs:sequence>
-			<xs:element name="Value" type="xs:anySimpleType"
-				minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-		<xs:attribute name="MsgId" type="xs:string" use="required" />
-		<xs:attribute name="MsgIdType" type="xs:anyURI" use="required" />
-	</xs:complexType>
-	<xs:complexType name="SituationType">
-		<xs:sequence>
-			<xs:element name="SituationCategory"
-				type="muws2:SituationCategoryType" />
-			<xs:element name="SuccessDisposition" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="Successful" />
-						<xs:enumeration value="Unsuccessful" />
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="SituationTime" type="xs:dateTime" />
-			<xs:element name="Priority" type="xs:short" minOccurs="0" />
-			<xs:element name="Severity" type="xs:short" minOccurs="0" />
-			<xs:element name="Message" type="muws2:LangString"
-				minOccurs="0" />
-			<xs:element name="SubstitutableMsg"
-				type="muws2:SubstitutableMsgType" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Situation" type="muws2:SituationType" />
-	<xs:complexType name="EventCorrelationPropertiesType">
-		<xs:sequence>
-			<xs:element name="repeatCount" minOccurs="0"
-				maxOccurs="1">
-				<xs:simpleType>
-					<xs:restriction base="xs:short">
-						<xs:minInclusive value="0" />
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="elapsedTime" minOccurs="0"
-				maxOccurs="1">
-				<xs:simpleType>
-					<xs:restriction base="xs:long">
-						<xs:minInclusive value="0" />
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="sequenceNumber" type="xs:unsignedLong" />
-	</xs:complexType>
-	<xs:element name="EventCorrelationProperties"
-		type="muws2:EventCorrelationPropertiesType" />
-	<xs:complexType name="MsgCatalogInformationType">
-		<xs:sequence>
-			<xs:element name="msgCatalog" type="xs:anyURI"
-				minOccurs="1" />
-			<xs:element name="msgCatalogType" type="xs:anyURI"
-				minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="MsgCatalogInformation"
-		type="muws2:MsgCatalogInformationType" />
-	<!-- #####   Metadata description elements   ##### -->
-	<xs:element name="Capability" type="xs:anyURI" />
-	<xs:complexType name="DialectableExpressionType" mixed="true">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax"
-				minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-		<xs:attribute name="Dialect" type="xs:anyURI" use="required" />
-		<xs:anyAttribute namespace="##other" />
-	</xs:complexType>
-	<xs:element name="ValidWhile"
-		type="muws2:DialectableExpressionType" />
-	<xs:element name="Units" type="xs:string" />
-	<xs:element name="ChangeType">
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-				<xs:enumeration value="Counter" />
-				<xs:enumeration value="Gauge" />
-				<xs:enumeration value="Unknown" />
-			</xs:restriction>
-		</xs:simpleType>
-	</xs:element>
-	<xs:element name="TimeScope">
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-				<xs:enumeration value="Interval" />
-				<xs:enumeration value="PointInTime" />
-				<xs:enumeration value="SinceReset" />
-			</xs:restriction>
-		</xs:simpleType>
-	</xs:element>
-	<xs:element name="GatheringTime">
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-				<xs:enumeration value="OnChange" />
-				<xs:enumeration value="Periodic" />
-				<xs:enumeration value="OnDemand" />
-				<xs:enumeration value="Unknown" />
-			</xs:restriction>
-		</xs:simpleType>
-	</xs:element>
-	<xs:element name="CalculationInterval" type="xs:duration" />
-	<xs:element name="MetricGroup" type="xs:anyURI" />
-	<xs:element name="PostCondition"
-		type="muws2:DialectableExpressionType" />
-	<!-- =========   StartSituation   ============  -->
-	<xs:element name="StartSituation">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType" />
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="StartInitiated">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:StartSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="RestartInitiated">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:StartSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="StartCompleted">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:StartSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- =========   StopSituation   ============  -->
-	<xs:element name="StopSituation">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType" />
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="StopInitiated">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:StopSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="AbortInitiated">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:StopSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="PauseInitiated">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:StopSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="StopCompleted">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:StopSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- =========   RequestSituation   ============  -->
-	<xs:element name="RequestSituation">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType" />
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="RequestInitiated">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:RequestSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="RequestCompleted">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:RequestSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- =========   DestroySituation   ============  -->
-	<xs:element name="DestroySituation">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType" />
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="DestroyInitiated">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:DestroySituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="DestroyCompleted">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:DestroySituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- =========   CreateSituation   ============  -->
-	<xs:element name="CreateSituation">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType" />
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="CreateInitiated">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:CreateSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="CreateCompleted">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:CreateSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- =========   ConnectSituation   ============  -->
-	<xs:element name="ConnectSituation">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType" />
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="ConnectInitiated">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:ConnectSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="ReconnectInitiated">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:ConnectSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="ConnectCompleted">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:ConnectSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- =========   ReportSituation   ============  -->
-	<xs:element name="ReportSituation">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType" />
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="PerformanceReport">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:ReportSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="SecurityReport">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:ReportSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="HeartbeatReport">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:ReportSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="StatusReport">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:ReportSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="TraceReport">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:ReportSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="DebugReport">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:ReportSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="LogReport">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType">
-					<xs:sequence>
-						<xs:element ref="muws2:ReportSituation" />
-					</xs:sequence>
-				</xs:restriction>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- =========   AvailabilitySituation   ============  -->
-	<xs:element name="AvailabilitySituation">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType" />
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- =========   CapabilitySituation   ============  -->
-	<xs:element name="CapabilitySituation">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType" />
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- =========   ConfigureSituation   ============  -->
-	<xs:element name="ConfigureSituation">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType" />
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- =========   OtherSituation   ============  -->
-	<xs:element name="OtherSituation">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:restriction base="muws2:SituationCategoryType" />
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!--   
-		SCHEMA COPY Material
-		Copy and paste element references below into the schema of a resource properties document.
-		These references insure that the correct minOccurs/maxOccurs attributes are specified in a resource property document schema.
-		
-		NOTE: You must import the MUWS Part 2 schema namespace (MUWS2).
-		
-		**    Description Properties    **
-		<xs:element ref="muws2:Caption"
-		minOccurs="0" maxOccurs="unbounded"/>
-		<xs:element ref="muws2:Description"
-		minOccurs="0" maxOccurs="unbounded"/>
-		<xs:element ref="muws2:Version"
-		minOccurs="0"/>
-		
-		**    Operational Status        **
-		<xs:element ref="muws2:OperationalStatus"/>
-		
-		**    Metrics                   **
-		<xs:element ref="muws2:CurrentTime"/>
-		
-		**    Relationship              **
-		<xs:element ref="muws2:Relationship"
-		minOccurs="0" maxOccurs="unbounded"/>
-		
-		**    Relationship Resource     **
-		<xs:element ref="muws2:Name" minOccurs="0"/>
-		<xs:element ref="muws2:Type"/>
-		<xs:element ref="muws2:Participant"
-		minOccurs="2" maxOccurs="unbounded"/>
-		
-	-->
-</xs:schema>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you 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.
+ 
+-->
+
+<xs:schema targetNamespace="http://docs.oasis-open.org/wsdm/muws2-2.xsd"
+	xmlns:muws2="http://docs.oasis-open.org/wsdm/muws2-2.xsd"
+	xmlns:muws1="http://docs.oasis-open.org/wsdm/muws1-2.xsd"
+	xmlns:wsa="http://www.w3.org/2005/08/addressing"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:import namespace="http://docs.oasis-open.org/wsdm/muws1-2.xsd"
+		schemaLocation="WSDM-MUWS-Part1-1_1.xsd" />
+	<xs:import namespace="http://www.w3.org/2005/08/addressing"
+		schemaLocation="WS-Addressing-2005_08.xsd" />
+	<xs:import namespace="http://www.w3.org/XML/1998/namespace"
+		schemaLocation="XML-Namespace-1998.xsd" />
+	<xs:complexType name="LangString">
+		<xs:simpleContent>
+			<xs:extension base="xs:string">
+				<xs:attribute ref="xml:lang" use="required" />
+				<xs:anyAttribute namespace="##other" />
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	<!-- Begin properties for the Description capability -->
+	<xs:element name="Caption" type="muws2:LangString" />
+	<xs:element name="Description" type="muws2:LangString" />
+	<xs:element name="Version" type="xs:string" />
+	<!-- End   properties for the Description capability -->
+	<xs:complexType name="CategoryType">
+		<xs:sequence>
+			<xs:any minOccurs="0" namespace="##any"
+				processContents="lax" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="StateType">
+		<xs:complexContent>
+			<xs:extension base="muws2:CategoryType" />
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:element name="State" type="muws2:StateType" />
+	<xs:element name="EnteredState" type="muws2:StateType" />
+	<xs:element name="PreviousState" type="muws2:StateType" />
+	<xs:complexType name="StateTransitionType">
+		<xs:sequence>
+			<xs:element ref="muws2:EnteredState" />
+			<xs:element ref="muws2:PreviousState" minOccurs="0" />
+			<xs:any minOccurs="0" maxOccurs="unbounded"
+				namespace="##other" processContents="lax" />
+		</xs:sequence>
+		<xs:attribute name="TransitionIdentifier" type="xs:anyURI"
+			use="optional" />
+		<xs:attribute name="Time" type="xs:dateTime" use="required" />
+		<xs:anyAttribute namespace="##other" />
+	</xs:complexType>
+	<xs:element name="StateTransition" type="muws2:StateTransitionType" />
+	<!-- Begin properties for the OperationalStatus capability -->
+	<xs:element name="OperationalStatus">
+		<xs:simpleType>
+			<xs:restriction base="xs:string">
+				<xs:enumeration value="Available" />
+				<xs:enumeration value="PartiallyAvailable" />
+				<xs:enumeration value="Unavailable" />
+				<xs:enumeration value="Unknown" />
+			</xs:restriction>
+		</xs:simpleType>
+	</xs:element>
+	<!-- End   properties for the OperationalStatus capability -->
+	<xs:attributeGroup name="MetricAttributes">
+		<xs:attribute name="ResetAt" type="xs:dateTime" />
+		<xs:attribute name="LastUpdated" type="xs:dateTime" />
+		<xs:attribute name="Duration" type="xs:duration" />
+	</xs:attributeGroup>
+	<!-- Begin properties for the Metrics capability -->
+	<xs:element name="CurrentTime" type="xs:dateTime" />
+	<!-- End   properties for the Metrics capability -->
+	<xs:complexType name="RelationshipTypeType">
+		<xs:complexContent>
+			<xs:extension base="muws2:CategoryType" />
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:element name="Self">
+		<xs:complexType />
+	</xs:element>
+	<xs:complexType name="RelationshipParticipantType">
+		<xs:sequence>
+			<xs:element ref="muws2:Self" minOccurs="0" />
+			<xs:element ref="muws1:ManageabilityEndpointReference"
+				minOccurs="0" maxOccurs="unbounded" />
+			<xs:element ref="wsa:EndpointReference" minOccurs="0"
+				maxOccurs="unbounded" />
+			<xs:element ref="muws1:ResourceId" minOccurs="0" />
+			<xs:element name="Role" type="xs:anyURI" />
+			<xs:any minOccurs="0" maxOccurs="unbounded"
+				namespace="##other" processContents="lax" />
+		</xs:sequence>
+		<xs:anyAttribute namespace="##other" />
+	</xs:complexType>
+	<!-- Begin properties for the RelationshipResource capability -->
+	<xs:element name="Name" type="xs:string" />
+	<xs:element name="Type" type="muws2:RelationshipTypeType" />
+	<xs:element name="Participant"
+		type="muws2:RelationshipParticipantType" />
+	<!-- End   properties for the RelationshipResource capability -->
+	<xs:complexType name="RelationshipType">
+		<xs:sequence>
+			<xs:element ref="muws2:Name" minOccurs="0" />
+			<xs:element ref="muws2:Type" />
+			<xs:element ref="muws2:Participant" minOccurs="2"
+				maxOccurs="unbounded" />
+			<xs:element name="AccessEndpointReference"
+				type="wsa:EndpointReferenceType" minOccurs="0" />
+			<xs:any minOccurs="0" maxOccurs="unbounded"
+				namespace="##other" processContents="lax" />
+		</xs:sequence>
+		<xs:anyAttribute namespace="##other" />
+	</xs:complexType>
+	<!-- Begin properties for the Relationship capability -->
+	<xs:element name="Relationship" type="muws2:RelationshipType" />
+	<!-- End   properties for the Relationship capability -->
+	<xs:element name="RelationshipCreatedNotification">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="muws2:Relationship" />
+				<xs:any minOccurs="0" maxOccurs="unbounded"
+					namespace="##other" processContents="lax" />
+			</xs:sequence>
+			<xs:anyAttribute namespace="##other" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="RelationshipDeletedNotification">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="muws2:Relationship" />
+				<xs:any minOccurs="0" maxOccurs="unbounded"
+					namespace="##other" processContents="lax" />
+			</xs:sequence>
+			<xs:anyAttribute namespace="##other" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="QueryRelationshipsByType">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="RequestedType" type="xs:QName" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="QueryRelationshipsByTypeResponse">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="muws2:Relationship" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="CreationNotification">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="muws1:ManageabilityEndpointReference"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+			<xs:anyAttribute namespace="##other" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="DestructionNotification">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="muws1:ResourceId" minOccurs="0" />
+			</xs:sequence>
+			<xs:anyAttribute namespace="##other" />
+		</xs:complexType>
+	</xs:element>
+	<xs:complexType name="SituationCategoryType">
+		<xs:complexContent>
+			<xs:extension base="muws2:CategoryType" />
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="SubstitutableMsgType">
+		<xs:sequence>
+			<xs:element name="Value" type="xs:anySimpleType"
+				minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attribute name="MsgId" type="xs:string" use="required" />
+		<xs:attribute name="MsgIdType" type="xs:anyURI" use="required" />
+	</xs:complexType>
+	<xs:complexType name="SituationType">
+		<xs:sequence>
+			<xs:element name="SituationCategory"
+				type="muws2:SituationCategoryType" />
+			<xs:element name="SuccessDisposition" minOccurs="0">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Successful" />
+						<xs:enumeration value="Unsuccessful" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="SituationTime" type="xs:dateTime" />
+			<xs:element name="Priority" type="xs:short" minOccurs="0" />
+			<xs:element name="Severity" type="xs:short" minOccurs="0" />
+			<xs:element name="Message" type="muws2:LangString"
+				minOccurs="0" />
+			<xs:element name="SubstitutableMsg"
+				type="muws2:SubstitutableMsgType" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:element name="Situation" type="muws2:SituationType" />
+	<xs:complexType name="EventCorrelationPropertiesType">
+		<xs:sequence>
+			<xs:element name="repeatCount" minOccurs="0"
+				maxOccurs="1">
+				<xs:simpleType>
+					<xs:restriction base="xs:short">
+						<xs:minInclusive value="0" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="elapsedTime" minOccurs="0"
+				maxOccurs="1">
+				<xs:simpleType>
+					<xs:restriction base="xs:long">
+						<xs:minInclusive value="0" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="sequenceNumber" type="xs:unsignedLong" />
+	</xs:complexType>
+	<xs:element name="EventCorrelationProperties"
+		type="muws2:EventCorrelationPropertiesType" />
+	<xs:complexType name="MsgCatalogInformationType">
+		<xs:sequence>
+			<xs:element name="msgCatalog" type="xs:anyURI"
+				minOccurs="1" />
+			<xs:element name="msgCatalogType" type="xs:anyURI"
+				minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:element name="MsgCatalogInformation"
+		type="muws2:MsgCatalogInformationType" />
+	<!-- #####   Metadata description elements   ##### -->
+	<xs:element name="Capability" type="xs:anyURI" />
+	<xs:complexType name="DialectableExpressionType" mixed="true">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax"
+				minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attribute name="Dialect" type="xs:anyURI" use="required" />
+		<xs:anyAttribute namespace="##other" />
+	</xs:complexType>
+	<xs:element name="ValidWhile"
+		type="muws2:DialectableExpressionType" />
+	<xs:element name="Units" type="xs:string" />
+	<xs:element name="ChangeType">
+		<xs:simpleType>
+			<xs:restriction base="xs:string">
+				<xs:enumeration value="Counter" />
+				<xs:enumeration value="Gauge" />
+				<xs:enumeration value="Unknown" />
+			</xs:restriction>
+		</xs:simpleType>
+	</xs:element>
+	<xs:element name="TimeScope">
+		<xs:simpleType>
+			<xs:restriction base="xs:string">
+				<xs:enumeration value="Interval" />
+				<xs:enumeration value="PointInTime" />
+				<xs:enumeration value="SinceReset" />
+			</xs:restriction>
+		</xs:simpleType>
+	</xs:element>
+	<xs:element name="GatheringTime">
+		<xs:simpleType>
+			<xs:restriction base="xs:string">
+				<xs:enumeration value="OnChange" />
+				<xs:enumeration value="Periodic" />
+				<xs:enumeration value="OnDemand" />
+				<xs:enumeration value="Unknown" />
+			</xs:restriction>
+		</xs:simpleType>
+	</xs:element>
+	<xs:element name="CalculationInterval" type="xs:duration" />
+	<xs:element name="MetricGroup" type="xs:anyURI" />
+	<xs:element name="PostCondition"
+		type="muws2:DialectableExpressionType" />
+	<!-- =========   StartSituation   ============  -->
+	<xs:element name="StartSituation">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType" />
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="StartInitiated">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:StartSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="RestartInitiated">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:StartSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="StartCompleted">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:StartSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<!-- =========   StopSituation   ============  -->
+	<xs:element name="StopSituation">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType" />
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="StopInitiated">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:StopSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="AbortInitiated">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:StopSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="PauseInitiated">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:StopSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="StopCompleted">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:StopSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<!-- =========   RequestSituation   ============  -->
+	<xs:element name="RequestSituation">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType" />
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="RequestInitiated">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:RequestSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="RequestCompleted">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:RequestSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<!-- =========   DestroySituation   ============  -->
+	<xs:element name="DestroySituation">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType" />
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="DestroyInitiated">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:DestroySituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="DestroyCompleted">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:DestroySituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<!-- =========   CreateSituation   ============  -->
+	<xs:element name="CreateSituation">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType" />
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="CreateInitiated">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:CreateSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="CreateCompleted">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:CreateSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<!-- =========   ConnectSituation   ============  -->
+	<xs:element name="ConnectSituation">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType" />
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ConnectInitiated">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:ConnectSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ReconnectInitiated">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:ConnectSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ConnectCompleted">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:ConnectSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<!-- =========   ReportSituation   ============  -->
+	<xs:element name="ReportSituation">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType" />
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="PerformanceReport">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:ReportSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="SecurityReport">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:ReportSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="HeartbeatReport">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:ReportSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="StatusReport">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:ReportSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="TraceReport">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:ReportSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="DebugReport">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:ReportSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="LogReport">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType">
+					<xs:sequence>
+						<xs:element ref="muws2:ReportSituation" />
+					</xs:sequence>
+				</xs:restriction>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<!-- =========   AvailabilitySituation   ============  -->
+	<xs:element name="AvailabilitySituation">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType" />
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<!-- =========   CapabilitySituation   ============  -->
+	<xs:element name="CapabilitySituation">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType" />
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<!-- =========   ConfigureSituation   ============  -->
+	<xs:element name="ConfigureSituation">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType" />
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<!-- =========   OtherSituation   ============  -->
+	<xs:element name="OtherSituation">
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:restriction base="muws2:SituationCategoryType" />
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<!--   
+		SCHEMA COPY Material
+		Copy and paste element references below into the schema of a resource properties document.
+		These references insure that the correct minOccurs/maxOccurs attributes are specified in a resource property document schema.
+		
+		NOTE: You must import the MUWS Part 2 schema namespace (MUWS2).
+		
+		**    Description Properties    **
+		<xs:element ref="muws2:Caption"
+		minOccurs="0" maxOccurs="unbounded"/>
+		<xs:element ref="muws2:Description"
+		minOccurs="0" maxOccurs="unbounded"/>
+		<xs:element ref="muws2:Version"
+		minOccurs="0"/>
+		
+		**    Operational Status        **
+		<xs:element ref="muws2:OperationalStatus"/>
+		
+		**    Metrics                   **
+		<xs:element ref="muws2:CurrentTime"/>
+		
+		**    Relationship              **
+		<xs:element ref="muws2:Relationship"
+		minOccurs="0" maxOccurs="unbounded"/>
+		
+		**    Relationship Resource     **
+		<xs:element ref="muws2:Name" minOccurs="0"/>
+		<xs:element ref="muws2:Type"/>
+		<xs:element ref="muws2:Participant"
+		minOccurs="2" maxOccurs="unbounded"/>
+		
+	-->
+</xs:schema>

Modified: qpid/branches/0.6-release/qpid/java/management/client/src/main/java/wsdl/XML-Namespace-1998.xsd
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/management/client/src/main/java/wsdl/XML-Namespace-1998.xsd?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/management/client/src/main/java/wsdl/XML-Namespace-1998.xsd (original)
+++ qpid/branches/0.6-release/qpid/java/management/client/src/main/java/wsdl/XML-Namespace-1998.xsd Fri Feb 12 04:38:52 2010
@@ -1,25 +1,46 @@
-<?xml version='1.0'?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
- 
- <xs:attribute name="lang" type="xs:language">
- </xs:attribute>
-
- <xs:attribute name="space" default="preserve">
-  <xs:simpleType>
-   <xs:restriction base="xs:NCName">
-    <xs:enumeration value="default"/>
-    <xs:enumeration value="preserve"/>
-   </xs:restriction>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
-  <xs:attribute ref="xml:base"/>
-  <xs:attribute ref="xml:lang"/>
-  <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>
+<?xml version='1.0'?>
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you 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.
+ 
+-->
+
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+ 
+ <xs:attribute name="lang" type="xs:language">
+ </xs:attribute>
+
+ <xs:attribute name="space" default="preserve">
+  <xs:simpleType>
+   <xs:restriction base="xs:NCName">
+    <xs:enumeration value="default"/>
+    <xs:enumeration value="preserve"/>
+   </xs:restriction>
+  </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="base" type="xs:anyURI">
+ </xs:attribute>
+
+ <xs:attributeGroup name="specialAttrs">
+  <xs:attribute ref="xml:base"/>
+  <xs:attribute ref="xml:lang"/>
+  <xs:attribute ref="xml:space"/>
+ </xs:attributeGroup>
+
+</xs:schema>

Modified: qpid/branches/0.6-release/qpid/java/management/client/src/test/java/log4j.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/management/client/src/test/java/log4j.xml?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/management/client/src/test/java/log4j.xml (original)
+++ qpid/branches/0.6-release/qpid/java/management/client/src/test/java/log4j.xml Fri Feb 12 04:38:52 2010
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you 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.
+ 
+-->
+
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
@@ -11,15 +32,15 @@
 				value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" />
 		</layout>
 	</appender>
-	<category name="org.apache.qpid.management">
-		<priority value="INFO" />
-		<appender-ref ref="CONSOLE" />
-	</category>	
-
-	<category name="org.mortbay">
-		<priority value="INFO" />
-		<appender-ref ref="CONSOLE" />
-	</category>	
+	<category name="org.apache.qpid.management">
+		<priority value="INFO" />
+		<appender-ref ref="CONSOLE" />
+	</category>	
+
+	<category name="org.mortbay">
+		<priority value="INFO" />
+		<appender-ref ref="CONSOLE" />
+	</category>	
 
 	<category name="org.apache.qpid.qman.debug.XmlDebugger">
 		<priority value="DEBUG" />
@@ -29,4 +50,4 @@
 		<priority value="ERROR" />
 	</root>
 	
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>

Modified: qpid/branches/0.6-release/qpid/java/management/client/src/test/java/org/apache/qpid/management/wsdm/web.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/management/client/src/test/java/org/apache/qpid/management/wsdm/web.xml?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/management/client/src/test/java/org/apache/qpid/management/wsdm/web.xml (original)
+++ qpid/branches/0.6-release/qpid/java/management/client/src/test/java/org/apache/qpid/management/wsdm/web.xml Fri Feb 12 04:38:52 2010
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you 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.
+ 
+-->
+
 <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
@@ -8,4 +29,4 @@
 		<servlet-class>org.apache.qpid.management.wsdm.QEmuInitializer</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
-</web-app>
\ No newline at end of file
+</web-app>

Modified: qpid/branches/0.6-release/qpid/java/management/client/web.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/management/client/web.xml?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/management/client/web.xml (original)
+++ qpid/branches/0.6-release/qpid/java/management/client/web.xml Fri Feb 12 04:38:52 2010
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you 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.
+ 
+-->
+
 <web-app id="qman" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
@@ -125,4 +146,4 @@
 	<login-config>
 		<auth-method>BASIC</auth-method>
 	</login-config>
-</web-app>
\ No newline at end of file
+</web-app>

Modified: qpid/branches/0.6-release/qpid/java/management/console/src/main/java/org/apache/qpid/console/XMLUtil.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/management/console/src/main/java/org/apache/qpid/console/XMLUtil.java?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/management/console/src/main/java/org/apache/qpid/console/XMLUtil.java (original)
+++ qpid/branches/0.6-release/qpid/java/management/console/src/main/java/org/apache/qpid/console/XMLUtil.java Fri Feb 12 04:38:52 2010
@@ -1,4 +1,25 @@
 package org.apache.qpid.console;
+/*
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ * 
+ */
+
 
 public class XMLUtil
 {

Modified: qpid/branches/0.6-release/qpid/java/perftests/bin/monitoring/monitor-broker.sh
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/perftests/bin/monitoring/monitor-broker.sh?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/perftests/bin/monitoring/monitor-broker.sh (original)
+++ qpid/branches/0.6-release/qpid/java/perftests/bin/monitoring/monitor-broker.sh Fri Feb 12 04:38:52 2010
@@ -1,5 +1,47 @@
+#
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
 #!/bin/bash
 #
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
+#
 # This script starts a broker and then starts additional logging as required.
 #  *.pid files are generated in the LOG_DIR for later use by the stop-monitored-broker 
 #  script. 

Modified: qpid/branches/0.6-release/qpid/java/perftests/bin/monitoring/runTests.sh
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/perftests/bin/monitoring/runTests.sh?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/perftests/bin/monitoring/runTests.sh (original)
+++ qpid/branches/0.6-release/qpid/java/perftests/bin/monitoring/runTests.sh Fri Feb 12 04:38:52 2010
@@ -1,5 +1,47 @@
+#
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
 #!/bin/bash
 #
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
+#
 # Run specified performance tests and 
 # gather details about the test run
 #

Modified: qpid/branches/0.6-release/qpid/java/perftests/bin/monitoring/stop-monitored-broker.sh
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/perftests/bin/monitoring/stop-monitored-broker.sh?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/perftests/bin/monitoring/stop-monitored-broker.sh (original)
+++ qpid/branches/0.6-release/qpid/java/perftests/bin/monitoring/stop-monitored-broker.sh Fri Feb 12 04:38:52 2010
@@ -1,5 +1,47 @@
+#
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
 #!/bin/bash
 #
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
+#
 # Script to stop the running of a monitored broker
 # and the associated monitoring processes.
 #

Modified: qpid/branches/0.6-release/qpid/java/perftests/bin/processing/process.sh
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/perftests/bin/processing/process.sh?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/perftests/bin/processing/process.sh (original)
+++ qpid/branches/0.6-release/qpid/java/perftests/bin/processing/process.sh Fri Feb 12 04:38:52 2010
@@ -1,4 +1,46 @@
+#
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
 #!/bin/bash 
+#
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
 
 usage()
 {

Modified: qpid/branches/0.6-release/qpid/java/perftests/bin/processing/processAll.sh
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/perftests/bin/processing/processAll.sh?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/perftests/bin/processing/processAll.sh (original)
+++ qpid/branches/0.6-release/qpid/java/perftests/bin/processing/processAll.sh Fri Feb 12 04:38:52 2010
@@ -1,4 +1,46 @@
+#
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
 #!/bin/bash 
+#
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
 
 usage()
 {

Modified: qpid/branches/0.6-release/qpid/java/perftests/etc/scripts/extractResults.sh
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/perftests/etc/scripts/extractResults.sh?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/perftests/etc/scripts/extractResults.sh (original)
+++ qpid/branches/0.6-release/qpid/java/perftests/etc/scripts/extractResults.sh Fri Feb 12 04:38:52 2010
@@ -1,5 +1,47 @@
+#
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
 #!/bin/bash +x
 #
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
+#
 # Process a given directory (defaults to '.') and provide a list of the tests run so 
 # identification of any failures can be seen.
 #

Modified: qpid/branches/0.6-release/qpid/java/perftests/etc/scripts/extractThroughputResults.sh
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/perftests/etc/scripts/extractThroughputResults.sh?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/perftests/etc/scripts/extractThroughputResults.sh (original)
+++ qpid/branches/0.6-release/qpid/java/perftests/etc/scripts/extractThroughputResults.sh Fri Feb 12 04:38:52 2010
@@ -1,5 +1,47 @@
+#
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
 #!/bin/bash +x
 #
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
+#
 # Process a given directory (defaults to '.') and provides the throughput results as 
 # reported by the tests.
 # 

Modified: qpid/branches/0.6-release/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml (original)
+++ qpid/branches/0.6-release/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml Fri Feb 12 04:38:52 2010
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you 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.
+ 
+-->
+
 <configuration>
 <work>${QPID_WORK}</work>
 <conf>${QPID_HOME}/etc</conf>

Modified: qpid/branches/0.6-release/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java (original)
+++ qpid/branches/0.6-release/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java Fri Feb 12 04:38:52 2010
@@ -1,4 +1,25 @@
 package org.apache.qpid.server.security.firewall;
+/*
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ * 
+ */
+
 
 import java.io.File;
 import java.io.FileWriter;

Modified: qpid/branches/0.6-release/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/ErrorHandler.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/ErrorHandler.java?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/ErrorHandler.java (original)
+++ qpid/branches/0.6-release/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/ErrorHandler.java Fri Feb 12 04:38:52 2010
@@ -1,4 +1,25 @@
 package org.apache.qpid.testkit;
+/*
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ * 
+ */
+
 
 public interface ErrorHandler {
 

Modified: qpid/branches/0.6-release/qpid/python/examples/datatypes/testdata.py
URL: http://svn.apache.org/viewvc/qpid/branches/0.6-release/qpid/python/examples/datatypes/testdata.py?rev=909229&r1=909228&r2=909229&view=diff
==============================================================================
--- qpid/branches/0.6-release/qpid/python/examples/datatypes/testdata.py (original)
+++ qpid/branches/0.6-release/qpid/python/examples/datatypes/testdata.py Fri Feb 12 04:38:52 2010
@@ -1,3 +1,24 @@
+#
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# 
+#
+
 # -*- encoding: utf-8 -*-
 
 from qpid.datatypes import uuid4, timestamp



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


RE: svn commit: r909229 [5/5] - in /qpid/branches/0.6-release/qpid: cpp/examples/ cpp/src/qpid/framing/ cpp/src/tests/ cpp/src/tests/cluster_test_scripts/ dotnet/client-010/client/client/ dotnet/client-010/client/transport/ dotnet/client-010/demo/Properti

Posted by Robbie Gemmell <ro...@gmail.com>.
All the shell scripts appear to have received a double licence addition (example below)

Also, since the branch is fairly recent the commit should hopefully apply cleanly to trunk in all but the rarest cases, so that is something we should probably do now to make the process easier for the next release.

Robbie

> -----Original Message-----
> From: rajith@apache.org [mailto:rajith@apache.org]
> Sent: 12 February 2010 04:39
> To: commits@qpid.apache.org
> Subject: svn commit: r909229 [5/5] - in /qpid/branches/0.6-
> release/qpid: cpp/examples/ cpp/src/qpid/framing/ cpp/src/tests/
> cpp/src/tests/cluster_test_scripts/ dotnet/client-010/client/client/
> dotnet/client-010/client/transport/ dotnet/client-010/demo/Propertie...
> 

<snip>

> Modified: qpid/branches/0.6-
> release/qpid/java/perftests/etc/scripts/extractResults.sh
> URL: http://svn.apache.org/viewvc/qpid/branches/0.6-
> release/qpid/java/perftests/etc/scripts/extractResults.sh?rev=909229&r1
> =909228&r2=909229&view=diff
> =======================================================================
> =======
> --- qpid/branches/0.6-
> release/qpid/java/perftests/etc/scripts/extractResults.sh (original)
> +++ qpid/branches/0.6-
> release/qpid/java/perftests/etc/scripts/extractResults.sh Fri Feb 12
> 04:38:52 2010
> @@ -1,5 +1,47 @@
> +#
> +#
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you 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.
> +#
> +#
> +
>  #!/bin/bash +x
>  #
> +#
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements.  See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership.  The ASF licenses this file
> +# to you 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.
> +#
> +#
> +
> +#
>  # Process a given directory (defaults to '.') and provide a list of
> the tests run so
>  # identification of any failures can be seen.
>  #
> 

</snip>



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org