# HG changeset patch
# User Simon Howkins <simonh@symbian.org>
# Date 1249549679 -3600
# Node ID 70446cb9bc9173801ad388d7845bbaa8bc5ecbf3
# Parent  5dfc4b38cad08e921c4a4bfc766519a4f7047eef
Made XML well formed (removed '-'s from attribute name)
Moved definition for conntools to the layer where it belongs.

diff -r 5dfc4b38cad0 -r 70446cb9bc91 3k/adaptation/stubs/package_definition.xml
--- a/3k/adaptation/stubs/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
+++ b/3k/adaptation/stubs/package_definition.xml	Thu Aug 06 10:07:59 2009 +0100
@@ -33,7 +33,7 @@
      </component>
     </collection>
     <collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-     <component name="asnimplementation" long-name="ASN Imple­ment­ation" origin-model="foundation">
+     <component name="asnimplementation" long-name="ASN Implementation" origin-model="foundation">
       <unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
      </component>
     </collection>
@@ -130,4 +130,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>
diff -r 5dfc4b38cad0 -r 70446cb9bc91 3k/app/conntools/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3k/app/conntools/package_definition.xml	Thu Aug 06 10:07:59 2009 +0100
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition name="foundation" schema="2.0.1">
+<systemModel>
+<layer name="mw" long-name="Middleware" levels="generic specific">
+<block name="conntools" long-name="Conn Tools" tech_domain="to" level="generic" levels="1 2">
+    <collection name="nettools" long-name="Net Tools" level="2">
+     <component name="conntest" long-name="Connection Test" origin-model="foundation">
+      <unit bldFile="/sf/app/conntools/nettools/conntest/group"/>
+     </component>
+     <component unofficial="yes" name="nettools_build" long-name="Net Tools Build" origin-model="foundation">
+      <unit bldFile="/sf/app/conntools/nettools/group"/>
+     </component>
+    </collection>
+    <collection name="emulatorlan" long-name="Emulator Lan" level="1">
+     <component name="emulatorlan_build" long-name="Emulator LAN Component" origin-model="foundation">
+      <unit bldFile="/sf/app/conntools/emulatorlan/group"/>
+     </component>
+    </collection>
+    <collection name="conntools_info" long-name="Conn Tools Info" level="2">
+     <component unofficial="yes" name="conntools_build" long-name="Conn Tools Build" origin-model="foundation">
+      <unit bldFile="/sf/app/conntools/group"/>
+     </component>
+    </collection>
+   </block>
+</layer>
+</systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r 5dfc4b38cad0 -r 70446cb9bc91 3k/app/conntools/sources.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3k/app/conntools/sources.csv	Thu Aug 06 10:07:59 2009 +0100
@@ -0,0 +1,2 @@
+source,dst,type,pattern,sysdef
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
diff -r 5dfc4b38cad0 -r 70446cb9bc91 3k/mw/conntools/package_definition.xml
--- a/3k/mw/conntools/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="conntools" long-name="Conn Tools" tech_domain="to" level="generic" levels="1 2">
-    <collection name="nettools" long-name="Net Tools" level="2">
-     <component name="conntest" long-name="Connection Test" origin-model="foundation">
-      <unit bldFile="/sf/app/conntools/nettools/conntest/group"/>
-     </component>
-     <component unofficial="yes" name="nettools_build" long-name="Net Tools Build" origin-model="foundation">
-      <unit bldFile="/sf/app/conntools/nettools/group"/>
-     </component>
-    </collection>
-    <collection name="emulatorlan" long-name="Emulator Lan" level="1">
-     <component name="emulatorlan_build" long-name="Emulator LAN Component" origin-model="foundation">
-      <unit bldFile="/sf/app/conntools/emulatorlan/group"/>
-     </component>
-    </collection>
-    <collection name="conntools_info" long-name="Conn Tools Info" level="2">
-     <component unofficial="yes" name="conntools_build" long-name="Conn Tools Build" origin-model="foundation">
-      <unit bldFile="/sf/app/conntools/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 5dfc4b38cad0 -r 70446cb9bc91 3k/mw/conntools/sources.csv
--- a/3k/mw/conntools/sources.csv	Tue Jul 28 14:16:28 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml