Ops, forgot this in the java cleanup commit

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5061 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/Makefile.am b/src/Makefile.am
index b176deb..699161f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -218,7 +218,6 @@ JMSG_C_SRC = \
   java/jmsg.c               java/jmsg.h                \
   java/jmsg_channel.c       java/jmsg_channel.h        \
   java/jmsg_host.c          java/jmsg_host.h           \
   java/jmsg.c               java/jmsg.h                \
   java/jmsg_channel.c       java/jmsg_channel.h        \
   java/jmsg_host.c          java/jmsg_host.h           \

-  java/jmsg_parallel_task.c java/jmsg_parallel_task.h  \

   java/jmsg_process.c       java/jmsg_process.h        \
   java/jmsg_task.c          java/jmsg_task.h
 
   java/jmsg_process.c       java/jmsg_process.h        \
   java/jmsg_task.c          java/jmsg_task.h
 


@@ -229,14 +228,14 @@ JMSG_JAVA_SRC = \
   java/simgrid/msg/HostNotFoundException.java        \
   java/simgrid/msg/ProcessNotFoundException.java     \
   \
   java/simgrid/msg/HostNotFoundException.java        \
   java/simgrid/msg/ProcessNotFoundException.java     \
   \

+  java/simgrid/msg/Msg.java                          \

   java/simgrid/msg/Process.java                      \
   java/simgrid/msg/Process.java                      \

-  java/simgrid/msg/DTDResolver.java                  \
-  java/simgrid/msg/ApplicationHandler.java           \
-  java/simgrid/msg/Channel.java                      \

   java/simgrid/msg/Host.java                         \
   java/simgrid/msg/Host.java                         \

-  java/simgrid/msg/Msg.java                          \

   java/simgrid/msg/Task.java                         \
   java/simgrid/msg/Task.java                         \

-  java/simgrid/msg/ParallelTask.java                 \
+  \
+  java/simgrid/msg/MsgNative.java                    \
+  java/simgrid/msg/DTDResolver.java                  \
+  java/simgrid/msg/ApplicationHandler.java           \

   \
   java/simgrid/msg/Sem.java
 
   \
   java/simgrid/msg/Sem.java
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 5e8652b..6295b0a 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -163,8 +163,7 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \
        amok/PeerManagement/peermanagement.c xbt/xbt_jcontext.c \
        java/jxbt_utilities.c java/jxbt_utilities.h java/jmsg.c \
        java/jmsg.h java/jmsg_channel.c java/jmsg_channel.h \
        amok/PeerManagement/peermanagement.c xbt/xbt_jcontext.c \
        java/jxbt_utilities.c java/jxbt_utilities.h java/jmsg.c \
        java/jmsg.h java/jmsg_channel.c java/jmsg_channel.h \

-       java/jmsg_host.c java/jmsg_host.h java/jmsg_parallel_task.c \
-       java/jmsg_parallel_task.h java/jmsg_process.c \
+       java/jmsg_host.c java/jmsg_host.h java/jmsg_process.c \

        java/jmsg_process.h java/jmsg_task.c java/jmsg_task.h
 @CONTEXT_THREADS_TRUE@am__objects_6 = xbt_os_thread.lo \
 @CONTEXT_THREADS_TRUE@ xbt_thread_context.lo
        java/jmsg_process.h java/jmsg_task.c java/jmsg_task.h
 @CONTEXT_THREADS_TRUE@am__objects_6 = xbt_os_thread.lo \
 @CONTEXT_THREADS_TRUE@ xbt_thread_context.lo


@@ -188,8 +187,7 @@ am__objects_16 = xbt_sg_synchro.lo xbt_sg_time.lo
 am__objects_17 = sg_transport.lo transport_plugin_sg.lo sg_emul.lo \
        sg_process.lo sg_dns.lo sg_msg.lo $(am__objects_16)
 am__objects_18 = xbt_jcontext.lo jxbt_utilities.lo jmsg.lo \
 am__objects_17 = sg_transport.lo transport_plugin_sg.lo sg_emul.lo \
        sg_process.lo sg_dns.lo sg_msg.lo $(am__objects_16)
 am__objects_18 = xbt_jcontext.lo jxbt_utilities.lo jmsg.lo \

-       jmsg_channel.lo jmsg_host.lo jmsg_parallel_task.lo \
-       jmsg_process.lo jmsg_task.lo
+       jmsg_channel.lo jmsg_host.lo jmsg_process.lo jmsg_task.lo

 @HAVE_JAVA_TRUE@am__objects_19 = $(am__objects_18)
 am_libsimgrid_la_OBJECTS = $(am__objects_1) $(am__objects_8) \
        $(am__objects_10) $(am__objects_11) $(am__objects_12) \
 @HAVE_JAVA_TRUE@am__objects_19 = $(am__objects_18)
 am_libsimgrid_la_OBJECTS = $(am__objects_1) $(am__objects_8) \
        $(am__objects_10) $(am__objects_11) $(am__objects_12) \


@@ -542,7 +540,6 @@ JMSG_C_SRC = \
   java/jmsg.c               java/jmsg.h                \
   java/jmsg_channel.c       java/jmsg_channel.h        \
   java/jmsg_host.c          java/jmsg_host.h           \
   java/jmsg.c               java/jmsg.h                \
   java/jmsg_channel.c       java/jmsg_channel.h        \
   java/jmsg_host.c          java/jmsg_host.h           \

-  java/jmsg_parallel_task.c java/jmsg_parallel_task.h  \

   java/jmsg_process.c       java/jmsg_process.h        \
   java/jmsg_task.c          java/jmsg_task.h
 
   java/jmsg_process.c       java/jmsg_process.h        \
   java/jmsg_task.c          java/jmsg_task.h
 


@@ -553,14 +550,14 @@ JMSG_JAVA_SRC = \
   java/simgrid/msg/HostNotFoundException.java        \
   java/simgrid/msg/ProcessNotFoundException.java     \
   \
   java/simgrid/msg/HostNotFoundException.java        \
   java/simgrid/msg/ProcessNotFoundException.java     \
   \

+  java/simgrid/msg/Msg.java                          \

   java/simgrid/msg/Process.java                      \
   java/simgrid/msg/Process.java                      \

-  java/simgrid/msg/DTDResolver.java                  \
-  java/simgrid/msg/ApplicationHandler.java           \
-  java/simgrid/msg/Channel.java                      \

   java/simgrid/msg/Host.java                         \
   java/simgrid/msg/Host.java                         \

-  java/simgrid/msg/Msg.java                          \

   java/simgrid/msg/Task.java                         \
   java/simgrid/msg/Task.java                         \

-  java/simgrid/msg/ParallelTask.java                 \
+  \
+  java/simgrid/msg/MsgNative.java                    \
+  java/simgrid/msg/DTDResolver.java                  \
+  java/simgrid/msg/ApplicationHandler.java           \

   \
   java/simgrid/msg/Sem.java
 
   \
   java/simgrid/msg/Sem.java
 


@@ -814,7 +811,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_channel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_host.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_channel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_host.Plo@am__quote@

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_parallel_task.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_process.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_task.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jxbt_utilities.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_process.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_task.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jxbt_utilities.Plo@am__quote@


@@ -1708,13 +1704,6 @@ jmsg_host.lo: java/jmsg_host.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jmsg_host.lo `test -f 'java/jmsg_host.c' || echo '$(srcdir)/'`java/jmsg_host.c
 
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jmsg_host.lo `test -f 'java/jmsg_host.c' || echo '$(srcdir)/'`java/jmsg_host.c
 

-jmsg_parallel_task.lo: java/jmsg_parallel_task.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_parallel_task.lo -MD -MP -MF $(DEPDIR)/jmsg_parallel_task.Tpo -c -o jmsg_parallel_task.lo `test -f 'java/jmsg_parallel_task.c' || echo '$(srcdir)/'`java/jmsg_parallel_task.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/jmsg_parallel_task.Tpo $(DEPDIR)/jmsg_parallel_task.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='java/jmsg_parallel_task.c' object='jmsg_parallel_task.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jmsg_parallel_task.lo `test -f 'java/jmsg_parallel_task.c' || echo '$(srcdir)/'`java/jmsg_parallel_task.c
-

 jmsg_process.lo: java/jmsg_process.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_process.lo -MD -MP -MF $(DEPDIR)/jmsg_process.Tpo -c -o jmsg_process.lo `test -f 'java/jmsg_process.c' || echo '$(srcdir)/'`java/jmsg_process.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/jmsg_process.Tpo $(DEPDIR)/jmsg_process.Plo
 jmsg_process.lo: java/jmsg_process.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_process.lo -MD -MP -MF $(DEPDIR)/jmsg_process.Tpo -c -o jmsg_process.lo `test -f 'java/jmsg_process.c' || echo '$(srcdir)/'`java/jmsg_process.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/jmsg_process.Tpo $(DEPDIR)/jmsg_process.Plo