--- a/layers.sysdef.xml	Tue Aug 31 16:06:48 2010 +0300
+++ b/layers.sysdef.xml	Wed Sep 01 12:27:00 2010 +0100
@@ -1,14 +1,13 @@
-<?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
-  <!ENTITY layer_real_source_path "sf/mw/srvdiscovery" >
+<?xml version="1.0"?><!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [  
+ <!ENTITY layer_real_source_path "sf/mw/srvdiscovery" >
 ]>
-
-<SystemDefinition name="srvdiscovery" schema="1.4.0">
-  <systemModel>
-    <layer name="mw_layer">
-      <module name="srvdiscovery">
-        <unit unitID="netdo.srvdiscovery" mrp="" bldFile="&layer_real_source_path;/group" name="srvdiscovery" />
-      </module>
-    </layer>
-  </systemModel>
+<SystemDefinition name="ossrv" schema="1.4.0">  
+<systemModel> 
+<!-- Common file for prebuild layers-->          
+<layer name="mw_layer">                        
+<module name="upnp">                             
+<unit name="upnp" unitID="mrtdo.upnp" bldFile="&layer_real_source_path;/upnp/group" mrp="" />
+</module>    
+</layer>        
+</systemModel>
 </SystemDefinition>
\ No newline at end of file