Revert "JORTE: update license headers and clean-up includes"

This reverts commit 51bf20f848625b4b9ec02dc016537945efc21a02.

diff --git a/orte/include/jorte/4all.h b/orte/include/jorte/4all.h
index d9bc2f0b707c957e12b1c37f48d12349d243d7d5..e6360536bca008113e6f13b23e2948a495d62131 100644 (file)
--- a/orte/include/jorte/4all.h
+++ b/orte/include/jorte/4all.h
@@ -1,31 +1,4 @@
 /* 4all.h */
-
-/**
-  * 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 Martin Vajnar (martin.vajnar@gmail.com)
-  * @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.
-  *
-  */
-
 /*
 typedef struct
 {
@@ -41,8 +14,6 @@ typedef struct
 
 //#define TEST_STAGE
 
-#include <jni.h>
-
 #ifdef __ANDROID__
 
 #include <android/log.h>

diff --git a/orte/include/jorte/jorte.h b/orte/include/jorte/jorte.h
index 8112fffa01736b7514bd2629fd5b975be559cba4..9c7a5e339a253ff05c2060b0aba8f897effca471 100644 (file)
--- a/orte/include/jorte/jorte.h
+++ b/orte/include/jorte/jorte.h
@@ -20,34 +20,34 @@
   *
   */
 
+/*
 #ifndef _JORTE_H
 #define _JORTE_H
+*/
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "orte_all.h"
+#include "orte.h"
 
 // switch program behaviour (test stage,....)
 #include "4all.h"
 
-// new type definitions
-#include "jorte_typedefs_defines.h"
+// NtpTime
+#include "getNtpTime.h"
 
-// JORTE API
-#include "jorte_protos_api.h"
+// new type definitions
+#include "typedefs_defines_jorte.h"
 
 // auto-generated headers by JNI
 #include "org_ocera_orte_tools_Conversions.h"
 #include "org_ocera_orte_Domain.h"
-#include "org_ocera_orte_DomainApp.h"
-#include "org_ocera_orte_DomainMgr.h"
-#include "org_ocera_orte_types_DomainEvents.h"
-#include "org_ocera_orte_types_DomainProp.h"
-#include "org_ocera_orte_types_NtpTime.h"
+#include "org_ocera_orte_DomainEvents.h"
+#include "org_ocera_orte_DomainProp.h"
 #include "org_ocera_orte_tools_GetORTEConstant.h"
 #include "org_ocera_orte_JOrte.h"
+#include "org_ocera_orte_Manager.h"
 #include "org_ocera_orte_Publication.h"
 #include "org_ocera_orte_Subscription.h"
 
@@ -55,4 +55,6 @@ extern "C" {
 } /* extern "C"*/
 #endif
 
-#endif // _JORTE_H
\ No newline at end of file
+/*
+#endif // _JORTE_H
+*/

diff --git a/orte/include/jorte/jorte_protos_api.h b/orte/include/jorte/jorte_protos_api.h
index b659866ae6fcfc890a914f27f5f77c380843c5e8..bcd07d3c28e57589901594df9a91ae9bc5aa8cde 100644 (file)
--- a/orte/include/jorte/jorte_protos_api.h
+++ b/orte/include/jorte/jorte_protos_api.h
@@ -1,39 +1,6 @@
 /* jorte_typedefs_api.h */
 
-/**
-  * 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 Martin Vajnar (martin.vajnar@gmail.com)
-  * @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.
-  *
-  */
-
-#ifndef _JORTE_PROTOS_API_H
-#define _JORTE_PROTOS_API_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-  
-#include <jni.h>
+#include  <jni.h>
 #include "orte.h"
 
 extern int
@@ -92,9 +59,3 @@ onRegFail(void *param);
 
 extern jclass
 findClass(JNIEnv *env, const char* name);
-
-#ifdef __cplusplus
-} /* extern "C"*/
-#endif
-
-#endif // _JORTE_PROTOS_API_H
\ No newline at end of file

diff --git a/orte/include/jorte/jorte_typedefs_defines.h b/orte/include/jorte/jorte_typedefs_defines.h
index 6281377b66df3e1ddbb61ee3884870aa7c7253d0..cb0f50d3ffbd031e46eede36b6bc7ccbe4077e34 100644 (file)
--- a/orte/include/jorte/jorte_typedefs_defines.h
+++ b/orte/include/jorte/jorte_typedefs_defines.h
@@ -1,13 +1,7 @@
 /* typedefs_defines_jorte.h */
 
 /**
-  * 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 Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +20,6 @@
   *
   */
 
