Changeset 771 for trunk/zoo-project/zoo-api

Timestamp:

Jun 10, 2016, 1:40:44 AM (8 years ago)

Author:

djay

Message:

Remove the default java.library.path definition and use an optional [java] section instead (where the key java.library.path, amongst other, may be defined). Change _ function name to translate in the Java ZOO-API. Use a ogr.zoo_project package containing the ZOO class. Fix the hello-java service and update doc consequently

Location:

trunk/zoo-project/zoo-api/java

Files:

• Makefile (modified) (1 diff)
• org (added)
• org/zoo_project (added)
• org/zoo_project/ZOO.java (moved) (moved from trunk/zoo-project/zoo-api/java/ZOO.java) (2 diffs)
• zoo-api.c (modified) (2 diffs)

trunk/zoo-project/zoo-api/java/Makefile

@@ -20 +20 @@
 all: libZOO.${ext}
 
-ZOO.class: ZOO.java
-        javac ZOO.java
+org/zoo_project/ZOO.class: org/zoo_project/ZOO.java
+        javac org/zoo_project/ZOO.java
 
-ZOO.h: ZOO.java ZOO.class
-        javah ZOO
+org_zoo_project_ZOO.h: org/zoo_project/ZOO.java org/zoo_project/ZOO.class
+        javah org.zoo_project.ZOO
 
-zoo-api.o: zoo-api.c ZOO.h
+zoo-api.o: zoo-api.c org_zoo_project_ZOO.h
         gcc -fPIC -c zoo-api.c ${JAVACFLAGS} ${XML2CFLAGS} -I../../zoo-kernel/ -I../../../thirds/cgic206/
 
 libZOO.${ext}: zoo-api.o
-        gcc zoo-api.o -shared -o libZOO.${ext} -Wl,../../zoo-kernel/service_internal.o,${JAVA_FILES},${MS_FILES}${JS_FILES}../../zoo-kernel/ulinet.o ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS} -lcurl -lfcgi ${MACOS_LD_NET_FLAGS}
+        gcc zoo-api.o -shared -o libZOO.${ext} -Wl,../../zoo-kernel//service_yaml.o,../../zoo-kernel/lex.cr.o,../../zoo-kernel/main_conf_read.tab.o,../../zoo-kernel/lex.sr.o,../../zoo-kernel/service_conf.tab.o,../../zoo-kernel/service_internal.o,../../zoo-kernel/server_internal.o,../../zoo-kernel/response_print.o,${JAVA_FILES},${MS_FILES}${JS_FILES}../../zoo-kernel/ulinet.o ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS} -lcurl -lfcgi ${MACOS_LD_NET_FLAGS} -lzoo_service -lyaml
 
 clean:
-        rm -f *${ext} *o *.h *class
+        rm -f *${ext} *o *.h *class org/zoo_project/*.class

trunk/zoo-project/zoo-api/java/org/zoo_project/ZOO.java

@@ +1 @@
+package org.zoo_project;
+
 import java.lang.*;
 import java.util.*;
@@ -6 +8 @@
     public static Integer SERVICE_SUCCEEDED=3;
     public static Integer SERVICE_FAILED=4;
-    public static native String _(String a);
+    public static native String translate(String a);
     public static native Integer updateStatus(HashMap conf,String pourcent,String message);
 }

trunk/zoo-project/zoo-api/java/zoo-api.c

@@ -1 @@
-#include "ZOO.h"
+#include "org_zoo_project_ZOO.h"
 #include "service.h"
 #include "service_internal.h"
 #include "service_internal_java.h"
 
-JNIEXPORT jstring JNICALL Java_ZOO__1
+JNIEXPORT jstring JNICALL Java_org_zoo_1project_ZOO_translate
   (JNIEnv *env, jclass _class, jstring msg){
   const char *message = 
@@ -17 +17 @@
 }
 
-JNIEXPORT jobject JNICALL Java_ZOO_updateStatus
+JNIEXPORT jobject JNICALL Java_org_zoo_1project_ZOO_updateStatus
   (JNIEnv *env, jclass _class, jobject conf, jstring pourc, jstring msg){