X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fmi_lttng.xsd;h=f5fc7293c044c9156aeb945b48ecf97b21578d72;hb=e4d12c27f4a48891e84a76fa92d32a95ccde561f;hp=db440920469a395ed2b92764e03b27e694a3dc7a;hpb=9618049b6266c05789d6d7b29279e258cf67fb25;p=lttng-tools.git

diff --git a/src/common/mi_lttng.xsd b/src/common/mi_lttng.xsd
index db4409204..f5fc7293c 100644
--- a/src/common/mi_lttng.xsd
+++ b/src/common/mi_lttng.xsd
@@ -83,7 +83,7 @@ THE SOFTWARE.
 		</xs:restriction>
 	</xs:simpleType>
 
-	<!-- Maps to the lttng_loglevel_type enum -->
+	<!-- Maps to the lttng_event_context_type enum -->
 	<xs:simpleType name="context_type_type">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="PERF_COUNTER" />
@@ -132,6 +132,14 @@ THE SOFTWARE.
 			<xs:enumeration value="JUL_FINER" />
 			<xs:enumeration value="JUL_FINEST" />
 			<xs:enumeration value="JUL_ALL" />
+			<xs:enumeration value="LOG4J_OFF" />
+			<xs:enumeration value="LOG4J_FATAL" />
+			<xs:enumeration value="LOG4J_ERROR" />
+			<xs:enumeration value="LOG4J_WARN" />
+			<xs:enumeration value="LOG4J_INFO" />
+			<xs:enumeration value="LOG4J_DEBUG" />
+			<xs:enumeration value="LOG4J_TRACE" />
+			<xs:enumeration value="LOG4J_ALL" />
 			<xs:enumeration value="UNKNOWN" />
 		</xs:restriction>
 	</xs:simpleType>
@@ -146,9 +154,9 @@ THE SOFTWARE.
 	<!-- Maps to the lttng_event_probe_attr struct -->
 	<xs:complexType name="event_probe_attributes_type">
 		<xs:all>
-			<xs:element name="address" type="uint64_type" />
-			<xs:element name="offset" type="uint64_type" />
-			<xs:element name="symbol_name" type="name_type" />
+			<xs:element name="address" type="uint64_type" minOccurs="0" />
+			<xs:element name="offset" type="uint64_type" minOccurs="0" />
+			<xs:element name="symbol_name" type="name_type" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
@@ -219,6 +227,7 @@ THE SOFTWARE.
 			<xs:enumeration value="KERNEL"/>
 			<xs:enumeration value="UST"/>
 			<xs:enumeration value="JUL"/>
+			<xs:enumeration value="LOG4J"/>
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -437,10 +446,10 @@ THE SOFTWARE.
 	<xs:complexType name="output_type">
 		<xs:choice>
 			<xs:element name="domains" type="domains_type" minOccurs="0" />
-			<xs:element name="session" type="session_type" minOccurs="0" />
 			<xs:element name="sessions" type="sessions_type" minOccurs="0" />
 			<xs:element name="session" type="session_type" minOccurs="0" />
 			<xs:element name="snapshot_action" type="snapshot_action_type" minOccurs="0" />
+			<xs:element name="snapshot" type="snapshot_type" minOccurs="0" />
 			<xs:element name="version" type="version_type" minOccurs="0" />
 			<xs:element name="save" type="save_type" minOccurs="0" />
 			<xs:element name="load" type="load_type" minOccurs="0" />
@@ -449,7 +458,6 @@ THE SOFTWARE.
 			<xs:element name="channels" type="channels_type" minOccurs="0" />
 			<xs:element name="events" type="event_list_type" minOccurs="0" />
 			<xs:element name="channel" type="channel_type" minOccurs="0" />
-			<xs:element name="channels" type="channels_type" minOccurs="0" />
 		</xs:choice>
 	</xs:complexType>