Index: /siedev/branches/mcarrick/DPD/xml/propertyFile.xml
===================================================================
--- /ossiedev/branches/mcarrick/DPD/xml/propertyFile.xml	(revision 8681)
+++ 	(revision )
@@ -1,6 +1,0 @@
-<propertyfile type="PROPFILE TYPE">
-	<localfile name="LOCALFILE NAME"/>
-</propertyfile>
-
-
-
Index: /siedev/branches/mcarrick/DPD/xml/deviceClass.xml
===================================================================
--- /ossiedev/branches/mcarrick/DPD/xml/deviceClass.xml	(revision 8681)
+++ 	(revision )
@@ -1,5 +1,0 @@
-<deviceclass>
-	<class>CLASS1</class>
-	<class>CLASS2</class>
-	<class>CLASS3</class>
-</deviceclass>
Index: /siedev/branches/mcarrick/DPD/xml/hwDeviceRegistration.xml
===================================================================
--- /ossiedev/branches/mcarrick/DPD/xml/hwDeviceRegistration.xml	(revision 8691)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<hwdeviceregistration id="ID1" version="VER1" name="NAME1">
-	<propertyfile type="PROP1">
-		<localfile name="PRF1"/>
-	</propertyfile>
-	<description>DESCRIP1</description>
-	<manufacturer>MANUFAC1</manufacturer>
-	<modelnumber>MODELNUM1</modelnumber>
-	<deviceclass>
-		<class>CLASS11</class>
-		<class>CLASS12</class>
-		<class>CLASS13</class>
-	</deviceclass>
-	<childhwdevice>
-		<hwdeviceregistration id="ID2" version="VER2" name="NAME2">
-			<propertyfile type="PROP2">
-				<localfile name="PRF2"/>
-			</propertyfile>
-			<description>DESCRIP2</description>
-			<manufacturer>MANUFAC2</manufacturer>
-			<modelnumber>MODELNUM2</modelnumber>
-			<deviceclass>
-				<class>CLASS21</class>
-				<class>CLASS22</class>
-			</deviceclass>
-			<childhwdevice>
-				<hwdeviceregistration id="ID3" version="VER3" name="NAME3">
-					<propertyfile type="PROP3">
-						<localfile name="PRF3"/>
-					</propertyfile>
-					<description>DESCRIP3</description>
-					<manufacturer>MANUFAC3</manufacturer>
-					<modelnumber>MODELNUM3</modelnumber>
-					<deviceclass>
-						<class>CLASS31</class>
-						<class>CLASS32</class>
-					</deviceclass>
-				</hwdeviceregistration>
-				<devicepkgref type="DEV3">
-					<localfile name="PRF4"/>
-				</devicepkgref>
-			</childhwdevice>
-		</hwdeviceregistration>
-		<devicepkgref type="DEV2">
-			<localfile name="PRF2"/>
-		</devicepkgref>
-	</childhwdevice>
-	<childhwdevice>
-		<hwdeviceregistration id="ID4" version="VER4" name="NAME4">
-			<propertyfile type="PROP4">
-				<localfile name="PRF5"/>
-			</propertyfile>
-			<description>DESCRIP4</description>
-			<manufacturer>MANUFAC4</manufacturer>
-			<modelnumber>MODELNUM4</modelnumber>
-			<deviceclass>
-				<class>CLASS41</class>
-				<class>CLASS42</class>
-			</deviceclass>
-		</hwdeviceregistration>
-		<devicepkgref type="DEV4">
-			<localfile name="PRF6"/>
-		</devicepkgref>
-	</childhwdevice>
-</hwdeviceregistration>
Index: /siedev/branches/mcarrick/DPD/xml/devicePkgRef.xml
===================================================================
--- /ossiedev/branches/mcarrick/DPD/xml/devicePkgRef.xml	(revision 8681)
+++ 	(revision )
@@ -1,3 +1,0 @@
-<devicepkgref type="DEVICEPKGREF TYPE">
-	<localfile name="LOCALFILE NAME"/>
-</devicepkgref>
Index: /ossiedev/branches/mcarrick/DPD/testApp.cpp
===================================================================
--- /ossiedev/branches/mcarrick/DPD/testApp.cpp	(revision 8703)
+++ /ossiedev/branches/mcarrick/DPD/testApp.cpp	(revision 8704)
@@ -1,16 +1,8 @@
-#include "DevicePkgRef.h"
-#include "HWDeviceRegistration.h"
 #include "DevicePkg.h"
 
 #include <iostream>
 
