Skip to content

Commit

Permalink
merged the two projects
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristophMueller committed Aug 2, 2012
1 parent 6b61c97 commit ca90f5a
Show file tree
Hide file tree
Showing 41 changed files with 41 additions and 1,317 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/CloudProfilingMonitor/dist/
Cloud-Multiple-Tiers-Simulation/
/Cloud-Profiling-Simulation/nbproject/private/
/Cloud-Profiling-Simulation/build/
26 changes: 12 additions & 14 deletions CloudProfilingMonitor/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,17 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/CloudProfilingSimulation"/>
<classpathentry kind="lib" path="/home/jannik/Cloud-Multiple-Tiers-Simulation/dependencies/cloudsim-3.0.jar" sourcepath="/home/jannik/Cloud-Multiple-Tiers-Simulation/dependencies/cloudsim-3.0-sources.jar"/>
<classpathentry kind="lib" path="/home/jannik/Cloud-Multiple-Tiers-Simulation/dependencies/cloudsim-3.0-sources.jar"/>
<classpathentry kind="lib" path="/home/jannik/Cloud-Multiple-Tiers-Simulation/dependencies/cloudsim-examples-3.0.jar"/>
<classpathentry kind="lib" path="/home/jannik/Cloud-Multiple-Tiers-Simulation/dependencies/cloudsim-examples-3.0-sources.jar"/>
<classpathentry kind="lib" path="/home/jannik/Cloud-Multiple-Tiers-Simulation/dependencies/Jama-1.0.2.jar"/>
<classpathentry kind="lib" path="/home/jannik/Cloud-Multiple-Tiers-Simulation/dependencies/jfreechart.jar"/>
<classpathentry kind="lib" path="/home/jannik/Cloud-Multiple-Tiers-Simulation/dependencies/junit-4.10.jar"/>
<classpathentry kind="lib" path="/home/jannik/Cloud-Multiple-Tiers-Simulation/dependencies/junit-4.10-src.jar"/>
<classpathentry kind="lib" path="/home/jannik/Cloud-Multiple-Tiers-Simulation/dependencies/junit-dep-4.10.jar"/>
<classpathentry kind="lib" path="/home/jannik/Cloud-Multiple-Tiers-Simulation/dependencies/mockito-all-1.9.0.jar"/>
<classpathentry kind="lib" path="/home/jannik/Cloud-Multiple-Tiers-Simulation/dependencies/jchart2d-3.2.2/jchart2d-3.2.2.jar"/>
<classpathentry kind="lib" path="/home/jannik/Cloud-Multiple-Tiers-Simulation/dependencies/jchart2d-3.2.2/jide-oss-2.9.7.jar"/>
<classpathentry kind="lib" path="/home/jannik/Cloud-Multiple-Tiers-Simulation/dependencies/jchart2d-3.2.2/xmlgraphics-commons-1.3.1.jar"/>
<classpathentry kind="lib" path="/home/christoph/workspace/Cloud-Multiple-Tiers-Simulation/dependencies/cloudsim-3.0.jar"/>
<classpathentry kind="lib" path="/home/christoph/workspace/Cloud-Multiple-Tiers-Simulation/dependencies/cloudsim-3.0-sources.jar"/>
<classpathentry kind="lib" path="/home/christoph/workspace/Cloud-Multiple-Tiers-Simulation/dependencies/cloudsim-examples-3.0.jar"/>
<classpathentry kind="lib" path="/home/christoph/workspace/Cloud-Multiple-Tiers-Simulation/dependencies/cloudsim-examples-3.0-sources.jar"/>
<classpathentry kind="lib" path="/home/christoph/workspace/Cloud-Multiple-Tiers-Simulation/dependencies/Jama-1.0.2.jar"/>
<classpathentry kind="lib" path="/home/christoph/workspace/Cloud-Multiple-Tiers-Simulation/dependencies/jfreechart.jar"/>
<classpathentry kind="lib" path="/home/christoph/workspace/Cloud-Multiple-Tiers-Simulation/dependencies/jfreechart-0.5.6.zip"/>
<classpathentry kind="lib" path="/home/christoph/workspace/Cloud-Multiple-Tiers-Simulation/dependencies/junit-4.10.jar"/>
<classpathentry kind="lib" path="/home/christoph/workspace/Cloud-Multiple-Tiers-Simulation/dependencies/junit-4.10-src.jar"/>
<classpathentry kind="lib" path="/home/christoph/workspace/Cloud-Multiple-Tiers-Simulation/dependencies/junit-dep-4.10.jar"/>
<classpathentry kind="lib" path="/home/christoph/workspace/Cloud-Multiple-Tiers-Simulation/dependencies/mockito-all-1.9.0.jar"/>
<classpathentry kind="lib" path="/home/christoph/workspace/Cloud-Multiple-Tiers-Simulation/dependencies/jchart2d-3.2.2/jchart2d-3.2.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
74 changes: 0 additions & 74 deletions CloudProfilingMonitor/build.xml

This file was deleted.

Loading

0 comments on commit ca90f5a

Please sign in to comment.