JORTE: remove unused code

Since the domain is started (receiving and sending threads) either by
calling ORTEDomainAppCreate() or ORTEDomainMgrCreate(), there is no need
to have DomainStart() on the Java side.

diff --git a/orte/include/jorte/org_ocera_orte_Domain.h b/orte/include/jorte/org_ocera_orte_Domain.h
deleted file mode 100644 (file)
index 1ea97d4..0000000
--- a/orte/include/jorte/org_ocera_orte_Domain.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_ocera_orte_Domain */
-
-#ifndef _Included_org_ocera_orte_Domain
-#define _Included_org_ocera_orte_Domain
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     org_ocera_orte_Domain
- * Method:    jORTEDomainStart
- * Signature: (JZZZ)V
- */
-JNIEXPORT void JNICALL Java_org_ocera_orte_Domain_jORTEDomainStart
-  (JNIEnv *, jclass, jlong, jboolean, jboolean, jboolean);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

diff --git a/orte/java/src/org/ocera/orte/Domain.java b/orte/java/src/org/ocera/orte/Domain.java
index a8b07cb7c97d7f721f8097ab60c3a7ddc81b9bb7..19d65693d0e6b8611d45e677168b32599df245e7 100644 (file)
--- a/orte/java/src/org/ocera/orte/Domain.java
+++ b/orte/java/src/org/ocera/orte/Domain.java
@@ -64,25 +64,4 @@ public class Domain {
     {
        return false;
     }
-   
-   
-  /* ****************************************************************** *
-   *                                                                    *
-   *                         native methods                             *
-   *                                                                    *
-   * ****************************************************************** */
-
-  /**
-   * jORTEDomainStart -
-   *
-   * @param dhandle handler to domain
-   * @param
-   * @param
-   * @return
-   */
-   private static native
-   void jORTEDomainStart(long dhandle,
-                         boolean recvMetatrafficThread,
-                         boolean recvUserDataThread,
-                            boolean sendThread);
 }

diff --git a/orte/libjorte/JORTEDomainStart.c b/orte/libjorte/JORTEDomainStart.c
deleted file mode 100644 (file)
index e9a1527..0000000
--- a/orte/libjorte/JORTEDomainStart.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* JORTEDomainStart.c */
-
-
-/**
-  * This code provides conversion between JAVA a C environments.
-  * The C functions are calling here and results are send to JAVA
-  * native functions. It uses the header pregenerated by JAVA
-  * (by command 'javah -jni class_with_native_function')
-  *
-  * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author CTU FEE Prague - Department of Control Engineering (dce.felk.cvut.cz)
-  * @author Project ORTE - OCERA Real Time Ethernet (www.ocera.org)
-  * @author dedication to Kj
-  * @version 0.1
-  *
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation; either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  * GNU General Public License for more details.
-  *
-  */
-
-
-// origin orte headers
-#include "orte.h"
-// pregenerated header
-#include "jorte/org_ocera_orte_Domain.h"
-#include "jorte/4all.h"
-
-// ve fci chybi 2 Multicast argumenty - maji se dodat???
-JNIEXPORT void JNICALL
-Java_org_ocera_orte_Domain_jORTEDomainStart
-(JNIEnv *env, jclass cls, jlong dom_handle,
- jboolean recvUnicastMetatrafficThread,
- jboolean recvUnicastUserDataThread,
- jboolean sendThread)
-{
-  // vyresit problemy s booleanem
-  ORTEDomainStart((ORTEDomain *) dom_handle,
-                  (Boolean) recvUnicastMetatrafficThread,
-                  ORTE_FALSE, // Multicast !
-                  (Boolean) recvUnicastUserDataThread,
-                  ORTE_FALSE, // Multicast !
-                  (Boolean) sendThread);
-  #ifdef TEST_STAGE
-    printf(":c: starting domain thread [ORTEDomainStart()].. \n");
-  #endif
-}
-

diff --git a/orte/libjorte/Makefile.am b/orte/libjorte/Makefile.am
index c3f2eeda485b099dd378002a7f89f8c8c3453097..cbb9c30fa6117929b6d24ee42db480d51d5b6257 100644 (file)
--- a/orte/libjorte/Makefile.am
+++ b/orte/libjorte/Makefile.am
@@ -19,7 +19,6 @@ JORTEDomainMgrDestroy.c \
 JORTEDomainPropDefaultGet.c \
 JORTEDomainPropSet.c \
 JORTEDomainPropDestroy.c \
-JORTEDomainStart.c \
 JORTEInit.c \
 JORTEPublicationCreate.c \
 JORTEPublicationDestroy.c \

diff --git a/orte/libjorte/Makefile.omk b/orte/libjorte/Makefile.omk
index 0ac0328e260931db21145c4a69e884b98fbfe804..b6517ffdeee221b224190cb1661b9b6961b47b52 100644 (file)
--- a/orte/libjorte/Makefile.omk
+++ b/orte/libjorte/Makefile.omk
@@ -35,7 +35,6 @@ JORTEDomainMgrDestroy.c \
 JORTEDomainPropDefaultGet.c \
 JORTEDomainPropSet.c \
 JORTEDomainPropDestroy.c \
-JORTEDomainStart.c \
 JORTEInit.c \
 JORTEPublicationCreate.c \
 JORTEPublicationDestroy.c \