Android Studio project created for Easy Setup Android application

1) Removed support for Eclipse project
2) Modified the project settings and project folder structure to suit the Android Studio

Change-Id: I8a433b1002b242c4c1c5d59b88a41e1f8962e4e0
Signed-off-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1578
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/easy-setup/sampleapp/android/EasySetup/.classpath b/service/easy-setup/sampleapp/android/EasySetup/.classpath
deleted file mode 100644 (file)
index c30d6df..0000000
--- a/service/easy-setup/sampleapp/android/EasySetup/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>\r
-       <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>\r
-       <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="src" path="gen"/>\r
-       <classpathentry combineaccessrules="false" kind="src" path="/EasySetupCore"/>\r
-       <classpathentry kind="output" path="bin/classes"/>\r
-</classpath>\r

diff --git a/service/easy-setup/sampleapp/android/EasySetup/.project b/service/easy-setup/sampleapp/android/EasySetup/.project
deleted file mode 100644 (file)
index 5e22258..0000000
--- a/service/easy-setup/sampleapp/android/EasySetup/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>EasySetup</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-               <buildCommand>\r
-                       <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-               <buildCommand>\r
-                       <name>com.android.ide.eclipse.adt.ApkBuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>com.android.ide.eclipse.adt.AndroidNature</nature>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-       </natures>\r
-</projectDescription>\r

diff --git a/service/easy-setup/sampleapp/android/EasySetup/EasySetupGradle.iml b/service/easy-setup/sampleapp/android/EasySetup/EasySetupGradle.iml
new file mode 100644 (file)
index 0000000..4ac7e4f
--- /dev/null
+++ b/service/easy-setup/sampleapp/android/EasySetup/EasySetupGradle.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="EasySetupGradle" 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="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

diff --git a/service/easy-setup/sampleapp/android/EasySetup/app/app.iml b/service/easy-setup/sampleapp/android/EasySetup/app/app.iml
new file mode 100644 (file)
index 0000000..e08d4b5
--- /dev/null
+++ b/service/easy-setup/sampleapp/android/EasySetup/app/app.iml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="EasySetupGradle" 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=":app" />
+      </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="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <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="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </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/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/EasySetupGradle/easySetupCore-debug/unspecified/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/EasySetupGradle/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="easySetupCore-debug" exported="" />
+    <orderEntry type="module" module-name="iotivity-armeabi-base-debug" exported="" />
+    <orderEntry type="library" exported="" name="easySetupCore-debug-unspecified" level="project" />
+    <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/sampleapp/android/EasySetup/app/build.gradle b/service/easy-setup/sampleapp/android/EasySetup/app/build.gradle
new file mode 100644 (file)
index 0000000..c30034a
--- /dev/null
+++ b/service/easy-setup/sampleapp/android/EasySetup/app/build.gradle
@@ -0,0 +1,23 @@
+apply plugin: 'com.android.application'\r
+android {\r
+    compileSdkVersion 21\r
+    buildToolsVersion '21.1.2'\r
+\r
+    defaultConfig {\r
+        applicationId "org.iotivity.service.easysetup"\r
+        minSdkVersion 21\r
+        targetSdkVersion 21\r
+    }\r
+\r
+    buildTypes {\r
+        release {\r
+            minifyEnabled false\r
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'\r
+        }\r
+    }\r
+}\r
+\r
+dependencies {\r
+    compile project(':iotivity-armeabi-base-debug')\r
+    compile project(':easySetupCore-debug')\r
+}
\ No newline at end of file

diff --git a/service/easy-setup/sampleapp/android/EasySetup/AndroidManifest.xml b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/AndroidManifest.xml
similarity index 96%
rename from service/easy-setup/sampleapp/android/EasySetup/AndroidManifest.xml
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/AndroidManifest.xml
index bce0044..e65794b 100644 (file)
--- a/service/easy-setup/sampleapp/android/EasySetup/AndroidManifest.xml
+++ b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"\r
-    package="org.iotivity.service.easysetup"\r
-    android:versionCode="1"\r
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.iotivity.service.easysetup"
+    android:versionCode="1"
     android:versionName="1.0" >
     
     <uses-permission android:name="android.permission.INTERNET" />
