java does not like uppercased packages

diff --git a/.gitignore b/.gitignore
index 11801ee..a8850ff 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -975,7 +975,7 @@ examples/java/app/masterworker/java_app_masterworker_compiled
 examples/java/app/pingpong/java_app_pingpong_compiled
 examples/java/app/tokenring/java_app_tokenring_compiled
 examples/java/async/dsend/java_async_dsend_compiled
-examples/java/async/waitAll/java_async_waitAll_compiled
+examples/java/async/waitall/java_async_waitall_compiled
 examples/java/dht/chord/java_dht_chord_compiled
 examples/java/dht/kademlia/java_dht_kademlia_compiled
 examples/java/cloud/masterworker/java_cloud_masterworker_compiled

diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt
index e6b6d5a..f16c2b7 100644 (file)
--- a/examples/java/CMakeLists.txt
+++ b/examples/java/CMakeLists.txt
@@ -17,8 +17,8 @@ set(app_pingpong_sources       ${srcdir}/Main.java  ${srcdir}/PingPongTask.java
 set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/app/tokenring)
 set(app_tokenring_sources      ${srcdir}/Main.java ${srcdir}/RelayRunner.java)
 
-set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/async/waitAll)
-set(async_waitAll_sources      ${srcdir}/Main.java  ${srcdir}/Receiver.java ${srcdir}/Sender.java)
+set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/async/waitall)
+set(async_waitall_sources      ${srcdir}/Main.java  ${srcdir}/Receiver.java ${srcdir}/Sender.java)
 
 set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/async/dsend)
 set(async_dsend_sources        ${srcdir}/Main.java  ${srcdir}/Receiver.java ${srcdir}/Sender.java)
@@ -73,7 +73,7 @@ set(process_suspend_sources    ${srcdir}/Main.java  ${srcdir}/DreamMaster.java
 set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}/task/priority)
 set(task_priority_sources      ${srcdir}/Main.java  ${srcdir}/Test.java)
 
-foreach (example app_bittorrent app_centralizedmutex app_masterworker app_pingpong app_tokenring async_waitAll async_dsend
+foreach (example app_bittorrent app_centralizedmutex app_masterworker app_pingpong app_tokenring async_waitall async_dsend
          cloud_migration cloud_masterworker dht_chord dht_kademlia energy_consumption energy_vm io_file io_storage 
          process_kill process_migration process_startkilltime process_suspend task_priority trace_pingpong)
   string (REPLACE "_" "/" example_dir ${example})
@@ -107,7 +107,7 @@ set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/app/bittorrent/bi
                                    ${CMAKE_CURRENT_SOURCE_DIR}/task/priority/priority.xml                  PARENT_SCOPE)
 
 if(enable_java)
-  foreach (example app_bittorrent app_centralizedmutex app_masterworker app_pingpong app_tokenring async_waitAll async_dsend
+  foreach (example app_bittorrent app_centralizedmutex app_masterworker app_pingpong app_tokenring async_waitall async_dsend
            cloud_migration cloud_masterworker dht_chord dht_kademlia energy_consumption energy_vm io_file io_storage 
            process_kill process_migration process_startkilltime process_suspend task_priority trace_pingpong)
     string (REPLACE "_" "/" example_dir ${example})

diff --git a/examples/java/async/waitAll/Main.java b/examples/java/async/waitall/Main.java
similarity index 98%
rename from examples/java/async/waitAll/Main.java
rename to examples/java/async/waitall/Main.java
index 97ee446..8d4d6bd 100644 (file)
--- a/examples/java/async/waitAll/Main.java
+++ b/examples/java/async/waitall/Main.java
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-package async.waitAll;
+package async.waitall;
 
 /** This example demonstrates the use of the asynchrounous communications
  * 

diff --git a/examples/java/async/waitAll/Receiver.java b/examples/java/async/waitall/Receiver.java
similarity index 98%
rename from examples/java/async/waitAll/Receiver.java
rename to examples/java/async/waitall/Receiver.java
index 84444fa..7296bfb 100644 (file)
--- a/examples/java/async/waitAll/Receiver.java
+++ b/examples/java/async/waitall/Receiver.java
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-package async.waitAll;
+package async.waitall;
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.Comm;
 import org.simgrid.msg.Host;

diff --git a/examples/java/async/waitAll/Sender.java b/examples/java/async/waitall/Sender.java
similarity index 98%
rename from examples/java/async/waitAll/Sender.java
rename to examples/java/async/waitall/Sender.java
index eea0a76..c09e0f2 100644 (file)
--- a/examples/java/async/waitAll/Sender.java
+++ b/examples/java/async/waitall/Sender.java
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-package async.waitAll;
+package async.waitall;
 
 import org.simgrid.msg.Comm;
 import org.simgrid.msg.Host;

diff --git a/examples/java/async/waitAll/async_waitAll.tesh b/examples/java/async/waitall/async_waitall.tesh
similarity index 96%
rename from examples/java/async/waitAll/async_waitAll.tesh
rename to examples/java/async/waitall/async_waitall.tesh
index 666cccf..88cd0a8 100644 (file)
--- a/examples/java/async/waitAll/async_waitAll.tesh
+++ b/examples/java/async/waitall/async_waitall.tesh
@@ -1,6 +1,6 @@
 #! tesh
 
-$ java -classpath ${classpath:=.} async/waitAll/Main ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ java -classpath ${classpath:=.} async/waitall/Main ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Using regular java threads.
 > [  0.000000] (1:Sender@Jacquelin) I have 6 receivers to contact
 > [  0.000000] (1:Sender@Jacquelin) Start the Sending 'Task_1' to 'Fafard'