[Easy-Setup] Updated Doxygen and javadoc

- Updated Doxygen and javadoc updates for easysetup service based
  on latest folder structure

Change-Id: I4a3d888fb30a6a334aba3d7cd5fe4ed019b2ed75
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5825
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/resource/docs/Doxyfile b/resource/docs/Doxyfile
index 363635a..2472fd5 100644 (file)
--- a/resource/docs/Doxyfile
+++ b/resource/docs/Doxyfile
@@ -32,7 +32,7 @@ PROJECT_NAME           = "IoTivity C++ SDK"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 
+PROJECT_NUMBER         =
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
@@ -676,11 +676,13 @@ INPUT                  = . \
                          ../../service/resource-container/bundle-api/include \
                          ../../service/things-manager/sdk/inc/ThingsConfiguration.h \
                          ../../service/things-manager/sdk/inc/ThingsMaintenance.h \
-                         ../../service/easy-setup/sdk/common \
-                         ../../service/easy-setup/sdk/enrollee/api \
-                        ../../service/resource-directory/include \
-                        ../../service/scene-manager/include \
-                        
+                         ../../service/easy-setup/mediator/richsdk/inc/ \
+                         ../../service/easy-setup/enrollee/inc \
+                         ../../service/easy-setup/enrollee/src/softap.h \
+                         ../../service/easy-setup/inc \
+                         ../../service/resource-directory/include \
+                         ../../service/scene-manager/include \
+
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

diff --git a/resource/docs/javadocGen.sh b/resource/docs/javadocGen.sh
index 64d81b1..2e339fe 100755 (executable)
--- a/resource/docs/javadocGen.sh
+++ b/resource/docs/javadocGen.sh
@@ -1,5 +1,5 @@
 #******************************************************************
-# JAVA API generation 
+# JAVA API generation
 #
 # BASE
 #
@@ -32,7 +32,7 @@ RH_PATH="../../service/resource-hosting/android/resource_hosting/src/"
 RH_PKG=org.iotivity.ResourceHosting
 
 
-EASYSETUP_PATH="../../service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/"
+EASYSETUP_PATH="../../service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/"
 EASYSETUP_PKG=org.iotivity.service.easysetup.mediator
 
 SIMULATOR_PATH="../../service/simulator/java/sdk/src/"