From f817756ee1a1a51a5e3001f7642bb9dfbaf54061 Mon Sep 17 00:00:00 2001
From: Simo Tripodi <stripodi@adobe.com>
Date: Fri, 21 Jun 2013 10:44:07 +0200
Subject: [PATCH] obtained current Logback configuration layout

---
 logback-joran2/src/main/mdo/joran.mdo         |  6 ++---
 .../ch/qos/logback/core/joran/v2/logback.xml  | 24 ++++++++-----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/logback-joran2/src/main/mdo/joran.mdo b/logback-joran2/src/main/mdo/joran.mdo
index bda1a17644..c48c835f66 100644
--- a/logback-joran2/src/main/mdo/joran.mdo
+++ b/logback-joran2/src/main/mdo/joran.mdo
@@ -33,7 +33,7 @@
   </defaults>
 
   <classes>
-    <class xml.tagName="configuration" rootElement="true" java.builder="true" java.toString="true">
+    <class xml.tagName="configuration" xsd.compositor="sequence" rootElement="true" java.builder="true" java.toString="true">
       <name>Configuration</name>
       <version>2.0.0+</version>
       <fields>
@@ -63,7 +63,7 @@
           <name>properties</name>
           <version>2.0.0+</version>
           <type>List</type>
-          <association xml.itemsStyle="inline" java.init="constructor">
+          <association xml.itemsStyle="flat" java.init="constructor">
             <type>Property</type>
             <multiplicity>*</multiplicity>
           </association>
@@ -73,7 +73,7 @@
           <name>appenders</name>
           <version>2.0.0+</version>
           <required>true</required>
-          <association xml.itemsStyle="inline" java.init="constructor">
+          <association xml.itemsStyle="flat" java.init="constructor">
             <type>Appender</type>
             <multiplicity>*</multiplicity>
           </association>
diff --git a/logback-joran2/src/test/resources/ch/qos/logback/core/joran/v2/logback.xml b/logback-joran2/src/test/resources/ch/qos/logback/core/joran/v2/logback.xml
index 66a121fb04..4ebb9d6b08 100644
--- a/logback-joran2/src/test/resources/ch/qos/logback/core/joran/v2/logback.xml
+++ b/logback-joran2/src/test/resources/ch/qos/logback/core/joran/v2/logback.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="30 seconds">
-  <properties>
-    <property name="USER_HOME" value="/home/sebastien" />
-    <property name="nodeId" value="firstNode" scope="context" />
-    <property file="src/main/java/chapters/configuration/variables1.properties" />
-    <property resource="resource1.properties" />
-  </properties>
-  <appenders>
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-      <file>${USER_HOME}/${nodeId}/myApp.log</file>
-      <encoder>
-        <pattern>%msg%n</pattern>
-      </encoder>
-    </appender>
-  </appenders>
+  <property name="USER_HOME" value="/home/sebastien" />
+  <property name="nodeId" value="firstNode" scope="context" />
+  <property file="src/main/java/chapters/configuration/variables1.properties" />
+  <property resource="resource1.properties" />
+  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+    <file>${USER_HOME}/${nodeId}/myApp.log</file>
+    <encoder>
+      <pattern>%msg%n</pattern>
+    </encoder>
+  </appender>
   <root level="info">
     <appender-ref ref="FILE" />
   </root>