From d0e42f669232987359ae3431b310530dc588fc6f Mon Sep 17 00:00:00 2001
From: ogattaz <olivier@gattaz.com>
Date: Thu, 28 Aug 2014 11:05:51 +0200
Subject: pull master devs

---
 src/main/resources/boot/OD/Module.xsd       | 1 -
 src/main/resources/boot/property/CAProp.xml | 1 -
 src/main/resources/boot/property/EAProp.xml | 1 -
 src/main/resources/boot/property/ODProp.xml | 1 -
 src/main/resources/boot/property/SCProp.xml | 1 -
 src/main/resources/boot/property/SMProp.xml | 1 -
 src/main/resources/mapFiles/ModuleMap.xml   | 3 ---
 7 files changed, 9 deletions(-)

(limited to 'src/main/resources')

diff --git a/src/main/resources/boot/OD/Module.xsd b/src/main/resources/boot/OD/Module.xsd
index c768e3f..d25352e 100644
--- a/src/main/resources/boot/OD/Module.xsd
+++ b/src/main/resources/boot/OD/Module.xsd
@@ -9,7 +9,6 @@
 						<xs:sequence>
 							<xs:element name="Description" type="xs:string" />
 							<xs:element name="Version" type="xs:string" />
-							<xs:element name="Layer" type="xs:integer" minOccurs="0" default="0"/>
 							<xs:element name="Dependency" type="xs:string"
 								minOccurs="0" maxOccurs="unbounded" />
 						</xs:sequence>
diff --git a/src/main/resources/boot/property/CAProp.xml b/src/main/resources/boot/property/CAProp.xml
index b29884a..ac37ae7 100644
--- a/src/main/resources/boot/property/CAProp.xml
+++ b/src/main/resources/boot/property/CAProp.xml
@@ -2,6 +2,5 @@
 	<PropertyDescription Name="Name" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>
 	<PropertyDescription Name="Complexity" IsClassIdentifier="true" DefaultValue="Composite" IsMutable="false"/>
 	<PropertyDescription Name="Type" IsClassIdentifier="true" DefaultValue="ActivityDesc" IsMutable="false"/>
-	<PropertyDescription Name="Layer" IsClassIdentifier="false" DefaultValue="0" IsMutable="true"/>
 	<PropertyDescription Name="Module" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>	
 </AllProperties>
diff --git a/src/main/resources/boot/property/EAProp.xml b/src/main/resources/boot/property/EAProp.xml
index 2477c93..a345695 100644
--- a/src/main/resources/boot/property/EAProp.xml
+++ b/src/main/resources/boot/property/EAProp.xml
@@ -2,6 +2,5 @@
 	<PropertyDescription Name="Name" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>
 	<PropertyDescription Name="Complexity" IsClassIdentifier="true" DefaultValue="Elementary" IsMutable="false"/>
 	<PropertyDescription Name="Type" IsClassIdentifier="true" DefaultValue="ActivityDesc" IsMutable="false"/>
-	<PropertyDescription Name="Layer" IsClassIdentifier="false" DefaultValue="0" IsMutable="true"/>
 	<PropertyDescription Name="Module" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>
 </AllProperties>
diff --git a/src/main/resources/boot/property/ODProp.xml b/src/main/resources/boot/property/ODProp.xml
index f4d7b15..894a6ee 100644
--- a/src/main/resources/boot/property/ODProp.xml
+++ b/src/main/resources/boot/property/ODProp.xml
@@ -1,6 +1,5 @@
 <AllProperties>
 	<PropertyDescription Name="Name" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>
 	<PropertyDescription Name="Type" IsClassIdentifier="true" DefaultValue="OutcomeDesc" IsMutable="false"/>
-	<PropertyDescription Name="Layer" IsClassIdentifier="false" DefaultValue="0" IsMutable="true"/>
 	<PropertyDescription Name="Module" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>
 </AllProperties>
diff --git a/src/main/resources/boot/property/SCProp.xml b/src/main/resources/boot/property/SCProp.xml
index 9ff0366..f5de23c 100644
--- a/src/main/resources/boot/property/SCProp.xml
+++ b/src/main/resources/boot/property/SCProp.xml
@@ -1,6 +1,5 @@
 <AllProperties>
 	<PropertyDescription Name="Name" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>
 	<PropertyDescription Name="Type" IsClassIdentifier="true" DefaultValue="Script" IsMutable="false"/>
-	<PropertyDescription Name="Layer" IsClassIdentifier="false" DefaultValue="0" IsMutable="true"/>
 	<PropertyDescription Name="Module" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>
 </AllProperties>
diff --git a/src/main/resources/boot/property/SMProp.xml b/src/main/resources/boot/property/SMProp.xml
index f43d0b5..8581e74 100644
--- a/src/main/resources/boot/property/SMProp.xml
+++ b/src/main/resources/boot/property/SMProp.xml
@@ -1,6 +1,5 @@
 <AllProperties>
 	<PropertyDescription Name="Name" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>
 	<PropertyDescription Name="Type" IsClassIdentifier="true" DefaultValue="StateMachine" IsMutable="false"/>
-	<PropertyDescription Name="Layer" IsClassIdentifier="false" DefaultValue="0" IsMutable="true"/>
 	<PropertyDescription Name="Module" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>
 </AllProperties>
diff --git a/src/main/resources/mapFiles/ModuleMap.xml b/src/main/resources/mapFiles/ModuleMap.xml
index 440b852..45f6cbe 100644
--- a/src/main/resources/mapFiles/ModuleMap.xml
+++ b/src/main/resources/mapFiles/ModuleMap.xml
@@ -38,9 +38,6 @@
 		<field name="version" direct="true" type="string">
 			<bind-xml name="Version" node="element" />
 		</field>
-		<field name="layer" direct="true" type="integer">
-			<bind-xml name="Layer" node="element" />
-		</field>		
 		<field name="dependency" collection="arraylist" direct="true"
 			type="string">
 			<bind-xml name="Dependency" node="element" />
-- 
cgit v1.2.3