Index: DCWoRMS/branches/coolemall/example/experiment5/resources5.xml
===================================================================
--- DCWoRMS/branches/coolemall/example/experiment5/resources5.xml	(revision 775)
+++ DCWoRMS/branches/coolemall/example/experiment5/resources5.xml	(revision 1223)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <environment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:noNamespaceSchemaLocation="../../simulator/schemas/resources/DCWormsResSchema.xsd">
+	xsi:noNamespaceSchemaLocation="../../simulator/schemas/resources/DCwormsResSchemaNew.xsd">
 	
 	<!-- Data Center description with energy parameters -->
@@ -7,5 +7,5 @@
 		<computingResource class="DataCenter" name="compRes">
 			<!-- Data Center contains of 4 computing nodes belonging to two different classes (with different power consumption level)-->
-			<computingResource class="ComputingNode" count="2">
+			<computingResource class="Node" count="2">
 				<!-- Defines the computing node category - information can be used by user to facilitate the resource management process within various plugins -->
 				<parameter name="category">
@@ -17,5 +17,5 @@
 						<!-- Reference to energy usage estimation plugin -->
 						<energyEstimationPlugin>
-							<name>example.energy.ComputingNodeWithFanEnergyEstimationPlugin</name>
+							<name>example.energy.NodeEnergyEstimationPlugin</name>
 						</energyEstimationPlugin>	
 						<!-- Definition of supported power states and corresponding power consumption -->	
@@ -32,29 +32,38 @@
 						</powerStates>				
 					</powerProfile>
-					<airThroughputProfile>
-						<airThroughputStates>
-							<airThroughputState>
-								<name>FAN_ON_TURBO</name>
-								<value>1500</value>
-								<powerUsage>150</powerUsage>
-							</airThroughputState>
-							<airThroughputState>
-								<name>FAN_ON</name>
-								<value>1000</value>
-								<powerUsage>30</powerUsage>
-							</airThroughputState>
-							<airThroughputState>
-								<name>FAN_OFF</name>
-								<value>0</value>
-								<powerUsage>10</powerUsage>
-							</airThroughputState>
-						</airThroughputStates>
-					</airThroughputProfile>
 				</profile>
+				<device class="Fan">
+					<profile>
+						<powerProfile>
+							<energyEstimationPlugin>
+								<name>example.energy.device.FanEnergyEstimationPlugin</name>
+							</energyEstimationPlugin>
+						</powerProfile>
+						<airThroughputProfile>
+							<airThroughputStates>
+								<airThroughputState>
+									<name>FAN_ON_TURBO</name>
+									<value>1500</value>
+									<powerUsage>150</powerUsage>
+								</airThroughputState>
+								<airThroughputState>
+									<name>ON</name>
+									<value>1000</value>
+									<powerUsage>30</powerUsage>
+								</airThroughputState>
+								<airThroughputState>
+									<name>OFF</name>
+									<value>0</value>
+									<powerUsage>10</powerUsage>
+								</airThroughputState>
+							</airThroughputStates>
+						</airThroughputProfile>
+					</profile>
+				</device>
 				<!-- Each of 2 computing nodes contains 4 processors-->
 				<computingResource class="Processor" count="4">
 				</computingResource>
 			</computingResource>	
-			<computingResource class="ComputingNode" count="2">
+			<computingResource class="Node" count="2">
 				<!-- Defines the computing node category - information can be used by user to facilitate the resource management process within various plugins -->
 				<parameter name="category">
@@ -66,5 +75,5 @@
 						<!-- Reference to energy usage estimation plugin -->
 						<energyEstimationPlugin>
-							<name>example.energy.ComputingNodeWithFanEnergyEstimationPlugin</name>
+							<name>example.energy.NodeEnergyEstimationPlugin</name>
 						</energyEstimationPlugin>
 						<!-- Definition of supported power states and corresponding power consumption -->	
@@ -81,24 +90,33 @@
 						</powerStates>				
 					</powerProfile>
-					<airThroughputProfile>
-						<airThroughputStates>
-							<airThroughputState>
-								<name>FAN_ON_TURBO</name>
-								<value>1500</value>
-								<powerUsage>150</powerUsage>
-							</airThroughputState>
-							<airThroughputState>
-								<name>FAN_ON</name>
-								<value>1000</value>
-								<powerUsage>30</powerUsage>
-							</airThroughputState>
-							<airThroughputState>
-								<name>FAN_OFF</name>
-								<value>0</value>
-								<powerUsage>10</powerUsage>
-							</airThroughputState>
-						</airThroughputStates>
-					</airThroughputProfile>
 				</profile>
+				<device class="Fan">
+					<profile>
+						<powerProfile>
+							<energyEstimationPlugin>
+								<name>example.energy.device.FanEnergyEstimationPlugin</name>
+							</energyEstimationPlugin>
+						</powerProfile>
+						<airThroughputProfile>
+							<airThroughputStates>
+								<airThroughputState>
+									<name>ON_TURBO</name>
+									<value>1500</value>
+									<powerUsage>150</powerUsage>
+								</airThroughputState>
+								<airThroughputState>
+									<name>ON</name>
+									<value>1000</value>
+									<powerUsage>30</powerUsage>
+								</airThroughputState>
+								<airThroughputState>
+									<name>OFF</name>
+									<value>0</value>
+									<powerUsage>10</powerUsage>
+								</airThroughputState>
+							</airThroughputStates>
+						</airThroughputProfile>
+					</profile>
+				</device>
 				<!-- Each of 2 computing nodes contains 4 processors-->
 				<computingResource class="Processor" count="4">
Index: DCWoRMS/branches/coolemall/example/experiment5/experiment5.properties
===================================================================
--- DCWoRMS/branches/coolemall/example/experiment5/experiment5.properties	(revision 757)
+++ DCWoRMS/branches/coolemall/example/experiment5/experiment5.properties	(revision 1223)
@@ -9,5 +9,5 @@
 
 # Choose directory where all result files should be placed.
-stats.outputfolder=../experiment5_result
+stats.outputfolder=example/experiment5_result
 
 # Define the type and content of charts to generate
