There is no plan to merge it into the 1.2-rel branch. We never planned on merging it into the 1.2-rel branch. This is clearly a feature for the next release.
George From: ??? (Uze Choi) [mailto:[email protected]] Sent: Tuesday, December 13, 2016 5:32 PM To: Nash, George <george.nash at intel.com>; jaehong.jo at samsung.com; 'Thiago Moura' <thiagogcm at gmail.com> Cc: iotivity-dev at lists.iotivity.org Subject: RE: [dev] generic java support merged with master Hi Nash/Rick, Generic Java will cover the Android java and Linux java also. Then, Rick as sub-maintainer will maintain both together? This feature should not be merged in 1.2-rel branch, new feature is not permitted in the same minor branch. BR, Uze Choi From: iotivity-dev-bounces at lists.iotivity.org<mailto:iotivity-dev-bounces at lists.iotivity.org> [mailto:[email protected]] On Behalf Of Nash, George Sent: Wednesday, December 14, 2016 9:47 AM To: jaehong.jo at samsung.com<mailto:jaehong.jo at samsung.com>; Thiago Moura Cc: iotivity-dev at lists.iotivity.org<mailto:iotivity-dev at lists.iotivity.org> Subject: Re: [dev] generic java support merged with master Jaehong, Some samples are using Android.mk files those samples were not reworked to use scons. A quick look at the files you have pointed out: - It looks like the Android.mk in the build_common folder is no longer used and can be cleared out. I will do more verification to make sure. - The rest of the files (i.e. OCAndroid.cpp) should still be included from scons scripts. If the file is Android specific it should only be included in android. I will double check the files. I know that this is a big change. That is part of the reason I tried to get it into master soon after the 1.2 release. I want to have as much time as possible for developers to work with the code and give feedback. I would have loved to have more people try out the code on the generic-java branch before merging to make sure there was nothing that was missed. Unfortunately most people don?t checkout the branches unless they are really interested or they are asked to look into the branch. Most of the work, was done by Peter Eftime, he did an amazing job. Unfortunately Peter is no longer working on IoTivity. Without his work the generic-java change would not have happend. I volunteered to continue with his work and try to get it merged with master. I only started working on the generic-java about two months ago. I did very little to change Peter?s initial work. Peter start working about 4 months before the 1.2-rel branch was cut. He did not keep his work in sync with master; I had to update the branch so it was in sync with master. I did a lot of work to update the build scripts and verifying code still worked. The examples and the unit tests were used to verify the changes. It is always possible that something was missed. George From: Jaehong, Jo [mailto:[email protected]] Sent: Tuesday, December 13, 2016 3:39 PM To: Nash, George <george.nash at intel.com<mailto:george.nash at intel.com>>; Thiago Moura <thiagogcm at gmail.com<mailto:thiagogcm at gmail.com>> Cc: iotivity-dev at lists.iotivity.org<mailto:iotivity-dev at lists.iotivity.org> Subject: RE: Re: [dev] generic java support merged with master Hi, George. I saw change yesterday and I was a bit confused. But your email solved my curiosity. I still have some doubt about this change. Is it valid that the remaining 9 files of Android.mk? eg. build_common/android/jni, resource/csdk/connectivity/build/android/jni Will the OCAndroid.cpp/h files be used? I will wait for your reply. Thank you, Jaehong __________________________________ Jaehong Jo IoT Lab. | S/W Platform Team | Software R&D Center Samsung Electronics Co., Ltd Mobile: +82-10-7260-5021 Email: jaehong.jo at samsung.com<mailto:jaehong.jo at samsung.com> --------- Original Message --------- Sender : Nash, George <george.nash at intel.com<mailto:george.nash at intel.com>> Date : 2016-12-14 08:21 (GMT+9) Title : Re: [dev] generic java support merged with master I not 100% sure, but I think the only thing needed for the samples is provisioning code. Then they should with SECURED=1. I did discover today that the build will fail with TARGET_TRANSPORT=ALL I have already created a Jira ticket https://jira.iotivity.org/browse/IOT-1677 and I am looking into it. For the time being if you want to use java on Linux specify TARGET_TRANSPORT=IP George From: Thiago Moura [mailto:[email protected]] Sent: Tuesday, December 13, 2016 3:06 PM To: Nash, George <george.nash at intel.com<mailto:george.nash at intel.com>> Cc: iotivity-dev at lists.iotivity.org<mailto:iotivity-dev at lists.iotivity.org> Subject: Re: [dev] generic java support merged with master Thanks for it!! Great work! What is missing to get samples working with SECURED=1? On Tue, Dec 13, 2016 at 3:36 PM, Nash, George <george.nash at intel.com<mailto:george.nash at intel.com>> wrote: I the work on the generic java bindings was **merged** with master yesterday: - https://jira.iotivity.org/browse/IOT-1089 - https://gerrit.iotivity.org/gerrit/#/c/14931/ This change moves around all of the java related code. Since there is a java implementation for almost every part of the IoTivity project this change will likely affect every project at least a little. Currently we are not trying to build the generic Java on any platform other than Linux and Android. We tried to keep code changes to a minimum, but the structural changes are quite significant. Directory organization changes: `android` --> `java` `android/android_api/jni` --> `java/jni` `android/android_api/src` --> `java/common/src` --> `java/iotivity-android/src` --> `java/iotivity-linux/src` `android/examples` --> `java/examples-android` New directory: `java/examples-java` Other changes: The jni code is no longer built using Android.mk build files. It is built using scons. Due to the folder reorganization there are changes to multiple build scripts to address the new folder paths. To build the generic-java code: For Android: No change. It builds using the same build instructions as before. For Linux: 1. Specify JAVA_HOME environment variable with the path to the JDK. (i.e. `export JAVA_HOME=/usr/lib/jvm/java-1.8.0/`) 2. `scons BUILD_JAVA=1` #add any additional build options or `autobuild.py linux_unsecured_with_java` or `autobuild.py linux_secured_with_java` Running Linux samples: (Samples currently only works with SECURED=0 build) export LD_LIBRARY_PATH=$(pwd)/out/linux/x86_64/debug/:$LD_LIBRARY_PATH for SimpleClient: java -cp java/examples-java/simpleclient/build/libs/simpleclient.jar:java/iotivity-linux/build/libs/iotivity-linux.jar org.iotivity.base.examples.SimpleClient for SimpleServer: java -cp java/examples-java/simpleserver/build/libs/simpleserver.jar:java/iotivity-linux/build/libs/iotivity-linux.jar org.iotivity.base.examples.SimpleServer Thanks the following people for all their work: Peter Eftime ? for doing the initial work Larry Sachs ? for all the time spent testing and re-testing the android code to make sure it continued to work as expected Rick Bell ? for reviews and the final merge If you have any questions I will do my best to answer them. George _______________________________________________ iotivity-dev mailing list iotivity-dev at lists.iotivity.org<mailto:iotivity-dev at lists.iotivity.org> https://lists.iotivity.org/mailman/listinfo/iotivity-dev -- Thiago Guedes Cunha de Moura Graduando em Ci?ncia da Computa??o Instituto de Ci?ncias Exatas e Biol?gicas - Universidade Federal de Ouro Preto cel.: (31)99484-9864 _______________________________________________ iotivity-dev mailing list iotivity-dev at lists.iotivity.org<mailto:iotivity-dev at lists.iotivity.org> https://lists.iotivity.org/mailman/listinfo/iotivity-dev [cid:image001.gif at 01D255E2.CA7EC080] [Image removed by sender.] -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.iotivity.org/pipermail/iotivity-dev/attachments/20161214/59cc79db/attachment.html> -------------- next part -------------- A non-text attachment was scrubbed... Name: image001.gif Type: image/gif Size: 13402 bytes Desc: image001.gif URL: <http://lists.iotivity.org/pipermail/iotivity-dev/attachments/20161214/59cc79db/attachment.gif> -------------- next part -------------- A non-text attachment was scrubbed... Name: image002.jpg Type: image/jpeg Size: 823 bytes Desc: image002.jpg URL: <http://lists.iotivity.org/pipermail/iotivity-dev/attachments/20161214/59cc79db/attachment.jpg>