-#include <jni.h>
 
 typedef struct
 {

diff --git a/orte/include/orte.h b/orte/include/orte.h
index d17d1fce91d5f406529e07e184eba1ede7ea249a..948da9ba6fdd2d79c0b58129830c563fdc4deb51 100644 (file)
--- a/orte/include/orte.h
+++ b/orte/include/orte.h
@@ -36,8 +36,6 @@ extern "C" {
 
 #ifdef _MSC_VER
   #include <orte/ew_types.h>
-#elif defined(__ANDROID__) && !defined(OMK_FOR_USER) && !defined(OMK_FOR_KERNEL)
-  #include "orte/orte_config_android.h"
 #else
   #include <orte/orte_config.h>
 #endif

diff --git a/orte/include/orte_headers.h b/orte/include/orte_headers.h
index a22f5d71f52f0551fbf664b1ae4df655fbdf72e5..c64577b228e11f5f7c7808ef63b9e5319007d9ac 100644 (file)
--- a/orte/include/orte_headers.h
+++ b/orte/include/orte_headers.h
@@ -40,8 +40,6 @@ extern "C" {
 
 #if defined _MSC_VER
   #include "orte/ew_types.h"
-#elif defined(__ANDROID__)
-  #include "orte/orte_config_android.h"
 #elif defined(HAVE_CONFIG_H) || defined(OMK_FOR_USER)  || defined(OMK_FOR_KERNEL)
   #include "orte/orte_config.h"
 #else

diff --git a/orte/libjorte/JGetORTEConstant.c b/orte/libjorte/JGetORTEConstant.c
index 3cf5f96e2b9ca42a177a5cae1f1888350ae50bb9..6c2be0a0c773c180d80fcf67a8ed01e015a2797b 100644 (file)
--- a/orte/libjorte/JGetORTEConstant.c
+++ b/orte/libjorte/JGetORTEConstant.c
@@ -1,5 +1,4 @@
 /* JGetORTEConstant.c */
-
 /**
   * This code provides conversion between JAVA a C environments.
   * The C functions are calling here and results are send to JAVA
@@ -7,7 +6,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +24,11 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <string.h>
+/* pregenerated header */
+#include "jorte/org_ocera_orte_tools_GetORTEConstant.h"
+/* library header file's path */
+#include "orte.h"
 
 /* macro for comparing 2 strings */
 /* if(a==b) -> strcmp = 0 */

diff --git a/orte/libjorte/JIPAddressToString.c b/orte/libjorte/JIPAddressToString.c
index 2b7ca3b53a5c639e1c8dda119ce4dd704f7676e8..ffc7c01a8a0e46e7524321d675e83efaa0a32776 100644 (file)
--- a/orte/libjorte/JIPAddressToString.c
+++ b/orte/libjorte/JIPAddressToString.c
@@ -1,13 +1,11 @@
 /* IPAdressToString.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
+  * 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 Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -27,7 +25,12 @@
   */
 
 
-#include "jorte/jorte.h"
+// origin orte headers
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_tools_Conversions.h"
+
+
 
 /* native function - prototype declared in pregenerated header */
 JNIEXPORT jstring JNICALL

diff --git a/orte/libjorte/JNtpTimeToStringMs.c b/orte/libjorte/JNtpTimeToStringMs.c
index ad402289e8765342edc4f6aebad85b91d09e80e1..2a29efa45cae6c97b282d867c93bfb42b71201be 100644 (file)
--- a/orte/libjorte/JNtpTimeToStringMs.c
+++ b/orte/libjorte/JNtpTimeToStringMs.c
@@ -1,5 +1,4 @@
 /* JNtpTimeToStringMs.c */
-
 /**
   * This code provides conversion between JAVA a C environments.
   * The C functions are calling here and results are send to JAVA
@@ -7,7 +6,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -27,7 +25,12 @@
   */
 
 
-#include "jorte/jorte.h"
+// origin orte headers
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_types_NtpTime.h"
+
+
 
 /* native function - prototype declared in pregenerated header */
 JNIEXPORT jstring JNICALL

diff --git a/orte/libjorte/JNtpTimeToStringUs.c b/orte/libjorte/JNtpTimeToStringUs.c
index f61b3938da8a74c155606a210c723cfae2202624..340f5acbe62724a4234792c10767ca080b4e0795 100644 (file)
--- a/orte/libjorte/JNtpTimeToStringUs.c
+++ b/orte/libjorte/JNtpTimeToStringUs.c
@@ -1,5 +1,4 @@
 /* JNtpTimeToStringUs.c */
-
 /**
   * This code provides conversion between JAVA a C environments.
   * The C functions are calling here and results are send to JAVA
@@ -7,7 +6,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -27,7 +25,12 @@
   */
 
 
-#include "jorte/jorte.h"
+// origin orte headers
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_types_NtpTime.h"
+
+
 
 /* native function - prototype declared in pregenerated header */
 JNIEXPORT jstring JNICALL

diff --git a/orte/libjorte/JORTEDomainAppCreate.c b/orte/libjorte/JORTEDomainAppCreate.c
index ce01f9051ea64688284cdace10faffd8847ab43c..93be29d9197686e66089ea056ca89607990c331d 100644 (file)
--- a/orte/libjorte/JORTEDomainAppCreate.c
+++ b/orte/libjorte/JORTEDomainAppCreate.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +25,18 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <stdlib.h>
+// origin orte headers
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_DomainApp.h"
+// enable TEST_STAGE run level
+#include "jorte/4all.h"
+// new data types
+#include "jorte/jorte_typedefs_defines.h"
+#include "jorte/jorte_protos_api.h"
+#include <inttypes.h>
+
 
 // /////////////////////////////////////////////////////////////////////
 // create default application domain

diff --git a/orte/libjorte/JORTEDomainAppDestroy.c b/orte/libjorte/JORTEDomainAppDestroy.c
index 36e8d083d5f12438f6eabb557faadb3bde5b5229..460682b34863f9d2400df29c9283dba3c6328f1e 100644 (file)
--- a/orte/libjorte/JORTEDomainAppDestroy.c
+++ b/orte/libjorte/JORTEDomainAppDestroy.c
@@ -7,8 +7,8 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
-  * @author CTU FEE Prague - Department of Control Engineering (dce.felk.cvut.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
@@ -26,7 +26,13 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <stdlib.h>
+// origin orte headers
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_DomainApp.h"
+#include "jorte/4all.h"
+#include "jorte/jorte_typedefs_defines.h"
 
 JNIEXPORT jboolean JNICALL
 Java_org_ocera_orte_DomainApp_jORTEDomainAppDestroy

diff --git a/orte/libjorte/JORTEDomainEvents.c b/orte/libjorte/JORTEDomainEvents.c
index 4def279915ac4fff18ff203684946d6c423ff9d8..1241d7b4b2566af2a0e00976808628307fda1661 100644 (file)
--- a/orte/libjorte/JORTEDomainEvents.c
+++ b/orte/libjorte/JORTEDomainEvents.c
@@ -1,30 +1,10 @@
-/**
-  * 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 Martin Vajnar (martin.vajnar@gmail.com)
-  * @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.
-  *
-  */
-
-#include "jorte/jorte.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <jni.h>
+#include "orte.h"
+#include "jorte/4all.h"
+#include "jorte/jorte_typedefs_defines.h"
+#include "jorte/jorte_protos_api.h"
 
 // /////////////////////////////////////////////////////////////////////
 //  public void onRegFail()

diff --git a/orte/libjorte/JORTEDomainEventsDestroy.c b/orte/libjorte/JORTEDomainEventsDestroy.c
index 13f05eecacd2710aaeb7fa79ea1095e76568d8d0..b9dda005cf36b68256e86c65d47de37311ce79be 100644 (file)
--- a/orte/libjorte/JORTEDomainEventsDestroy.c
+++ b/orte/libjorte/JORTEDomainEventsDestroy.c
@@ -1,36 +1,16 @@
-/**
-  * 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 Martin Vajnar (martin.vajnar@gmail.com)
-  * @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.
-  *
-  */
-
-#include "jorte/jorte.h"
+#include <stdlib.h>
+// origin orte headers
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_types_DomainEvents.h"
+#include "jorte/4all.h"
+#include "jorte/jorte_typedefs_defines.h"
 
 JNIEXPORT jboolean JNICALL
 Java_org_ocera_orte_types_DomainEvents_jORTEDomainEventsDestroy
 (JNIEnv *env, jobject obj, jlong handle)
 {
-  FREE((void*)handle);
+  free((void*)handle);
 
   #ifdef TEST_STAGE
      printf(":c: events destroyed.. \n");

diff --git a/orte/libjorte/JORTEDomainInitEvents.c b/orte/libjorte/JORTEDomainInitEvents.c
index ed8e5510abfa827837f2230df81552fb8aaa87bc..3bd004f75532b33094ef76d90413500c20c354fb 100644 (file)
--- a/orte/libjorte/JORTEDomainInitEvents.c
+++ b/orte/libjorte/JORTEDomainInitEvents.c
@@ -1,5 +1,6 @@
 /* JORTEDomainInitEvents.c */
 
+
 /**
   * This code provides conversion between JAVA a C environments.
   * The C functions are calling here and results are send to JAVA
@@ -7,8 +8,8 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
-  * @author CTU FEE Prague - Department of Control Engineering (dce.felk.cvut.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
@@ -26,7 +27,12 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <stdlib.h>
+// origin orte headers
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_types_DomainEvents.h"
+#include "jorte/4all.h"
 
 JNIEXPORT jlong JNICALL
 Java_org_ocera_orte_types_DomainEvents_jORTEDomainInitEvents
@@ -35,7 +41,7 @@ Java_org_ocera_orte_types_DomainEvents_jORTEDomainInitEvents
   ORTEDomainAppEvents *evs;
 
   // memory allocation
-  evs = (ORTEDomainAppEvents *) MALLOC(sizeof(ORTEDomainAppEvents));
+  evs = (ORTEDomainAppEvents *) malloc(sizeof(ORTEDomainAppEvents));
   if(evs == 0)
   {
     printf(":!c: evs = NULL [not enough memory] \n");

diff --git a/orte/libjorte/JORTEDomainMgrCreate.c b/orte/libjorte/JORTEDomainMgrCreate.c
index 8dea66b1dd3ecb43fd52333f8e43f9576fb9704e..5fb4c9669c94d205fffb0d0a3d42d0a572ed4aaf 100644 (file)
--- a/orte/libjorte/JORTEDomainMgrCreate.c
+++ b/orte/libjorte/JORTEDomainMgrCreate.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +25,14 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <stdlib.h>
+// origin orte headers
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_DomainMgr.h"
+#include "jorte/4all.h"
+#include "jorte/jorte_typedefs_defines.h"
+#include "jorte/jorte_protos_api.h"
 
 /* ****************************** *
  *  create default manager domain *

diff --git a/orte/libjorte/JORTEDomainMgrDestroy.c b/orte/libjorte/JORTEDomainMgrDestroy.c
index 5889cf7acabab67ba3d306d8bafa95a9e12391e2..e80ff49fccf35100a362ddb8008534eafeeafb3b 100644 (file)
--- a/orte/libjorte/JORTEDomainMgrDestroy.c
+++ b/orte/libjorte/JORTEDomainMgrDestroy.c
@@ -7,8 +7,8 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
-  * @author CTU FEE Prague - Department of Control Engineering (dce.felk.cvut.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
@@ -26,7 +26,14 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <stdlib.h>
+// origin orte headers
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_DomainMgr.h"
+#include "jorte/4all.h"
+#include "jorte/jorte_typedefs_defines.h"
+
 
 JNIEXPORT jboolean JNICALL
 Java_org_ocera_orte_DomainMgr_jORTEDomainMgrDestroy

diff --git a/orte/libjorte/JORTEDomainPropDefaultGet.c b/orte/libjorte/JORTEDomainPropDefaultGet.c
index 5ca1815bf203aafa42b56fdb35c905a1e8fa3ae9..3913eb04cecbe55aa52cad6782f6911e4bfb8238 100644 (file)
--- a/orte/libjorte/JORTEDomainPropDefaultGet.c
+++ b/orte/libjorte/JORTEDomainPropDefaultGet.c
@@ -7,8 +7,8 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
-  * @author CTU FEE Prague - Department of Control Engineering (dce.felk.cvut.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
@@ -27,7 +27,12 @@
   */
 
 
-#include "jorte/jorte.h"
+#include <stdlib.h>
+// origin orte headers
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_types_DomainProp.h"
+#include "jorte/4all.h"
 
 JNIEXPORT jlong JNICALL
 Java_org_ocera_orte_types_DomainProp_jORTEDomainPropDefaultGet

diff --git a/orte/libjorte/JORTEDomainPropDestroy.c b/orte/libjorte/JORTEDomainPropDestroy.c
index 377e7d358c8c8ed1cade836819ac89b3590a4e11..a0a33a0860c1de0e9700a7d7bdb10c09a8eb3023 100644 (file)
--- a/orte/libjorte/JORTEDomainPropDestroy.c
+++ b/orte/libjorte/JORTEDomainPropDestroy.c
@@ -1,30 +1,9 @@
-/**
-  * 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 Martin Vajnar (martin.vajnar@gmail.com)
-  * @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.
-  *
-  */
+#include <string.h>
+#include <stdlib.h>
+#include "orte.h"
+#include "jorte/4all.h"
 
-#include "jorte/jorte.h"
+#include "jorte/org_ocera_orte_types_DomainProp.h"
 
   JNIEXPORT jboolean JNICALL Java_org_ocera_orte_types_DomainProp_jORTEDomainPropDestroy
   (

diff --git a/orte/libjorte/JORTEDomainPropSet.c b/orte/libjorte/JORTEDomainPropSet.c
index 85b2d5afbf9e2206351c121392d7954c2373364e..fe6abd80255c8592116a7221e520360c58ff6e44 100644 (file)
--- a/orte/libjorte/JORTEDomainPropSet.c
+++ b/orte/libjorte/JORTEDomainPropSet.c
@@ -1,30 +1,9 @@
-/**
-  * 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 Martin Vajnar (martin.vajnar@gmail.com)
-  * @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.
-  *
-  */
+#include <string.h>
+#include <stdlib.h>
+#include "orte.h"
+#include "jorte/4all.h"
 
-#include "jorte/jorte.h"
+#include "jorte/org_ocera_orte_types_DomainProp.h"
 
   JNIEXPORT jboolean JNICALL Java_org_ocera_orte_types_DomainProp_jORTEDomainPropSet
   (

diff --git a/orte/libjorte/JORTEDomainStart.c b/orte/libjorte/JORTEDomainStart.c
index 327fcf36198713e7567a69e7d9698589bff2a0ea..e9a1527d78144950e73a8518c2e419c4498d0528 100644 (file)
--- a/orte/libjorte/JORTEDomainStart.c
+++ b/orte/libjorte/JORTEDomainStart.c
@@ -1,5 +1,6 @@
 /* JORTEDomainStart.c */
 
+
 /**
   * This code provides conversion between JAVA a C environments.
   * The C functions are calling here and results are send to JAVA
@@ -7,7 +8,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -27,7 +27,11 @@
   */
 
 
-#include "jorte/jorte.h"
+// 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

diff --git a/orte/libjorte/JORTEInit.c b/orte/libjorte/JORTEInit.c
index 953461851387de82c4adcfe96d96efe7ee1f9726..33ea9dcd6ab8289b7f1311d34a4761e0916c58f2 100644 (file)
--- a/orte/libjorte/JORTEInit.c
+++ b/orte/libjorte/JORTEInit.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -27,7 +26,12 @@
   */
 
 
-#include "jorte/jorte.h"
+// origin orte headers
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_JOrte.h"
+#include "jorte/4all.h"
+
 
 JNIEXPORT void JNICALL
 Java_org_ocera_orte_JOrte_jORTEInit

diff --git a/orte/libjorte/JORTEPublicationCreate.c b/orte/libjorte/JORTEPublicationCreate.c
index b2b5876a1070271fe50cee1ac3a74968f2fe5bf9..4cabf34c1fa623ab9d5f3e321ad13edf8ef8307e 100644 (file)
--- a/orte/libjorte/JORTEPublicationCreate.c
+++ b/orte/libjorte/JORTEPublicationCreate.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +25,14 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <stdlib.h>
+// origin orte headers
+#include "orte.h"
+#include "orte_all.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_Publication.h"
+#include "jorte/jorte_protos_api.h"
+#include "jorte/4all.h"
 
 // ### DOCASNE ##################################################################
 

diff --git a/orte/libjorte/JORTEPublicationDestroy.c b/orte/libjorte/JORTEPublicationDestroy.c
index 962bb48c8f7c6a73dd4ef9ab29f7bcc5cc6c74dd..8eb9b365c3ed2ef65b3d431e28a313d3c809c403 100644 (file)
--- a/orte/libjorte/JORTEPublicationDestroy.c
+++ b/orte/libjorte/JORTEPublicationDestroy.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +25,13 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <stdlib.h>
+// origin orte headers
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_Publication.h"
+#include "jorte/4all.h"
+
 
 JNIEXPORT jboolean JNICALL
 Java_org_ocera_orte_Publication_jORTEPublicationDestroy

diff --git a/orte/libjorte/JORTEPublicationGetStatus.c b/orte/libjorte/JORTEPublicationGetStatus.c
index f8f578ee8d00862a8ffb8732ff41558a4ba524e6..a8bf3cc68ccfd903874251b18e5d00ecbebbad2d 100644 (file)
--- a/orte/libjorte/JORTEPublicationGetStatus.c
+++ b/orte/libjorte/JORTEPublicationGetStatus.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +25,16 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <string.h>
+#include <stdlib.h>
+// library header file's path
+#include "orte.h"
+// enable TEST_STAGE run level
+#include "jorte/4all.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_Publication.h"
+#include "jorte/jorte_protos_api.h"
+
 
 JNIEXPORT jobject JNICALL
 Java_org_ocera_orte_Publication_jORTEPublicationGetStatus

diff --git a/orte/libjorte/JORTEPublicationPropertiesGet.c b/orte/libjorte/JORTEPublicationPropertiesGet.c
index 4024c3376b0be86699068e0145e2de08bf630c47..3e70197d591b824d61f6eb8be419fa4e04b0690e 100644 (file)
--- a/orte/libjorte/JORTEPublicationPropertiesGet.c
+++ b/orte/libjorte/JORTEPublicationPropertiesGet.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +25,16 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <string.h>
+#include <stdlib.h>
+// library header file's path
+#include "orte.h"
+// enable TEST_STAGE run level
+#include "jorte/4all.h"
+#include "jorte/jorte_protos_api.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_Publication.h"
+
 
 JNIEXPORT jobject JNICALL
 Java_org_ocera_orte_Publication_jORTEPublicationPropertiesGet

diff --git a/orte/libjorte/JORTEPublicationPropertiesSet.c b/orte/libjorte/JORTEPublicationPropertiesSet.c
index 066b0f164940d60e137873f2e6341e9a6db1ec1a..f0f319dbdf11f4f41f3c3125eae4d2c2890ea7f2 100644 (file)
--- a/orte/libjorte/JORTEPublicationPropertiesSet.c
+++ b/orte/libjorte/JORTEPublicationPropertiesSet.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +25,17 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <string.h>
+#include <stdlib.h>
+#include <inttypes.h>
+// library header file's path
+#include "orte.h"
+// getNtpTime function
+#include "jorte/jorte_protos_api.h"
+// enable TEST_STAGE run level
+#include "jorte/4all.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_Publication.h"
 
 
 JNIEXPORT jboolean JNICALL

diff --git a/orte/libjorte/JORTEPublicationSend.c b/orte/libjorte/JORTEPublicationSend.c
index e7b6e658bbaea345cbea5c20fd1a60ef42d3893c..9b67ba21282842ee3cc44ea7c65ba128a1001d18 100644 (file)
--- a/orte/libjorte/JORTEPublicationSend.c
+++ b/orte/libjorte/JORTEPublicationSend.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -27,7 +26,13 @@
   */
 
 
-#include "jorte/jorte.h"
+#include <stdlib.h>
+// library header file's path
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_Publication.h"
+// enable TEST_STAGE run level
+#include "jorte/4all.h"
 
 
 JNIEXPORT jboolean JNICALL

diff --git a/orte/libjorte/JORTEPublicationWaitForSubscriptions.c b/orte/libjorte/JORTEPublicationWaitForSubscriptions.c
index 6a8e29cf80858d17a9dfda28afcf09f8ba535a48..4b9b377f09f1e2ab74182a67ff94c46901d7419f 100644 (file)
--- a/orte/libjorte/JORTEPublicationWaitForSubscriptions.c
+++ b/orte/libjorte/JORTEPublicationWaitForSubscriptions.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,8 +25,17 @@
   *
   */
 
-
-#include "jorte/jorte.h"
+#include <string.h>
+#include <stdlib.h>
+#include <inttypes.h>
+// library header file's path
+#include "orte.h"
+// getNtpTime function
+#include "jorte/jorte_protos_api.h"
+// enable TEST_STAGE run level
+#include "jorte/4all.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_Publication.h"
 
 
 JNIEXPORT jint JNICALL

diff --git a/orte/libjorte/JORTESleepMs.c b/orte/libjorte/JORTESleepMs.c
index 4dec7efc9892229a376fd5dcea9d5784795e9609..9bf2bfdaa99811516975a095cd9926eb6700c1fa 100644 (file)
--- a/orte/libjorte/JORTESleepMs.c
+++ b/orte/libjorte/JORTESleepMs.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -27,7 +26,11 @@
   */
 
 
-#include "jorte/jorte.h"
+// origin orte headers
+#include "orte.h"
+/* pregenerated header */
+#include "jorte/org_ocera_orte_JOrte.h"
+#include "jorte/4all.h"
 
 
 JNIEXPORT void JNICALL

diff --git a/orte/libjorte/JORTESubscriptionCreate.c b/orte/libjorte/JORTESubscriptionCreate.c
index 11f259b220b0d097e3869c0a36015990c6877a89..b02edea7227c2c06254959bdf8dc73a2d13ce25f 100644 (file)
--- a/orte/libjorte/JORTESubscriptionCreate.c
+++ b/orte/libjorte/JORTESubscriptionCreate.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +25,19 @@
   *
   */
 
-#include "jorte/jorte.h"
+
+#include <stdlib.h>
+#include <inttypes.h>
+
+// library header file's path
+#include "orte_all.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_Subscription.h"
+// enable TEST_STAGE run level
+#include "jorte/4all.h"
+// new data types
+#include "jorte/jorte_typedefs_defines.h"
+#include "jorte/jorte_protos_api.h"
 
 /* ****************************************************************** *
  *                           CallBack function                        *

diff --git a/orte/libjorte/JORTESubscriptionDestroy.c b/orte/libjorte/JORTESubscriptionDestroy.c
index 9f3a54317cbd79efa90ad4916aa804340cc686a6..c53653f391e24905d098730eba559ce49a946a72 100644 (file)
--- a/orte/libjorte/JORTESubscriptionDestroy.c
+++ b/orte/libjorte/JORTESubscriptionDestroy.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -27,7 +26,15 @@
   */
 
 
-#include "jorte/jorte.h"
+#include <stdlib.h>
+// library header file's path
+#include "orte.h"
+// enable TEST_STAGE run level
+#include "jorte/4all.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_Subscription.h"
+//
+#include "jorte/jorte_typedefs_defines.h"
 
 JNIEXPORT jboolean JNICALL
 Java_org_ocera_orte_Subscription_jORTESubscriptionDestroy

diff --git a/orte/libjorte/JORTESubscriptionGetStatus.c b/orte/libjorte/JORTESubscriptionGetStatus.c
index 28e9b1eca513791442705c05a1dff6a751a2b304..6ba6b05342bbab466e714622e307b65cdb3f2f95 100644 (file)
--- a/orte/libjorte/JORTESubscriptionGetStatus.c
+++ b/orte/libjorte/JORTESubscriptionGetStatus.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +25,15 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <string.h>
+#include <stdlib.h>
+// library header file's path
+#include "orte.h"
+// enable TEST_STAGE run level
+#include "jorte/4all.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_Subscription.h"
+#include "jorte/jorte_protos_api.h"
 
 
 JNIEXPORT jobject JNICALL

diff --git a/orte/libjorte/JORTESubscriptionPropertiesGet.c b/orte/libjorte/JORTESubscriptionPropertiesGet.c
index d11fdaab3364f68fb8cda8c342ef4056beb80c98..0e1c6525bdf19cf94bab99b399bdce0abb42abaf 100644 (file)
--- a/orte/libjorte/JORTESubscriptionPropertiesGet.c
+++ b/orte/libjorte/JORTESubscriptionPropertiesGet.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +25,15 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <string.h>
+#include <stdlib.h>
+// library header file's path
+#include "orte.h"
+// enable TEST_STAGE run level
+#include "jorte/4all.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_Subscription.h"
+#include "jorte/jorte_protos_api.h"
 
 JNIEXPORT jobject JNICALL
 Java_org_ocera_orte_Subscription_jORTESubscriptionPropertiesGet

diff --git a/orte/libjorte/JORTESubscriptionPropertiesSet.c b/orte/libjorte/JORTESubscriptionPropertiesSet.c
index 35610878e01b93c78320f01eacdd838c9d87bd23..2ba47e5579c3f22668ca5efae75d4cb944f78329 100644 (file)
--- a/orte/libjorte/JORTESubscriptionPropertiesSet.c
+++ b/orte/libjorte/JORTESubscriptionPropertiesSet.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +25,17 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <string.h>
+#include <stdlib.h>
+#include <inttypes.h>
+// library header file's path
+#include "orte.h"
+// getNtpTime function
+#include "jorte/jorte_protos_api.h"
+// enable TEST_STAGE run level
+#include "jorte/4all.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_Subscription.h"
 
 
 JNIEXPORT jboolean JNICALL

diff --git a/orte/libjorte/JORTESubscriptionPull.c b/orte/libjorte/JORTESubscriptionPull.c
index 3214575b263f6f42ed7978c84c43e0ad7f650396..938f9934c6ab603ffb2f2095b5c97ba39692f146 100644 (file)
--- a/orte/libjorte/JORTESubscriptionPull.c
+++ b/orte/libjorte/JORTESubscriptionPull.c
@@ -1,30 +1,6 @@
-/**
-  * 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 Martin Vajnar (martin.vajnar@gmail.com)
-  * @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.
-  *
-  */
-
-#include "jorte/jorte.h"
+#include "orte.h"
+#include "jorte/4all.h"
+#include "jorte/org_ocera_orte_Subscription.h"
 
 JNIEXPORT jint JNICALL
 Java_org_ocera_orte_Subscription_jORTESubscriptionPull

diff --git a/orte/libjorte/JORTESubscriptionWaitForPublications.c b/orte/libjorte/JORTESubscriptionWaitForPublications.c
index 7bf2da6e10908a29a224181565393869a303af87..7852648e8d5cb0f56d785297ea025f34ba708852 100644 (file)
--- a/orte/libjorte/JORTESubscriptionWaitForPublications.c
+++ b/orte/libjorte/JORTESubscriptionWaitForPublications.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +25,17 @@
   *
   */
 
-#include "jorte/jorte.h"
+#include <string.h>
+#include <stdlib.h>
+#include <inttypes.h>
+// library header file's path
+#include "orte.h"
+// getNtpTime function
+#include "jorte/jorte_protos_api.h"
+// enable TEST_STAGE run level
+#include "jorte/4all.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_Subscription.h"
 
 
 JNIEXPORT jint JNICALL

diff --git a/orte/libjorte/JORTETypeRegisterAdd.c b/orte/libjorte/JORTETypeRegisterAdd.c
index a2fc83b61b9d016504d036f221d21772cdf34443..73e9c640ad6080bbe9424df5de4d4a4dae3d6c69 100644 (file)
--- a/orte/libjorte/JORTETypeRegisterAdd.c
+++ b/orte/libjorte/JORTETypeRegisterAdd.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -27,7 +26,11 @@
   */
 
 
-#include "jorte/jorte.h"
+// library header file's path
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_DomainApp.h"
+#include "jorte/4all.h"
 
 JNIEXPORT jint JNICALL
 Java_org_ocera_orte_DomainApp_jORTETypeRegisterAdd

diff --git a/orte/libjorte/JORTETypeRegisterDestroyAll.c b/orte/libjorte/JORTETypeRegisterDestroyAll.c
index 436ecfb09f98c5422cca27555f39534b09d6de67..cea627eaa157cd40200db8a74e994be9315afbe9 100644 (file)
--- a/orte/libjorte/JORTETypeRegisterDestroyAll.c
+++ b/orte/libjorte/JORTETypeRegisterDestroyAll.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -27,7 +26,11 @@
   */
 
 
-#include "jorte/jorte.h"
+// library header file's path
+#include "orte.h"
+#include "jorte/4all.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_DomainApp.h"
 
 
 JNIEXPORT jboolean JNICALL

diff --git a/orte/libjorte/JORTEVerbositySetLogFile.c b/orte/libjorte/JORTEVerbositySetLogFile.c
index 8b7cc620acfaccec40497dac9f2f2b711c818952..1059e2547408c9412419ca3d19ca5ff00b587a72 100644 (file)
--- a/orte/libjorte/JORTEVerbositySetLogFile.c
+++ b/orte/libjorte/JORTEVerbositySetLogFile.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -27,7 +26,10 @@
   */
 
 
-#include "jorte/jorte.h"
+// library header file's path
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_JOrte.h"
 
 
 /* native function - prototype declared in pregenerated header */

diff --git a/orte/libjorte/JORTEVerbositySetOptions.c b/orte/libjorte/JORTEVerbositySetOptions.c
index 831d736e7e90ee2c77856eb6a2315a47f292e6e6..84aaf5d3430a9aad456cfce2c5a2bc7b936521fb 100644 (file)
--- a/orte/libjorte/JORTEVerbositySetOptions.c
+++ b/orte/libjorte/JORTEVerbositySetOptions.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -27,7 +26,10 @@
   */
 
 
-#include "jorte/jorte.h"
+// library header file's path
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_JOrte.h"
 
 
 /* native function - prototype declared in pregenerated header */

diff --git a/orte/libjorte/JStringToIPAddress.c b/orte/libjorte/JStringToIPAddress.c
index ccf2b510f6bafbeca1945288d382af190bfd69f9..a1f86142719791a7df0687396464030abe00a248 100644 (file)
--- a/orte/libjorte/JStringToIPAddress.c
+++ b/orte/libjorte/JStringToIPAddress.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +25,11 @@
   *
   */
 
-#include "jorte/jorte.h"
+
+// library header file's path
+#include "orte.h"
+// pregenerated header
+#include "jorte/org_ocera_orte_tools_Conversions.h"
 
 
 /* native function - prototype declared in pregenerated header */

diff --git a/orte/libjorte/createAppInfo.c b/orte/libjorte/createAppInfo.c
index efc8b6b4466fc71136af5fc5d2694c276f6a0aad..1d06bbe1338da62cc951f0867095581cc0d042c3 100644 (file)
--- a/orte/libjorte/createAppInfo.c
+++ b/orte/libjorte/createAppInfo.c
@@ -1,32 +1,10 @@
 /* createAppInfo.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 Martin Vajnar (martin.vajnar@gmail.com)
-  * @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.
-  *
-  */
-
-#include "jorte/jorte.h"
+#include <jni.h>
+#include "orte.h"
+#include "jorte/4all.h"
+#include "jorte/jorte_protos_api.h"
+#include <inttypes.h>
 
 jobject createAppInfo(JNIEnv *env, const ORTEAppInfo *ainfo)
 {

diff --git a/orte/libjorte/createPubInfo.c b/orte/libjorte/createPubInfo.c
index 89f5d492914af7c79a163e94e22df0589b2f1c07..16c2ac13b56072e9370136812584a3144aa17d08 100644 (file)
--- a/orte/libjorte/createPubInfo.c
+++ b/orte/libjorte/createPubInfo.c
@@ -1,32 +1,9 @@
 /* createPubInfo.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 Martin Vajnar (martin.vajnar@gmail.com)
-  * @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.
-  *
-  */
-
-#include "jorte/jorte.h"
+#include <jni.h>
+#include "orte.h"
+#include "jorte/4all.h"
+#include "jorte/jorte_protos_api.h"
 
 jobject createPubInfo(JNIEnv *env, const ORTEPubInfo *pinfo)
 {

diff --git a/orte/libjorte/createSubInfo.c b/orte/libjorte/createSubInfo.c
index 2224b110f8a0f1e9749ae7dd2527ec3cfd7154a2..d9190042b7d1e3815f49546808b5eb88153c1d4e 100644 (file)
--- a/orte/libjorte/createSubInfo.c
+++ b/orte/libjorte/createSubInfo.c
@@ -1,32 +1,9 @@
 /* createSubInfo.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 Martin Vajnar (martin.vajnar@gmail.com)
-  * @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.
-  *
-  */
-
-#include "jorte/jorte.h"
+#include <jni.h>
+#include "orte.h"
+#include "jorte/4all.h"
+#include "jorte/jorte_protos_api.h"
 
 jobject createSubInfo(JNIEnv *env, const ORTESubInfo *sinfo)
 {

diff --git a/orte/libjorte/getNtpTime.c b/orte/libjorte/getNtpTime.c
index fcbf8b1ee5a6c2d89e7c8df4a62a37ceb4d7a379..fd49c1b1436264c09275f2bc7d3e94c4526cfc74 100644 (file)
--- a/orte/libjorte/getNtpTime.c
+++ b/orte/libjorte/getNtpTime.c
@@ -7,7 +7,6 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
-  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @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
@@ -26,7 +25,8 @@
   *
   */
 
-#include  "jorte/jorte.h"
+#include  "jorte/jorte_protos_api.h"
+
 
 NtpTime getNtpTime(JNIEnv *env, jobject obj)
 {

diff --git a/orte/libjorte/onLoad.c b/orte/libjorte/onLoad.c
index 41a890e4258fd8040181bbe8efd3c6352ffba9c7..f7b8e484e129802156fe0474b482b4f73485d4c5 100644 (file)
--- a/orte/libjorte/onLoad.c
+++ b/orte/libjorte/onLoad.c
@@ -1,30 +1,5 @@
-/**
-  * 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 Martin Vajnar (martin.vajnar@gmail.com)
-  * @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.
-  *
-  */
-
-#include "jorte/jorte.h"
+#include <stdlib.h>
+#include <jni.h>
 
 static jmethodID findClassM;
 static jmethodID findLoadedClassM;

diff --git a/orte/libjorte/setRecvInfo.c b/orte/libjorte/setRecvInfo.c
index 2a9ea253136917de9958ac48fdb0f2f3b8d5e3f4..2816e33b5472dbc89ab6396278c7e73ba14bed64 100644 (file)
--- a/orte/libjorte/setRecvInfo.c
+++ b/orte/libjorte/setRecvInfo.c
@@ -1,32 +1,10 @@
 /* setRecvInfo.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 Martin Vajnar (martin.vajnar@gmail.com)
-  * @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.
-  *
-  */
-
-#include "jorte/jorte.h"
+#include <jni.h>
+#include <inttypes.h>
+#include "orte.h"
+#include "jorte/4all.h"
+#include "jorte/jorte_protos_api.h"
 
 int setRecvInfo(JNIEnv *env, const ORTERecvInfo *rinfo, jobject obj)
 {

diff --git a/orte/libjorte/setTopic.c b/orte/libjorte/setTopic.c
index bc4658c8831c1ab1c741b87eaabaf80eb32cebd2..455d58b1370eedba0b9d685e12588ba0a062be76 100644 (file)
--- a/orte/libjorte/setTopic.c
+++ b/orte/libjorte/setTopic.c
@@ -1,32 +1,8 @@
 /* setTopic.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 Martin Vajnar (martin.vajnar@gmail.com)
-  * @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.
-  *
-  */
-
-#include "jorte/jorte.h"
+#include <jni.h>
+#include "jorte/4all.h"
+#include "jorte/jorte_protos_api.h"
 
 int setTopic(JNIEnv *env, jclass cls, jobject obj, const char *topic)
 {

diff --git a/orte/libjorte/setType.c b/orte/libjorte/setType.c
index 7ff3b055bbae82fc7e39955535dc458aa3b1a47f..436f0e8eb8fea8d0cd31246fe2166f812de24352 100644 (file)
--- a/orte/libjorte/setType.c
+++ b/orte/libjorte/setType.c
@@ -1,32 +1,8 @@
 /* setType.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 Martin Vajnar (martin.vajnar@gmail.com)
-  * @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.
-  *
-  */
-
-#include "jorte/jorte.h"
+#include <jni.h>
+#include "jorte/4all.h"
+#include "jorte/jorte_protos_api.h"
 
 int setType(JNIEnv *env, jclass cls, jobject obj, const char *typeName)
 {