Commit 5e467e2b authored by lankamadan's avatar lankamadan Committed by Madan Lanka

[easy-setup] Android package name changed for sdk

- Changed package name for Easysetup setup Android sdk

Change-Id: Id80f23dc49bd5fdc8f1e04cc09d4292c43552d15
Signed-off-by: default avatarlankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3685Tested-by: default avatarjenkins-iotivity <jenkins-iotivity@opendaylight.org>
parent adecb3e2
......@@ -24,14 +24,13 @@ package org.iotivity.service.easysetup;
import java.io.IOException;
import org.iotivity.service.easysetup.core.EasySetupService;
import org.iotivity.service.easysetup.core.EasySetupStatus;
import org.iotivity.service.easysetup.core.EnrolleeDevice;
import org.iotivity.service.easysetup.core.EnrolleeState;
import org.iotivity.service.easysetup.core.IpOnBoardingConnection;
import org.iotivity.service.easysetup.impl.EnrolleeDeviceFactory;
import org.iotivity.service.easysetup.impl.WiFiOnBoardingConfig;
import org.iotivity.service.easysetup.impl.WiFiProvConfig;
import org.iotivity.service.easysetup.mediator.EasySetupService;
import org.iotivity.service.easysetup.mediator.EasySetupStatus;
import org.iotivity.service.easysetup.mediator.EnrolleeDevice;
import org.iotivity.service.easysetup.mediator.IpOnBoardingConnection;
import org.iotivity.service.easysetup.mediator.EnrolleeDeviceFactory;
import org.iotivity.service.easysetup.mediator.WiFiOnBoardingConfig;
import org.iotivity.service.easysetup.mediator.WiFiProvConfig;
import android.app.Activity;
import android.net.wifi.WifiConfiguration;
......
<?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
......@@ -20,14 +20,10 @@
* ****************************************************************
*/
package org.iotivity.service.easysetup.core;
package org.iotivity.service.easysetup.mediator;
import android.test.AndroidTestCase;
import junit.framework.Assert;
import org.iotivity.service.easysetup.impl.EnrolleeDeviceFactory;
public class EasySetupServiceConfigTest extends AndroidTestCase {
......
......@@ -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 EasySetupServiceTest extends AndroidTestCase {
......
......@@ -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 {
......
......@@ -20,16 +20,11 @@
* ****************************************************************
*/
package org.iotivity.service.easysetup.core;
package org.iotivity.service.easysetup.mediator;
import android.net.wifi.WifiConfiguration;
import android.test.AndroidTestCase;
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;
public class EnrolleeDeviceFactoryTest extends AndroidTestCase {
EnrolleeDeviceFactory mFactory;
......
......@@ -19,7 +19,7 @@
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
package org.iotivity.service.easysetup.core;
package org.iotivity.service.easysetup.mediator;
public class Utility {
......
......@@ -19,7 +19,7 @@
* <p>
* ****************************************************************
*/
package org.iotivity.service.easysetup.mediator;
package org.iotivity.service.easysetup.core;
import android.util.Log;
......
......@@ -19,7 +19,7 @@
* <p>
* ****************************************************************
*/
package org.iotivity.service.easysetup.mediator;
package org.iotivity.service.easysetup.core;
import android.content.Context;
......
......@@ -20,7 +20,7 @@
* ****************************************************************
*/
package org.iotivity.service.easysetup.mediator;
package org.iotivity.service.easysetup.core;
public class EnrolleeInfo {
......
......@@ -19,7 +19,7 @@
* <p>
* ****************************************************************
*/
package org.iotivity.service.easysetup.mediator;
package org.iotivity.service.easysetup.core;
public class EnrolleeOnBoardingInfo {
......
......@@ -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 {
......
......@@ -19,7 +19,7 @@
* <p>
* ****************************************************************
*/
package org.iotivity.service.easysetup.mediator;
package org.iotivity.service.easysetup.core;
public interface IProvisioningListener {
/**
......
......@@ -20,7 +20,7 @@
* ****************************************************************
*/
package org.iotivity.service.easysetup.mediator;
package org.iotivity.service.easysetup.core;
import android.content.Context;
import android.util.Log;
......
......@@ -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.
......
......@@ -20,13 +20,13 @@
* ****************************************************************
*/
package org.iotivity.service.easysetup.core;
package org.iotivity.service.easysetup.mediator;
import android.content.Context;
import android.util.Log;
import org.iotivity.service.easysetup.mediator.EasySetupManager;
import org.iotivity.service.easysetup.mediator.ProvisionEnrollee;
import org.iotivity.service.easysetup.core.EasySetupManager;
import org.iotivity.service.easysetup.core.ProvisionEnrollee;
import java.io.IOException;
import java.util.ArrayList;
......
......@@ -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
......
......@@ -20,7 +20,7 @@
* ****************************************************************
*/
package org.iotivity.service.easysetup.core;
package org.iotivity.service.easysetup.mediator;
/**
* This is an abstract class represents the device being provisioned into the network. The
......
......@@ -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.
......
......@@ -20,23 +20,17 @@
* ****************************************************************
*/
package org.iotivity.service.easysetup.impl;
package org.iotivity.service.easysetup.mediator;
import java.util.Timer;
import java.util.TimerTask;
import org.iotivity.service.easysetup.core.OnBoardingConnection;
import org.iotivity.service.easysetup.core.EnrolleeDevice;
import org.iotivity.service.easysetup.core.EnrolleeState;
import org.iotivity.service.easysetup.core.IpOnBoardingConnection;
import org.iotivity.service.easysetup.core.OnBoardingConfig;
import org.iotivity.service.easysetup.core.ProvisioningConfig;
import org.iotivity.service.easysetup.mediator.EasySetupManager;
import org.iotivity.service.easysetup.mediator.EnrolleeInfo;
import org.iotivity.service.easysetup.mediator.IOnBoardingStatus;
import org.iotivity.service.easysetup.mediator.IProvisioningListener;
import org.iotivity.service.easysetup.mediator.ProvisionEnrollee;
import org.iotivity.service.easysetup.mediator.ip.WiFiSoftAPManager;
import org.iotivity.service.easysetup.core.EasySetupManager;
import org.iotivity.service.easysetup.core.EnrolleeInfo;
import org.iotivity.service.easysetup.core.IOnBoardingStatus;
import org.iotivity.service.easysetup.core.IProvisioningListener;
import org.iotivity.service.easysetup.core.ProvisionEnrollee;
import org.iotivity.service.easysetup.core.ip.WiFiSoftAPManager;
import android.content.Context;
import android.net.wifi.WifiConfiguration;
......
......@@ -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
......
......@@ -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
......
......@@ -20,7 +20,7 @@
* ****************************************************************
*/
package org.iotivity.service.easysetup.core;
package org.iotivity.service.easysetup.mediator;
public class IpOnBoardingConnection implements OnBoardingConnection {
......
......@@ -20,7 +20,7 @@
* ****************************************************************
*/
package org.iotivity.service.easysetup.core;
package org.iotivity.service.easysetup.mediator;
public abstract class OnBoardingCallback {
public abstract void onFinished(OnBoardingConnection connection);
......
......@@ -20,7 +20,7 @@
* ****************************************************************
*/
package org.iotivity.service.easysetup.core;
package org.iotivity.service.easysetup.mediator;
import org.iotivity.base.OcConnectivityType;
......
......@@ -19,7 +19,7 @@
* <p/>
* ****************************************************************
*/
package org.iotivity.service.easysetup.core;
package org.iotivity.service.easysetup.mediator;
/**
* This interface contains the connection details of the enrollee device
......
......@@ -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);
......
......@@ -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.
......
......@@ -20,10 +20,9 @@
* ****************************************************************
*/
package org.iotivity.service.easysetup.impl;
package org.iotivity.service.easysetup.mediator;
import org.iotivity.service.easysetup.core.IpOnBoardingConnection;
import org.iotivity.service.easysetup.core.OnBoardingConfig;
import org.iotivity.service.easysetup.mediator.OnBoardingConfig;
import android.net.wifi.WifiConfiguration;
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment