Index: /WaveDev/trunk/WaveDev/XML_gen/component_gen.py
===================================================================
--- /WaveDev/trunk/WaveDev/XML_gen/component_gen.py	(revision 529)
+++ /WaveDev/trunk/WaveDev/XML_gen/component_gen.py	(revision 535)
@@ -11,7 +11,7 @@
 extension_exe = u'.exe'
 
-outputFileName_scd = componentName + extension_scd
-outputFileName_spd = componentName + extension_spd
-outputFileName_prf = componentName + extension_prf
+outputFileName_scd = componentName + 'Resource' + extension_scd
+outputFileName_spd = componentName + 'Resource' + extension_spd
+outputFileName_prf = componentName + 'Resource' + extension_prf
 
 output_scd = open(outputFileName_scd, 'w')
Index: /WaveDev/trunk/WaveDev/XML_gen/application_gen.py
===================================================================
--- /WaveDev/trunk/WaveDev/XML_gen/application_gen.py	(revision 534)
+++ /WaveDev/trunk/WaveDev/XML_gen/application_gen.py	(revision 535)
@@ -3,20 +3,29 @@
 from amara import binderytools
 
+#
+# UUID Generator
+#
 def uuidgen():
 	return commands.getoutput('uuidgen')
 
+#
+# Specification
+#
+
 appName = u'TestApp'
-numComponents = 5
+NUM_COMPONENTS = 5
+
 componentName = []
-for n in range(numComponents):
+for n in range(NUM_COMPONENTS):
 	componentName.append('TestComponent' + str(n))
 	componentName[n] = unicode(componentName[n])
 
-numConnections = 4
-connections = []
+NUM_CONNECTIONS = 4
 CONNECTION_NAME = 0
 CONNECTION_USES = 1
 CONNECTION_PROVIDES = 2
-for n in range(numConnections):
+
+connections = []
+for n in range(NUM_CONNECTIONS):
 	connections.append([componentName[n] + u'to' + componentName[n+1], componentName[n], componentName[n+1]])
 
@@ -35,4 +44,6 @@
 #
 
+# Parse and objectify
+
 doc_sad = binderytools.bind_file('_sad.xml')
 
@@ -40,15 +51,23 @@
 doc_sad.softwareassembly.id = u'DCE:' + unicode(uuidgen())
 
-element_componentfile = doc_sad.xml_element(u'componentfile', attributes={u'type': u'SPD', u'id': u'Default'}) 
+#element_componentfile = doc_sad.xml_element(u'componentfile', attributes={u'type': u'SPD', u'id': u'Default'}) 
 
-for n in range(numComponents):
+componentfile = [componentfile for componentfile in doc_sad.softwareassembly.componentfiles.componentfile]
+
+for n in range(NUM_COMPONENTS):
 #	doc_sad.softwareassembly.componentfiles.xml_append(element_componentfile)
 #	doc_sad.softwareassembly.componentfiles.componentfile[2].xml_children.append(doc_sad.xml_element(u'localfile', attributes={u'name': u'test'}))
-	doc_sad.softwareassembly.componentfiles.componentfile[n].id = componentName[n] + u'ResourceFile'
-	doc_sad.softwareassembly.componentfiles.componentfile[n].localfile.name = u'/waveforms/' + componentName[n] + extension_spd
+	componentfile[n].id = componentName[n] + u'ResourceFile'
+	componentfile[n].localfile.name = u'/waveforms/' + componentName[n] + extension_spd
 
-for n in range(numComponents):
-	del doc_sad.softwareassembly.componentfiles.componentfile[numComponents].localfile
-	del doc_sad.softwareassembly.componentfiles.componentfile[numComponents]
+for n in range(10 - NUM_COMPONENTS):
+	componentfile[NUM_COMPONENTS].xml_clear() 
+	del doc_sad.softwareassembly.componentfiles.componentfile[NUM_COMPONENTS]
+
+#
+# Assembly Controller
+#
+
+doc_sad.softwareassembly.assemblycontroller.componentinstantiationref.refid = u'DCE:' + unicode(uuidgen())
 
 #
@@ -58,5 +77,5 @@
 componentplacement = [componentplacement for componentplacement in doc_sad.softwareassembly.partitioning.componentplacement]
 
-for n in range(numComponents):
+for n in range(NUM_COMPONENTS):
 	componentplacement[n+1].componentfileref.refid = componentName[n] + u'ResourceFile'
 	componentplacement[n+1].componentinstantiation.id = u'DCE:' + unicode(uuidgen())
@@ -64,7 +83,7 @@
 	componentplacement[n+1].componentinstantiation.findcomponent.namingservice.name = u'/DomainName1/' + componentName[n] + u'Resource'
 
-for n in range(10 - numComponents):
-	componentplacement[numComponents + 1].xml_clear() 
-	del doc_sad.softwareassembly.partitioning.componentplacement[numComponents + 1] 
+for n in range(10 - NUM_COMPONENTS):
+	componentplacement[NUM_COMPONENTS + 1].xml_clear() 
+	del doc_sad.softwareassembly.partitioning.componentplacement[NUM_COMPONENTS + 1] 
 
 #
@@ -74,5 +93,5 @@
 connectinterface = [connectinterface for connectinterface in doc_sad.softwareassembly.connections.connectinterface]
 
-for n in range(numConnections):
+for n in range(NUM_CONNECTIONS):
 	connectinterface[n].id = connections[n][CONNECTION_NAME]
 	connectinterface[n].usesport.usesidentifier = connections[n][CONNECTION_USES]
@@ -80,9 +99,21 @@
 	connectinterface[n].findby.namingservice.name = u'/DomainName1/' + connections[n][CONNECTION_PROVIDES] + u'Resource'
 
-for n in range(10 - numConnections):
-	connectinterface[numConnections + 1].xml_clear()
-	del doc_sad.softwareassembly.connections.connectinterface[numConnections] 
+for n in range(10 - NUM_CONNECTIONS):
+	connectinterface[NUM_CONNECTIONS + 1].xml_clear()
+	del doc_sad.softwareassembly.connections.connectinterface[NUM_CONNECTIONS] 
 
 
 print doc_sad.xml(sys.stdout)
 #print >> output_sad, doc_sad.xml()
+
+#
+# Post Processing
+#
+
+#
+# Specify external DTD
+#
+
+#
+# Beautify
+#