Changeset 1170 for DCWoRMS/branches/coolemall/src/simulator

Timestamp:

08/02/13 09:09:28 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/simulator/workload/WorkloadLoader.java (modified) (4 diffs)

DCWoRMS/branches/coolemall/src/simulator/workload/WorkloadLoader.java

@@ -17 +17 @@
 import javax.xml.xpath.XPathExpressionException;
 
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.ValidationException;
-import org.qcg.broker.schemas.jobdesc.ParentType;
-import org.qcg.broker.schemas.jobdesc.ResourceConsumptionProfileType;
-import org.qcg.broker.schemas.jobdesc.Task;
-import org.qcg.broker.schemas.jobdesc.Workflow;
-import org.qcg.broker.schemas.jobdesc.types.TaskStatesName;
-
-import dcworms.schedframe.scheduling.utils.JobDescription;
-import dcworms.schedframe.scheduling.utils.TaskDescription;
-
 
 import simulator.utils.XsltTransformations;
@@ -37 +27 @@
 import simulator.workload.reader.archive.QcgWAJobReader;
 import simulator.workload.reader.archive.WAFields;
+import simulator.workload.reader.archive.WAParser;
 import simulator.workload.reader.archive.WAReader;
-import simulator.workload.reader.archive.WAParser;
 import simulator.workload.reader.archive.gwf.GWFFields;
 import simulator.workload.reader.archive.swf.SWFFields;
 import simulator.workload.reader.xmlJob.XMLJobReader;
+import dcworms.schedframe.scheduling.utils.JobDescription;
+import dcworms.schedframe.scheduling.utils.TaskDescription;
 
 /**
@@ -221 +213 @@
                         
                         while((jobDesc = this.waReader.readRaw()) != null){
-                                /*QcgWAJobReader qcgReader = (QcgWAJobReader)waReader;
+                                QcgWAJobReader qcgReader = (QcgWAJobReader)waReader;
                                 if(!applicationProfilesMap.isEmpty())
-                                        jobDesc = qcgReader.mergeSwfAndXmlProfile(applicationProfilesMap, jobDesc);*/
+                                        jobDesc = qcgReader.mergeSwfAndXmlProfile(applicationProfilesMap, jobDesc);
                                 job = createJobDescription(jobDesc, puSpeed);
-                                if(job!= null && !applicationProfilesMap.isEmpty()){
+                                /*if(job!= null && !applicationProfilesMap.isEmpty()){
                                         for(int i = 0; i < job.getDescription().getTaskCount(); i++){
                                                 try {
@@ -243 +235 @@
                                         }                                       
                                 }
-
+                                */
                                 if(job != null)
                                         this.jobsMap.put(job.getJobId(), job);