@@ -12,12 +12,9 @@
        <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
        <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
 
-    <uses-permission android:name="android.permission.CAMERA"/>\r
-\r
-    <uses-sdk\r
-        android:minSdkVersion="8"\r
-        android:targetSdkVersion="21" />
-    
+    <uses-permission android:name="android.permission.CAMERA"/>
+
+
      <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
@@ -70,6 +67,6 @@
             android:windowSoftInputMode="stateAlwaysHidden">
         </activity>
 
-    </application>\r
-\r
-</manifest>\r
+    </application>
+
+</manifest>

diff --git a/service/easy-setup/sampleapp/android/EasySetup/src/org/iotivity/service/easysetup/MainActivity.java b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
similarity index 87%
rename from service/easy-setup/sampleapp/android/EasySetup/src/org/iotivity/service/easysetup/MainActivity.java
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
index fb9fb47..5d87d6a 100644 (file)
--- a/service/easy-setup/sampleapp/android/EasySetup/src/org/iotivity/service/easysetup/MainActivity.java
+++ b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
@@ -22,8 +22,12 @@ package org.iotivity.service.easysetup;
 import java.util.Timer;\r
 import java.util.TimerTask;\r
 \r
+import org.iotivity.base.ModeType;\r
+import org.iotivity.base.OcPlatform;\r
+import org.iotivity.base.PlatformConfig;\r
+import org.iotivity.base.QualityOfService;\r
+import org.iotivity.base.ServiceType;\r
 import org.iotivity.service.easysetup.mediator.EnrolleeInfo;\r
-import org.iotivity.service.easysetup.mediator.EasySetupManager;\r
 import org.iotivity.service.easysetup.mediator.IOnBoardingStatus;\r
 import org.iotivity.service.easysetup.mediator.IProvisioningListener;\r
 import org.iotivity.service.easysetup.mediator.OnBoardEnrollee;\r
@@ -70,10 +74,6 @@ public class MainActivity extends Activity implements IProvisioningListener,
         onBoardingHandlerInstance = new OnBoardEnrollee(this);\r
         onBoardingHandlerInstance.registerOnBoardingStatusHandler(this);\r
 \r
-        // Provisioning Process\r
-        provisionEnrolleInstance = new ProvisionEnrollee(this);\r
-        provisionEnrolleInstance.registerProvisioningHandler(this);\r
-\r
         // Get intent, action and MIME type\r
         Intent intent = getIntent();\r
         String action = intent.getAction();\r
@@ -90,6 +90,7 @@ public class MainActivity extends Activity implements IProvisioningListener,
         addListenerForStartAP();\r
         addListenerForStopAP();\r
         addListenerOnProvisioning();\r
