JORTE: update license headers and clean-up includes

[orte.git] / orte / include / jorte / jorte.h

diff --git a/orte/include/jorte/jorte.h b/orte/include/jorte/jorte.h
index 9c7a5e339a253ff05c2060b0aba8f897effca471..8112fffa01736b7514bd2629fd5b975be559cba4 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.h"
+#include "orte_all.h"
 
 // switch program behaviour (test stage,....)
 #include "4all.h"
 
-// NtpTime
-#include "getNtpTime.h"
-
 // new type definitions
-#include "typedefs_defines_jorte.h"
+#include "jorte_typedefs_defines.h"
+
+// JORTE API
+#include "jorte_protos_api.h"
 
 // auto-generated headers by JNI
 #include "org_ocera_orte_tools_Conversions.h"
 #include "org_ocera_orte_Domain.h"
-#include "org_ocera_orte_DomainEvents.h"
-#include "org_ocera_orte_DomainProp.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_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,6 +55,4 @@ extern "C" {
 } /* extern "C"*/
 #endif
 
-/*
-#endif // _JORTE_H
-*/
+#endif // _JORTE_H
\ No newline at end of file