-// test functions
-void testLocalFile();
-void testDeviceClass();
-void testDevicePkgRef();
-void testPropertyFile();
-void testHWDeviceRegistration();
+// test function
 void testDevicePkg();
-
 
 int main()
@@ -19,8 +11,4 @@
 	std::cout << "running test app..." << std::endl;
 
-	//testDeviceClass();
-	//testDevicePkgRef();
-	//testPropertyFile();
-	//testHWDeviceRegistration();
 	testDevicePkg();
 
@@ -83,102 +71,4 @@
 }
 
-void testPropertyFile()
-{
-	std::cout << "testPropertyFile()" << std::endl;
-
-	char *root = "xml/propertyFile.xml";
-	TiXmlDocument xmlDoc(root); // set up path to XML through char string
-
-	if (xmlDoc.LoadFile())
-	{
-		TiXmlHandle doc(&xmlDoc); // get handle to XML file
-		TiXmlElement *propFile = doc.FirstChild("propertyfile").Element();
-
-		PropertyFile parse(propFile);
-	}
-	else
-	{
-		std::cout << "can't load the file " << root << std::endl;
-	}
-	std::cout << std::endl;
-}
-
-
-void testHWDeviceRegistration()
-{
-	std::cout << "testHWDeviceRegistration()" << std::endl;
-
-	char *root = "xml/hwDeviceRegistration.xml";
-	TiXmlDocument xmlDoc(root); // set up path to XML through char string
-
-	if (xmlDoc.LoadFile())
-	{
-		TiXmlHandle doc(&xmlDoc); // get handle to XML file
-		TiXmlElement *devReg = doc.FirstChild("hwdeviceregistration").Element();
-
-		HWDeviceRegistration parse(devReg);
-
-		std::cout << std::endl << std::endl;
-
-	}
-	else
-	{
-		std::cout << "you botched it, can't load " << root << std::endl;
-	}
-	std::cout << std::endl;
-}
-
-void testDevicePkgRef()
-{
-	std::cout << "testDevicePkgRef()" << std::endl;
-
-	char *root = "xml/devicePkgRef.xml";
-	TiXmlDocument xmlDoc(root); // set up path to XML through char string
-
-	if (xmlDoc.LoadFile())
-	{
-		TiXmlHandle doc(&xmlDoc); // get handle to XML file
-		TiXmlElement *devPkgRef = doc.FirstChild("devicepkgref").Element();
-
-		DevicePkgRef parse(devPkgRef);
-	}
-	else
-	{
-		std::cout << "you botched it, couldn't load " << root << std::endl;
-	}
-	std::cout << std::endl;
-}
-
-void testDeviceClass()
-{
-	std::cout << "testDeviceClass()" << std::endl;
-	char *root = "xml/deviceClass.xml";
-        TiXmlDocument xmlDoc(root); // set up path to XML through character string
-
-        if (xmlDoc.LoadFile())
-        {
-		TiXmlHandle doc(&xmlDoc); // get handle to XML file
-                TiXmlElement *devClass = doc.FirstChild("deviceclass").Element();
-		DeviceClass parse(devClass);
-
-		std::cout << "*************************" << std::endl;
-		std::cout << "DeviceClass: " << std::endl;
-		std::cout << "Classes: " << std::endl;
-
-			int size = parse.getDeviceClass().size();
-			for (int i = 0; i < size; i++)
-			{
-				std::cout << parse.getDeviceClass()[i] << ", ";
-			}
-
-		std::cout << std::endl;
-		std::cout << "*************************" << std::endl;
-	}
-	else
-	{
-		std::cout << "you botched it, couldn't load " << root << std::endl;
-	}
-	std::cout << std::endl;
-}