+        initOICStack();\r
 \r
         myTimer2 = new Timer();\r
         myTimer2.schedule(new TimerTask() {\r
@@ -103,7 +104,10 @@ public class MainActivity extends Activity implements IProvisioningListener,
 \r
     public void onDestroy() {\r
         super.onDestroy();\r
-        provisionEnrolleInstance.stopEnrolleeProvisioning(0);\r
+        if(provisionEnrolleInstance != null)\r
+        {\r
+            provisionEnrolleInstance.stopEnrolleeProvisioning(0);\r
+        }\r
         onBoardingHandlerInstance.disableWiFiAP();\r
         finish();\r
     }\r
@@ -201,14 +205,14 @@ public class MainActivity extends Activity implements IProvisioningListener,
             @Override\r
             public void onClick(View arg0) {\r
                 WifiConfiguration netConfig = new WifiConfiguration();\r
-                netConfig.SSID = "EasyConnect";\r
+                netConfig.SSID = "EasySetup123";\r
                 netConfig.allowedAuthAlgorithms\r
                         .set(WifiConfiguration.AuthAlgorithm.OPEN);\r
                 // netConfig.allowedProtocols.set(WifiConfiguration.Protocol.RSN);\r
                 // netConfig.allowedProtocols.set(WifiConfiguration.Protocol.WPA);\r
                 netConfig.allowedKeyManagement\r
                         .set(WifiConfiguration.KeyMgmt.WPA_PSK);\r
-                netConfig.preSharedKey = "EasyConnect";\r
+                netConfig.preSharedKey = "EasySetup123";\r
                 // netConfig.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);\r
                 // netConfig.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.TKIP);\r
                 // netConfig.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);\r
@@ -236,8 +240,8 @@ public class MainActivity extends Activity implements IProvisioningListener,
             @Override\r
             public void onClick(View arg0) {\r
                 provisionEnrolleInstance.provisionEnrollee(\r
-                        connectedDevice.getIpAddr(), "NewAccessPoint",\r
-                        "NewAccessPoint", 0);\r
+                        connectedDevice.getIpAddr(), "EasySetup123",\r
+                        "EasySetup123", 0);\r
                 easySetupCount++;\r
                 Log.i("EasyConnect", "easy Setup Count-" + easySetupCount);\r
                 Log.i("EasyConnect",\r
@@ -256,6 +260,22 @@ public class MainActivity extends Activity implements IProvisioningListener,
         }\r
     }\r
 \r
+    /**\r
+     * configure OIC platform and call findResource\r
+     */\r
+    private void initOICStack() {\r
+        //create platform config\r
+        PlatformConfig cfg = new PlatformConfig(\r
+                this,\r
+                ServiceType.IN_PROC,\r
+                ModeType.CLIENT,\r
+                "0.0.0.0", // bind to all available interfaces\r
+                0,\r
+                QualityOfService.LOW);\r
+        OcPlatform.Configure(cfg);\r
+        Log.i("EasyConnect","OcPlatform Configure is invoked");\r
+    }\r
+\r
     @Override\r
     public void deviceOnBoardingStatus(EnrolleeInfo enrolleStatus) {\r
         // TODO Auto-generated method stub\r
@@ -274,6 +294,11 @@ public class MainActivity extends Activity implements IProvisioningListener,
                  * "IP Address-"+enrolleStatus.getIpAddr());\r
                  */\r
                 connectedDevice = enrolleStatus;\r
+\r
+                // Only after onboarding is successful, provisioning is performed\r
+                provisionEnrolleInstance = new ProvisionEnrollee(this);\r
+                provisionEnrolleInstance.registerProvisioningHandler(this);\r
+\r
             } else {\r
                 finalResult = "Device Removed" + "["\r
                         + enrolleStatus.getIpAddr() + "]";\r

diff --git a/service/easy-setup/sampleapp/android/EasySetup/res/drawable-hdpi/background.png b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/drawable-hdpi/background.png
similarity index 100%
rename from service/easy-setup/sampleapp/android/EasySetup/res/drawable-hdpi/background.png
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/drawable-hdpi/background.png

diff --git a/service/easy-setup/sampleapp/android/EasySetup/res/drawable-hdpi/cancel.png b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/drawable-hdpi/cancel.png
similarity index 100%
rename from service/easy-setup/sampleapp/android/EasySetup/res/drawable-hdpi/cancel.png
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/drawable-hdpi/cancel.png

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/res/drawable-hdpi/ic_launcher.png b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/res/drawable-hdpi/ic_launcher.png
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/drawable-hdpi/ic_launcher.png

diff --git a/service/easy-setup/sampleapp/android/EasySetup/res/drawable-hdpi/icon.png b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/drawable-hdpi/icon.png
similarity index 100%
rename from service/easy-setup/sampleapp/android/EasySetup/res/drawable-hdpi/icon.png
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/drawable-hdpi/icon.png

diff --git a/service/easy-setup/sampleapp/android/EasySetup/res/layout/activity_main.xml b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from service/easy-setup/sampleapp/android/EasySetup/res/layout/activity_main.xml
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/layout/activity_main.xml

diff --git a/service/easy-setup/sampleapp/android/EasySetup/res/layout/capture.xml b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/layout/capture.xml
similarity index 99%
rename from service/easy-setup/sampleapp/android/EasySetup/res/layout/capture.xml
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/layout/capture.xml
index 544094d..e348ab0 100644 (file)
--- a/service/easy-setup/sampleapp/android/EasySetup/res/layout/capture.xml
+++ b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/layout/capture.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
  Copyright (C) 2008 ZXing authors
 

diff --git a/service/easy-setup/sampleapp/android/EasySetup/res/layout/decoder.xml b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/layout/decoder.xml
similarity index 97%
rename from service/easy-setup/sampleapp/android/EasySetup/res/layout/decoder.xml
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/layout/decoder.xml
index 3099f59..2471abb 100644 (file)
--- a/service/easy-setup/sampleapp/android/EasySetup/res/layout/decoder.xml
+++ b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/layout/decoder.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
  Copyright (C) 2008 ZXing authors
 

diff --git a/service/easy-setup/sampleapp/android/EasySetup/res/layout/encoder.xml b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/layout/encoder.xml
similarity index 98%
rename from service/easy-setup/sampleapp/android/EasySetup/res/layout/encoder.xml
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/layout/encoder.xml
index d3fdec7..586fb1e 100644 (file)
--- a/service/easy-setup/sampleapp/android/EasySetup/res/layout/encoder.xml
+++ b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/layout/encoder.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
  Copyright (C) 2008 ZXing authors
 

diff --git a/service/easy-setup/sampleapp/android/EasySetup/res/menu/main.xml b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/menu/main.xml
similarity index 100%
rename from service/easy-setup/sampleapp/android/EasySetup/res/menu/main.xml
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/menu/main.xml

diff --git a/service/easy-setup/sampleapp/android/EasySetup/res/values/colors.xml b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/values/colors.xml
similarity index 97%
rename from service/easy-setup/sampleapp/android/EasySetup/res/values/colors.xml
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/values/colors.xml
index 3dea3d5..4643dce 100644 (file)
--- a/service/easy-setup/sampleapp/android/EasySetup/res/values/colors.xml
+++ b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/values/colors.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
  Copyright (C) 2008 ZXing authors
 

diff --git a/service/easy-setup/sampleapp/android/EasySetup/res/values/dimens.xml b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/values/dimens.xml
similarity index 100%
rename from service/easy-setup/sampleapp/android/EasySetup/res/values/dimens.xml
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/values/dimens.xml

diff --git a/service/easy-setup/sampleapp/android/EasySetup/res/values/ids.xml b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/values/ids.xml
similarity index 95%
rename from service/easy-setup/sampleapp/android/EasySetup/res/values/ids.xml
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/values/ids.xml
index fc4a1e5..45b2fe1 100644 (file)
--- a/service/easy-setup/sampleapp/android/EasySetup/res/values/ids.xml
+++ b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/values/ids.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
  Copyright (C) 2008 ZXing authors
 

diff --git a/service/easy-setup/sampleapp/android/EasySetup/res/values/strings.xml b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/values/strings.xml
similarity index 100%
rename from service/easy-setup/sampleapp/android/EasySetup/res/values/strings.xml
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/values/strings.xml

diff --git a/service/easy-setup/sampleapp/android/EasySetup/res/values/styles.xml b/service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/values/styles.xml
similarity index 100%
rename from service/easy-setup/sampleapp/android/EasySetup/res/values/styles.xml
rename to service/easy-setup/sampleapp/android/EasySetup/app/src/main/res/values/styles.xml

diff --git a/service/easy-setup/sampleapp/android/EasySetup/build.gradle b/service/easy-setup/sampleapp/android/EasySetup/build.gradle
new file mode 100644 (file)
index 0000000..0a7f6ce
--- /dev/null
+++ b/service/easy-setup/sampleapp/android/EasySetup/build.gradle
@@ -0,0 +1,15 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.\r
+buildscript {\r
+    repositories {\r
+        jcenter()\r
+    }\r
+    dependencies {\r
+        classpath 'com.android.tools.build:gradle:1.2.3'\r
+    }\r
+}\r
+\r
+allprojects {\r
+    repositories {\r
+        jcenter()\r
+    }\r
+}\r

diff --git a/service/easy-setup/sampleapp/android/EasySetup/easySetupCore-debug/build.gradle b/service/easy-setup/sampleapp/android/EasySetup/easySetupCore-debug/build.gradle
new file mode 100644 (file)
index 0000000..4213d41
--- /dev/null
+++ b/service/easy-setup/sampleapp/android/EasySetup/easySetupCore-debug/build.gradle
@@ -0,0 +1,2 @@
+configurations.create("default")
+artifacts.add("default", file('easySetupCore-debug.aar'))
\ No newline at end of file

diff --git a/service/easy-setup/sampleapp/android/EasySetup/easySetupCore-debug/easySetupCore-debug.iml b/service/easy-setup/sampleapp/android/EasySetup/easySetupCore-debug/easySetupCore-debug.iml
new file mode 100644 (file)
index 0000000..639192d
--- /dev/null
+++ b/service/easy-setup/sampleapp/android/EasySetup/easySetupCore-debug/easySetupCore-debug.iml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":easySetupCore-debug" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="EasySetupGradle" 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=":easySetupCore-debug" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

diff --git a/service/easy-setup/sampleapp/android/EasySetup/iotivity-armeabi-base-debug/build.gradle b/service/easy-setup/sampleapp/android/EasySetup/iotivity-armeabi-base-debug/build.gradle
new file mode 100644 (file)
index 0000000..65c8cbe
--- /dev/null
+++ b/service/easy-setup/sampleapp/android/EasySetup/iotivity-armeabi-base-debug/build.gradle
@@ -0,0 +1,2 @@
+configurations.create("default")
+artifacts.add("default", file('iotivity-armeabi-base-debug.aar'))
\ No newline at end of file

diff --git a/service/easy-setup/sampleapp/android/EasySetup/iotivity-armeabi-base-debug/iotivity-armeabi-base-debug.iml b/service/easy-setup/sampleapp/android/EasySetup/iotivity-armeabi-base-debug/iotivity-armeabi-base-debug.iml
new file mode 100644 (file)
index 0000000..905c956
--- /dev/null
+++ b/service/easy-setup/sampleapp/android/EasySetup/iotivity-armeabi-base-debug/iotivity-armeabi-base-debug.iml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":iotivity-armeabi-base-debug" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="EasySetupGradle" 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=":iotivity-armeabi-base-debug" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

diff --git a/service/easy-setup/sampleapp/android/EasySetup/project.properties b/service/easy-setup/sampleapp/android/EasySetup/project.properties
deleted file mode 100644 (file)
index 4630921..0000000
--- a/service/easy-setup/sampleapp/android/EasySetup/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-21
-android.library.reference.1=../../../sdk/android/EasySetupCore

diff --git a/service/easy-setup/sampleapp/android/EasySetup/settings.gradle b/service/easy-setup/sampleapp/android/EasySetup/settings.gradle
new file mode 100644 (file)
index 0000000..40189da
--- /dev/null
+++ b/service/easy-setup/sampleapp/android/EasySetup/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':iotivity-armeabi-base-debug', ':easySetupCore-debug'\r

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/build.gradle b/service/easy-setup/sdk/mediator/android/EasySetupCore/build.gradle
new file mode 100644 (file)
index 0000000..9e550de
--- /dev/null
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/build.gradle
@@ -0,0 +1,36 @@
+apply plugin: 'com.android.library'\r
+// Top-level build file where you can add configuration options common to all sub-projects/modules.\r
+buildscript {\r
+    repositories {\r
+        jcenter()\r
+    }\r
+    dependencies {\r
+        classpath 'com.android.tools.build:gradle:1.2.3'\r
+    }\r
+}\r
+\r
+allprojects {\r
+    repositories {\r
+        jcenter()\r
+    }\r
+}\r
+\r
+android {\r
+    compileSdkVersion 21\r
+    buildToolsVersion '21.1.2'\r
+\r
+    defaultConfig {\r
+        minSdkVersion 21\r
+        targetSdkVersion 21\r
+    }\r
+\r
+    buildTypes {\r
+        release {\r
+            minifyEnabled false\r
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'\r
+        }\r
+    }\r
+}\r
+\r
+dependencies {\r
+}
\ No newline at end of file

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/easySetupCore.iml b/service/easy-setup/sdk/mediator/android/EasySetupCore/easySetupCore.iml
new file mode 100644 (file)
index 0000000..14046e3
--- /dev/null
+++ b/service/easy-setup/sdk/mediator/android/EasySetupCore/easySetupCore.iml
@@ -0,0 +1,91 @@
+<?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="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <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="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/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/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/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" />
+  </component>
+</module>
\ No newline at end of file

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/project.properties b/service/easy-setup/sdk/mediator/android/EasySetupCore/project.properties
deleted file mode 100644 (file)
index 93c8c3c..0000000
--- a/service/easy-setup/sdk/mediator/android/EasySetupCore/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-21
-android.library=true

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/AndroidManifest.xml b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/AndroidManifest.xml
similarity index 100%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/AndroidManifest.xml
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/AndroidManifest.xml

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/EasySetupCallbackHandler.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupCallbackHandler.java
similarity index 100%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/EasySetupCallbackHandler.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupCallbackHandler.java

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/EasySetupManager.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupManager.java
similarity index 100%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/EasySetupManager.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupManager.java

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/EnrolleeInfo.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeInfo.java
similarity index 100%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/EnrolleeInfo.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeInfo.java

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/EnrolleeOnBoardingInfo.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeOnBoardingInfo.java
similarity index 100%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/EnrolleeOnBoardingInfo.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeOnBoardingInfo.java

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/IOnBoardingStatus.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/IOnBoardingStatus.java
similarity index 100%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/IOnBoardingStatus.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/IOnBoardingStatus.java

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/IProvisioningListener.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/IProvisioningListener.java
similarity index 100%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/IProvisioningListener.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/IProvisioningListener.java

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/OnBoardEnrollee.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardEnrollee.java
similarity index 100%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/OnBoardEnrollee.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/OnBoardEnrollee.java

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java
similarity index 100%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/WiFiSoftAPManager.java b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/WiFiSoftAPManager.java
similarity index 100%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/src/org/iotivity/service/easysetup/mediator/WiFiSoftAPManager.java
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/WiFiSoftAPManager.java

diff --git a/service/easy-setup/sampleapp/android/EasySetup/res/drawable-hdpi/ic_launcher.png b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from service/easy-setup/sampleapp/android/EasySetup/res/drawable-hdpi/ic_launcher.png
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/res/drawable-hdpi/ic_launcher.png

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/res/values/strings.xml b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/res/values/strings.xml
similarity index 100%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/res/values/strings.xml
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/res/values/strings.xml

diff --git a/service/easy-setup/sdk/mediator/android/EasySetupCore/res/values/styles.xml b/service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/res/values/styles.xml
similarity index 100%
rename from service/easy-setup/sdk/mediator/android/EasySetupCore/res/values/styles.xml
rename to service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/res/values/styles.xml