Word "centralized" was removed from package name.

diff --git a/examples/java/mutualExclusion/mutex_centralized_deployment.xml b/examples/java/mutualExclusion/mutex_centralized_deployment.xml
index 300dfa8..58b1c5e 100644 (file)
--- a/examples/java/mutualExclusion/mutex_centralized_deployment.xml
+++ b/examples/java/mutualExclusion/mutex_centralized_deployment.xml
@@ -1,14 +1,14 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-  <process host="Host 0" function="mutualExclusion.centralized.Coordinator">
+  <process host="Host 0" function="mutualExclusion.Coordinator">
       <argument value="2"/> <!-- Amount of CS to serve -->
   </process>
-  <process host="Host 1" function="mutualExclusion.centralized.Node">
+  <process host="Host 1" function="mutualExclusion.Node">
       <argument value="2"/> <!-- initial sleep time -->
       <argument value="5"/> <!-- CS time -->
   </process>
-  <process host="Host 2" function="mutualExclusion.centralized.Node">
+  <process host="Host 2" function="mutualExclusion.Node">
       <argument value="2"/> <!-- initial sleep time -->
       <argument value="5"/> <!-- CS time -->
   </process>

diff --git a/examples/java/mutualExclusion/mutualexclusion.tesh b/examples/java/mutualExclusion/mutualexclusion.tesh
index 944d916..202b00c 100644 (file)
--- a/examples/java/mutualExclusion/mutualexclusion.tesh
+++ b/examples/java/mutualExclusion/mutualexclusion.tesh
@@ -2,13 +2,13 @@
 
 ! output sort
 
-$ java -cp ${classpath:=.} mutualExclusion/centralized/MutexCentral ${srcdir:=.}/mutualExclusion/ring3.xml ${srcdir:=.}/mutualExclusion/mutex_centralized_deployment.xml
+$ java -cp ${classpath:=.} mutualExclusion/MutexCentral ${srcdir:=.}/mutualExclusion/ring3.xml ${srcdir:=.}/mutualExclusion/mutex_centralized_deployment.xml
 > [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
 > [0.007806] [jmsg/INFO] MSG_main finished; Cleaning up the simulation...
-> [Host 0:mutualExclusion.centralized.Coordinator:(1) 0.001301] [jmsg/INFO] Got a request from mutualExclusion.centralized.Node. Queue empty: grant it
-> [Host 0:mutualExclusion.centralized.Coordinator:(1) 0.003903] [jmsg/INFO] Got a request from mutualExclusion.centralized.Node. Queue empty: grant it
-> [Host 0:mutualExclusion.centralized.Coordinator:(1) 0.007806] [jmsg/INFO] we should shutdown the simulation now
-> [Host 1:mutualExclusion.centralized.Node:(2) 0.000000] [jmsg/INFO] Send a request to the coordinator
-> [Host 1:mutualExclusion.centralized.Node:(2) 0.001301] [jmsg/INFO] Wait for a grant from the coordinator
-> [Host 2:mutualExclusion.centralized.Node:(3) 0.000000] [jmsg/INFO] Send a request to the coordinator
-> [Host 2:mutualExclusion.centralized.Node:(3) 0.003903] [jmsg/INFO] Wait for a grant from the coordinator
+> [Host 0:mutualExclusion.Coordinator:(1) 0.001301] [jmsg/INFO] Got a request from mutualExclusion.Node. Queue empty: grant it
+> [Host 0:mutualExclusion.Coordinator:(1) 0.003903] [jmsg/INFO] Got a request from mutualExclusion.Node. Queue empty: grant it
+> [Host 0:mutualExclusion.Coordinator:(1) 0.007806] [jmsg/INFO] we should shutdown the simulation now
+> [Host 1:mutualExclusion.Node:(2) 0.000000] [jmsg/INFO] Send a request to the coordinator
+> [Host 1:mutualExclusion.Node:(2) 0.001301] [jmsg/INFO] Wait for a grant from the coordinator
+> [Host 2:mutualExclusion.Node:(3) 0.000000] [jmsg/INFO] Send a request to the coordinator
+> [Host 2:mutualExclusion.Node:(3) 0.003903] [jmsg/INFO] Wait for a grant from the coordinator