[easy-setup] Android package name changed for sdk

- Changed package name for Easysetup setup Android sdk

Change-Id: Id80f23dc49bd5fdc8f1e04cc09d4292c43552d15
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3685
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

diff --git a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
old mode 100644 (file)
new mode 100755 (executable)
index 63b7f9e..4153496
--- a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
+++ b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
@@ -24,14 +24,13 @@ package org.iotivity.service.easysetup;
 \r
 import java.io.IOException;\r
 \r
-import org.iotivity.service.easysetup.core.EasySetupService;\r
-import org.iotivity.service.easysetup.core.EasySetupStatus;\r
-import org.iotivity.service.easysetup.core.EnrolleeDevice;\r
-import org.iotivity.service.easysetup.core.EnrolleeState;\r
-import org.iotivity.service.easysetup.core.IpOnBoardingConnection;\r
-import org.iotivity.service.easysetup.impl.EnrolleeDeviceFactory;\r
-import org.iotivity.service.easysetup.impl.WiFiOnBoardingConfig;\r
-import org.iotivity.service.easysetup.impl.WiFiProvConfig;\r
+import org.iotivity.service.easysetup.mediator.EasySetupService;\r
+import org.iotivity.service.easysetup.mediator.EasySetupStatus;\r
+import org.iotivity.service.easysetup.mediator.EnrolleeDevice;\r
+import org.iotivity.service.easysetup.mediator.IpOnBoardingConnection;\r
+import org.iotivity.service.easysetup.mediator.EnrolleeDeviceFactory;\r
+import org.iotivity.service.easysetup.mediator.WiFiOnBoardingConfig;\r
+import org.iotivity.service.easysetup.mediator.WiFiProvConfig;\r
 \r
 import android.app.Activity;\r
 import android.net.wifi.WifiConfiguration;\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/easySetupCore.iml b/service/easy-setup/sdk/mediator/android/EasySetupCore/easySetupCore.iml
deleted file mode 100644 (file)
index 915035d..0000000
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/easySetupCore.iml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="EasySetupCore" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java/common" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java/interface" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/EasySetupCore/iotivity-armeabi-base-debug/unspecified/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="iotivity-armeabi-base-debug" exported="" />
-    <orderEntry type="library" exported="" name="iotivity-armeabi-base-debug-unspecified" level="project" />
-  </component>
-</module>
\ No newline at end of file

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupServiceConfigTest.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/EasySetupServiceConfigTest.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 89%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupServiceConfigTest.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/EasySetupServiceConfigTest.java
index 7666a11..54fec21
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupServiceConfigTest.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/EasySetupServiceConfigTest.java
@@ -20,14 +20,10 @@
  * ****************************************************************\r
  */\r
 \r
-package org.iotivity.service.easysetup.core;\r
+package org.iotivity.service.easysetup.mediator;\r
 \r
 import android.test.AndroidTestCase;\r
 \r
-import junit.framework.Assert;\r
-\r
-import org.iotivity.service.easysetup.impl.EnrolleeDeviceFactory;\r
-\r
 \r
 public class EasySetupServiceConfigTest extends AndroidTestCase {\r
 \r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupServiceTest.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/EasySetupServiceTest.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 91%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupServiceTest.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/EasySetupServiceTest.java
index 3e3058c..9ac1a18
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupServiceTest.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/EasySetupServiceTest.java
@@ -17,17 +17,12 @@
 // limitations under the License.\r
 //\r
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
-package org.iotivity.service.easysetup.core;\r
+package org.iotivity.service.easysetup.mediator;\r
 \r
 import android.net.wifi.WifiConfiguration;\r
 import android.test.AndroidTestCase;\r
 import android.util.Log;\r
 \r
-import org.iotivity.service.easysetup.impl.EnrolleeDeviceFactory;\r
-import org.iotivity.service.easysetup.impl.EnrolleeDeviceWiFiOnboarding;\r
-import org.iotivity.service.easysetup.impl.WiFiOnBoardingConfig;\r
-import org.iotivity.service.easysetup.impl.WiFiProvConfig;\r
-\r
 import java.io.IOException;\r
 \r
 public class EasySetupServiceTest extends AndroidTestCase {\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupStatusTest.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/EasySetupStatusTest.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 95%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupStatusTest.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/EasySetupStatusTest.java
index c52b05c..d1a1370
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EasySetupStatusTest.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/EasySetupStatusTest.java
@@ -17,17 +17,12 @@
 // limitations under the License.
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-package org.iotivity.service.easysetup.core;
+package org.iotivity.service.easysetup.mediator;
 
 import android.net.wifi.WifiConfiguration;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
-import org.iotivity.service.easysetup.impl.EnrolleeDeviceFactory;
-import org.iotivity.service.easysetup.impl.EnrolleeDeviceWiFiOnboarding;
-import org.iotivity.service.easysetup.impl.WiFiOnBoardingConfig;
-import org.iotivity.service.easysetup.impl.WiFiProvConfig;
-
 import java.io.IOException;
 
 public class EasySetupStatusTest extends AndroidTestCase {

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EnrolleeDeviceFactoryTest.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/EnrolleeDeviceFactoryTest.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 85%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EnrolleeDeviceFactoryTest.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/EnrolleeDeviceFactoryTest.java
index 1c803d1..42114c9
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/EnrolleeDeviceFactoryTest.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/EnrolleeDeviceFactoryTest.java
@@ -20,16 +20,11 @@
  * ****************************************************************\r
  */\r
 \r
-package org.iotivity.service.easysetup.core;\r
+package org.iotivity.service.easysetup.mediator;\r
 \r
 import android.net.wifi.WifiConfiguration;\r
 import android.test.AndroidTestCase;\r
 \r
-import org.iotivity.service.easysetup.impl.EnrolleeDeviceFactory;\r
-import org.iotivity.service.easysetup.impl.EnrolleeDeviceWiFiOnboarding;\r
-import org.iotivity.service.easysetup.impl.WiFiOnBoardingConfig;\r
-import org.iotivity.service.easysetup.impl.WiFiProvConfig;\r
-\r
 public class EnrolleeDeviceFactoryTest extends AndroidTestCase {\r
 \r
     EnrolleeDeviceFactory mFactory;\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/Utility.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/Utility.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 93%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/Utility.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/Utility.java
index 0044929..84b2c7e
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/core/Utility.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/androidTest/java/org/iotivity/service/easysetup/mediator/Utility.java
@@ -19,7 +19,7 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
 \r
 \r
-package org.iotivity.service.easysetup.core;\r
+package org.iotivity.service.easysetup.mediator;\r
 \r
 \r
 public class Utility {\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupCallbackHandler.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupCallbackHandler.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 94%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupCallbackHandler.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupCallbackHandler.java
index cb06fb8..685a12a
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupCallbackHandler.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupCallbackHandler.java
@@ -19,7 +19,7 @@
  * <p>\r
  * ****************************************************************\r
  */\r
-package org.iotivity.service.easysetup.mediator;\r
+package org.iotivity.service.easysetup.core;\r
 \r
 import android.util.Log;\r
 \r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupManager.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupManager.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 95%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupManager.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupManager.java
index 3d9ea43..c85b051
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupManager.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupManager.java
@@ -19,7 +19,7 @@
  * <p>\r
  * ****************************************************************\r
  */\r
-package org.iotivity.service.easysetup.mediator;\r
+package org.iotivity.service.easysetup.core;\r
 \r
 import android.content.Context;\r
 \r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeInfo.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeInfo.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 96%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeInfo.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeInfo.java
index 37adeaa..29b7432
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeInfo.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeInfo.java
@@ -20,7 +20,7 @@
  * ****************************************************************
  */
 
-package org.iotivity.service.easysetup.mediator;
+package org.iotivity.service.easysetup.core;
 
 public class EnrolleeInfo {
 

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeOnBoardingInfo.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeOnBoardingInfo.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 98%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeOnBoardingInfo.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeOnBoardingInfo.java
index 5fe3f80..cb67017
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeOnBoardingInfo.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeOnBoardingInfo.java
@@ -19,7 +19,7 @@
  * <p>
  * ****************************************************************
  */
-package org.iotivity.service.easysetup.mediator;
+package org.iotivity.service.easysetup.core;
 
 public class EnrolleeOnBoardingInfo {
 

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/IOnBoardingStatus.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/IOnBoardingStatus.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 88%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/IOnBoardingStatus.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/IOnBoardingStatus.java
index 03fb342..c709af8
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/IOnBoardingStatus.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/IOnBoardingStatus.java
@@ -19,11 +19,7 @@
  * <p>
  * ****************************************************************
  */
-package org.iotivity.service.easysetup.mediator;
-
-import java.util.ArrayList;
-
-import org.iotivity.service.easysetup.mediator.EnrolleeInfo;
+package org.iotivity.service.easysetup.core;
 
 public interface IOnBoardingStatus {
 

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/IProvisioningListener.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/IProvisioningListener.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 92%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/IProvisioningListener.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/IProvisioningListener.java
index 315bef8..8c0118f
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/IProvisioningListener.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/IProvisioningListener.java
@@ -19,7 +19,7 @@
  * <p>\r
  * ****************************************************************\r
  */\r
-package org.iotivity.service.easysetup.mediator;\r
+package org.iotivity.service.easysetup.core;\r
 \r
 public interface IProvisioningListener {\r
     /**\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ProvisionEnrollee.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 95%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ProvisionEnrollee.java
index ef0cbb1..e98bd66
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ProvisionEnrollee.java
@@ -20,7 +20,7 @@
  * ****************************************************************\r
  */\r
 \r
-package org.iotivity.service.easysetup.mediator;\r
+package org.iotivity.service.easysetup.core;\r
 \r
 import android.content.Context;\r
 import android.util.Log;\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ip/WiFiSoftAPManager.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ip/WiFiSoftAPManager.java
similarity index 98%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ip/WiFiSoftAPManager.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ip/WiFiSoftAPManager.java
index 7e08f2b..40bfd12 100755 (executable)
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ip/WiFiSoftAPManager.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ip/WiFiSoftAPManager.java
@@ -20,7 +20,7 @@
  * ****************************************************************
  */
 
-package org.iotivity.service.easysetup.mediator.ip;
+package org.iotivity.service.easysetup.core.ip;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;
@@ -35,9 +35,9 @@ import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.util.Log;
 
-import org.iotivity.service.easysetup.mediator.EnrolleeInfo;
-import org.iotivity.service.easysetup.mediator.EnrolleeOnBoardingInfo;
-import org.iotivity.service.easysetup.mediator.IOnBoardingStatus;
+import org.iotivity.service.easysetup.core.EnrolleeInfo;
+import org.iotivity.service.easysetup.core.EnrolleeOnBoardingInfo;
+import org.iotivity.service.easysetup.core.IOnBoardingStatus;
 
 /**
  * WiFiSoftAPManager provides wrapper methods for accessing Android Soft Access Point functionality.

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupService.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupService.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 94%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupService.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupService.java
index a573416..5e764a7
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupService.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupService.java
@@ -20,13 +20,13 @@
  * ****************************************************************\r
  */\r
 \r
-package org.iotivity.service.easysetup.core;\r
+package org.iotivity.service.easysetup.mediator;\r
 \r
 import android.content.Context;\r
 import android.util.Log;\r
 \r
-import org.iotivity.service.easysetup.mediator.EasySetupManager;\r
-import org.iotivity.service.easysetup.mediator.ProvisionEnrollee;\r
+import org.iotivity.service.easysetup.core.EasySetupManager;\r
+import org.iotivity.service.easysetup.core.ProvisionEnrollee;\r
 \r
 import java.io.IOException;\r
 import java.util.ArrayList;\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupStatus.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupStatus.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 97%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupStatus.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupStatus.java
index 4ad785a..b9da262
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupStatus.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupStatus.java
@@ -20,7 +20,7 @@
  * ****************************************************************
  */
 
-package org.iotivity.service.easysetup.core;
+package org.iotivity.service.easysetup.mediator;
 
 /**
  * This interface facilitates Application to get progress & result of Easy setup

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeDevice.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeDevice.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 96%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeDevice.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeDevice.java
index 2d87190..cdac2c5
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeDevice.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeDevice.java
@@ -20,7 +20,7 @@
  * ****************************************************************\r
  */\r
 \r
-package org.iotivity.service.easysetup.core;\r
+package org.iotivity.service.easysetup.mediator;\r
 \r
 /**\r
  * This is an abstract class represents the device being provisioned into the network. The\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceFactory.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeDeviceFactory.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 91%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceFactory.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeDeviceFactory.java
index 905ecaf..de7c7fb
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceFactory.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeDeviceFactory.java
@@ -20,14 +20,10 @@
  * ****************************************************************
  */
 
-package org.iotivity.service.easysetup.impl;
+package org.iotivity.service.easysetup.mediator;
 
 import android.content.Context;
 
-import org.iotivity.service.easysetup.core.EnrolleeDevice;
-import org.iotivity.service.easysetup.core.OnBoardingConfig;
-import org.iotivity.service.easysetup.core.ProvisioningConfig;
-
 /**
  * This a factory class provides the native implementation of the various Enrollee devices.
  * Application can make use of Enrollee factory if it does not want to create its own Enrollee devices.

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceWiFiOnboarding.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeDeviceWiFiOnboarding.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 86%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceWiFiOnboarding.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeDeviceWiFiOnboarding.java
index e525e62..09459a3
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceWiFiOnboarding.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeDeviceWiFiOnboarding.java
@@ -20,23 +20,17 @@
  * ****************************************************************\r
  */\r
 \r
-package org.iotivity.service.easysetup.impl;\r
+package org.iotivity.service.easysetup.mediator;\r
 \r
 import java.util.Timer;\r
 import java.util.TimerTask;\r
 \r
-import org.iotivity.service.easysetup.core.OnBoardingConnection;\r
-import org.iotivity.service.easysetup.core.EnrolleeDevice;\r
-import org.iotivity.service.easysetup.core.EnrolleeState;\r
-import org.iotivity.service.easysetup.core.IpOnBoardingConnection;\r
-import org.iotivity.service.easysetup.core.OnBoardingConfig;\r
-import org.iotivity.service.easysetup.core.ProvisioningConfig;\r
-import org.iotivity.service.easysetup.mediator.EasySetupManager;\r
-import org.iotivity.service.easysetup.mediator.EnrolleeInfo;\r
-import org.iotivity.service.easysetup.mediator.IOnBoardingStatus;\r
-import org.iotivity.service.easysetup.mediator.IProvisioningListener;\r
-import org.iotivity.service.easysetup.mediator.ProvisionEnrollee;\r
-import org.iotivity.service.easysetup.mediator.ip.WiFiSoftAPManager;\r
+import org.iotivity.service.easysetup.core.EasySetupManager;\r
+import org.iotivity.service.easysetup.core.EnrolleeInfo;\r
+import org.iotivity.service.easysetup.core.IOnBoardingStatus;\r
+import org.iotivity.service.easysetup.core.IProvisioningListener;\r
+import org.iotivity.service.easysetup.core.ProvisionEnrollee;\r
+import org.iotivity.service.easysetup.core.ip.WiFiSoftAPManager;\r
 \r
 import android.content.Context;\r
 import android.net.wifi.WifiConfiguration;\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeSetupError.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeSetupError.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 95%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeSetupError.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeSetupError.java
index 4c38cb1..036d24d
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeSetupError.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeSetupError.java
@@ -20,7 +20,7 @@
  * ****************************************************************
  */
 
-package org.iotivity.service.easysetup.core;
+package org.iotivity.service.easysetup.mediator;
 
 /**
  * This class defines constants for Errors comes during Easy setup process

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeState.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeState.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 97%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeState.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeState.java
index 8ce6dcf..7dcf602
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeState.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeState.java
@@ -20,7 +20,7 @@
  * ****************************************************************
  */
 
-package org.iotivity.service.easysetup.core;
+package org.iotivity.service.easysetup.mediator;
 
 /**
  * It defines various states of the Enrollee device during easy setup process

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/IpOnBoardingConnection.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/IpOnBoardingConnection.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 93%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/IpOnBoardingConnection.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/IpOnBoardingConnection.java
index 399d2f3..259514d
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/IpOnBoardingConnection.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/IpOnBoardingConnection.java
@@ -20,7 +20,7 @@
  * ****************************************************************\r
  */\r
 \r
-package org.iotivity.service.easysetup.core;\r
+package org.iotivity.service.easysetup.mediator;\r
 \r
 public class IpOnBoardingConnection implements OnBoardingConnection {\r
 \r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingCallback.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardingCallback.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 92%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingCallback.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardingCallback.java
index 5712722..60705fb
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingCallback.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardingCallback.java
@@ -20,7 +20,7 @@
  * ****************************************************************\r
  */\r
 \r
-package org.iotivity.service.easysetup.core;\r
+package org.iotivity.service.easysetup.mediator;\r
 \r
 public abstract class OnBoardingCallback {\r
     public abstract void onFinished(OnBoardingConnection connection);\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConfig.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardingConfig.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 94%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConfig.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardingConfig.java
index 6da4178..6aacce9
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConfig.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardingConfig.java
@@ -20,7 +20,7 @@
  * ****************************************************************\r
  */\r
 \r
-package org.iotivity.service.easysetup.core;\r
+package org.iotivity.service.easysetup.mediator;\r
 \r
 import org.iotivity.base.OcConnectivityType;\r
 \r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConnection.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardingConnection.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 93%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConnection.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardingConnection.java
index 342bd1f..622c693
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConnection.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardingConnection.java
@@ -19,7 +19,7 @@
  * <p/>\r
  * ****************************************************************\r
  */\r
-package org.iotivity.service.easysetup.core;\r
+package org.iotivity.service.easysetup.mediator;\r
 \r
 /**\r
  * This interface contains the connection details of the enrollee device\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ProvisioningCallback.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisioningCallback.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 95%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ProvisioningCallback.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisioningCallback.java
index d1656d0..569f6fe
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ProvisioningCallback.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisioningCallback.java
@@ -20,7 +20,7 @@
  * ****************************************************************
  */
 
-package org.iotivity.service.easysetup.core;
+package org.iotivity.service.easysetup.mediator;
 
 public abstract class ProvisioningCallback {
     public abstract void onFinished(EnrolleeDevice enrolledevice);

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ProvisioningConfig.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisioningConfig.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 96%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ProvisioningConfig.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisioningConfig.java
index 67fe38e..4c15217
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/ProvisioningConfig.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisioningConfig.java
@@ -20,7 +20,7 @@
  * ****************************************************************
  */
 
-package org.iotivity.service.easysetup.core;
+package org.iotivity.service.easysetup.mediator;
 /**
  * It contains configuration details about the the target network where Enrollee device is
  * going to be enrolled.

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/WiFiOnBoardingConfig.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/WiFiOnBoardingConfig.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 88%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/WiFiOnBoardingConfig.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/WiFiOnBoardingConfig.java
index adfc0d9..2477938
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/WiFiOnBoardingConfig.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/WiFiOnBoardingConfig.java
@@ -20,10 +20,9 @@
  * ****************************************************************\r
  */\r
 \r
-package org.iotivity.service.easysetup.impl;\r
+package org.iotivity.service.easysetup.mediator;\r
 \r
-import org.iotivity.service.easysetup.core.IpOnBoardingConnection;\r
-import org.iotivity.service.easysetup.core.OnBoardingConfig;\r
+import org.iotivity.service.easysetup.mediator.OnBoardingConfig;\r
 \r
 import android.net.wifi.WifiConfiguration;\r
 \r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/WiFiProvConfig.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/WiFiProvConfig.java
old mode 100644 (file)
new mode 100755 (executable)
similarity index 89%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/WiFiProvConfig.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/WiFiProvConfig.java
index 8d9ab15..c7e6359
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/WiFiProvConfig.java
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/WiFiProvConfig.java
@@ -20,12 +20,9 @@
  * ****************************************************************
  */
 
-package org.iotivity.service.easysetup.impl;
+package org.iotivity.service.easysetup.mediator;
 
-import org.iotivity.service.easysetup.core.ProvisioningConfig;
-import org.iotivity.service.easysetup.mediator.EnrolleeInfo;
-
-import android.net.wifi.WifiConfiguration;
+import org.iotivity.service.easysetup.mediator.ProvisioningConfig;
 
 /**
  * This class contains on provisioning configuration information for for target network.