mirror of
https://repository.entgra.net/community/device-mgt-plugins.git
synced 2025-09-16 23:42:15 +00:00
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
This commit is contained in:
mharindu
commit
2b3dfa0ce2
8
components/iot-plugins/androidsense-plugin/CatsAge/.gitignore
vendored
Normal file
8
components/iot-plugins/androidsense-plugin/CatsAge/.gitignore
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
*.iml
|
||||||
|
.gradle
|
||||||
|
/local.properties
|
||||||
|
/.idea/workspace.xml
|
||||||
|
/.idea/libraries
|
||||||
|
.DS_Store
|
||||||
|
/build
|
||||||
|
/captures
|
||||||
1
components/iot-plugins/androidsense-plugin/CatsAge/app/.gitignore
vendored
Normal file
1
components/iot-plugins/androidsense-plugin/CatsAge/app/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/build
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
apply plugin: 'com.android.application'
|
||||||
|
|
||||||
|
android {
|
||||||
|
compileSdkVersion 23
|
||||||
|
buildToolsVersion "23.0.3"
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
applicationId "com.wso2.catsage"
|
||||||
|
minSdkVersion 15
|
||||||
|
targetSdkVersion 23
|
||||||
|
versionCode 1
|
||||||
|
versionName "1.0"
|
||||||
|
}
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
|
testCompile 'junit:junit:4.12'
|
||||||
|
compile 'com.android.support:appcompat-v7:23.4.0'
|
||||||
|
}
|
||||||
17
components/iot-plugins/androidsense-plugin/CatsAge/app/proguard-rules.pro
vendored
Normal file
17
components/iot-plugins/androidsense-plugin/CatsAge/app/proguard-rules.pro
vendored
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
# Add project specific ProGuard rules here.
|
||||||
|
# By default, the flags in this file are appended to flags specified
|
||||||
|
# in /home/dilan/Software/SDKs/Android/tools/proguard/proguard-android.txt
|
||||||
|
# You can edit the include path and order by changing the proguardFiles
|
||||||
|
# directive in build.gradle.
|
||||||
|
#
|
||||||
|
# For more details, see
|
||||||
|
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||||
|
|
||||||
|
# Add any project specific keep options here:
|
||||||
|
|
||||||
|
# If your project uses WebView with JS, uncomment the following
|
||||||
|
# and specify the fully qualified class name to the JavaScript interface
|
||||||
|
# class:
|
||||||
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||||
|
# public *;
|
||||||
|
#}
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
package com.wso2.catsage;
|
||||||
|
|
||||||
|
import android.app.Application;
|
||||||
|
import android.test.ApplicationTestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
|
||||||
|
*/
|
||||||
|
public class ApplicationTest extends ApplicationTestCase<Application> {
|
||||||
|
public ApplicationTest() {
|
||||||
|
super(Application.class);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="com.wso2.catsage">
|
||||||
|
|
||||||
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
|
||||||
|
<application
|
||||||
|
android:allowBackup="true"
|
||||||
|
android:icon="@mipmap/ic_launcher"
|
||||||
|
android:label="@string/app_name"
|
||||||
|
android:supportsRtl="true"
|
||||||
|
android:theme="@style/AppTheme">
|
||||||
|
|
||||||
|
<activity android:name=".HomeActivity">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
||||||
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
|
||||||
|
<activity android:name=".SecondActivity"></activity>
|
||||||
|
|
||||||
|
</application>
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@ -0,0 +1,50 @@
|
|||||||
|
package com.wso2.catsage;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.support.v7.app.AppCompatActivity;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.View;
|
||||||
|
import android.widget.Button;
|
||||||
|
import android.widget.EditText;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
public class HomeActivity extends AppCompatActivity {
|
||||||
|
|
||||||
|
EditText editTextAge;
|
||||||
|
Button buttonCalculateAge;
|
||||||
|
TextView textViewCatsAge;
|
||||||
|
Button buttonSecondActivity;
|
||||||
|
|
||||||
|
int catAge;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_home);
|
||||||
|
|
||||||
|
textViewCatsAge = (TextView) findViewById(R.id.textViewCatsAge);
|
||||||
|
buttonCalculateAge = (Button) findViewById(R.id.buttonCalculateAge);
|
||||||
|
editTextAge = (EditText) findViewById(R.id.editTextAge);
|
||||||
|
buttonSecondActivity =(Button) findViewById(R.id.buttonSecond);
|
||||||
|
|
||||||
|
buttonCalculateAge.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
int age = Integer.valueOf(editTextAge.getText().toString());
|
||||||
|
catAge = age * 7;
|
||||||
|
textViewCatsAge.setText("Cat's Age : " + catAge);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
buttonSecondActivity.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
Intent intent = new Intent(HomeActivity.this, SecondActivity.class);
|
||||||
|
intent.putExtra("catAge", catAge);
|
||||||
|
startActivity(intent);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
package com.wso2.catsage;
|
||||||
|
|
||||||
|
import android.support.v7.app.AppCompatActivity;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import org.w3c.dom.Text;
|
||||||
|
|
||||||
|
public class SecondActivity extends AppCompatActivity {
|
||||||
|
|
||||||
|
TextView textViewSecondCatAge;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_second);
|
||||||
|
|
||||||
|
textViewSecondCatAge = (TextView) findViewById(R.id.textViewSecondCatAge);
|
||||||
|
|
||||||
|
int catAge = getIntent().getExtras().getInt("catAge");
|
||||||
|
|
||||||
|
textViewSecondCatAge.setText(String.valueOf(catAge));
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 417 KiB |
@ -0,0 +1,67 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||||
|
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||||
|
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||||
|
android:paddingTop="@dimen/activity_vertical_margin"
|
||||||
|
android:orientation="vertical"
|
||||||
|
tools:context="com.wso2.catsage.HomeActivity">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||||
|
android:text="Enter Age:"
|
||||||
|
android:id="@+id/textView"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_centerHorizontal="true" />
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/editTextAge"
|
||||||
|
android:layout_marginTop="34dp"
|
||||||
|
android:layout_below="@+id/textView"
|
||||||
|
android:layout_centerHorizontal="true" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Calculate Cat's Age"
|
||||||
|
android:id="@+id/buttonCalculateAge"
|
||||||
|
android:layout_below="@+id/editTextAge"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_marginTop="25dp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_marginTop="20dp"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||||
|
android:text="Cat's Age :"
|
||||||
|
android:id="@+id/textViewCatsAge"
|
||||||
|
android:layout_alignTop="@+id/editTextAge"
|
||||||
|
android:layout_alignLeft="@+id/textView"
|
||||||
|
android:layout_alignStart="@+id/textView" />
|
||||||
|
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Second Activity"
|
||||||
|
android:id="@+id/buttonSecond" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/imageView"
|
||||||
|
android:src="@drawable/cat"
|
||||||
|
android:layout_below="@+id/textView2"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_marginTop="44dp" />
|
||||||
|
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||||
|
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||||
|
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||||
|
android:paddingTop="@dimen/activity_vertical_margin"
|
||||||
|
tools:context="com.wso2.catsage.SecondActivity">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||||
|
android:text="Large Text"
|
||||||
|
android:id="@+id/textViewSecondCatAge"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_centerHorizontal="true" />
|
||||||
|
</RelativeLayout>
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 3.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
@ -0,0 +1,6 @@
|
|||||||
|
<resources>
|
||||||
|
<!-- Example customization of dimensions originally defined in res/values/dimens.xml
|
||||||
|
(such as screen margins) for screens with more than 820dp of available width. This
|
||||||
|
would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
|
||||||
|
<dimen name="activity_horizontal_margin">64dp</dimen>
|
||||||
|
</resources>
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="colorPrimary">#3F51B5</color>
|
||||||
|
<color name="colorPrimaryDark">#303F9F</color>
|
||||||
|
<color name="colorAccent">#FF4081</color>
|
||||||
|
</resources>
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
<resources>
|
||||||
|
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||||
|
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||||
|
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||||
|
</resources>
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
<resources>
|
||||||
|
<string name="app_name">Cats Age</string>
|
||||||
|
</resources>
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
<resources>
|
||||||
|
|
||||||
|
<!-- Base application theme. -->
|
||||||
|
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||||
|
<!-- Customize your theme here. -->
|
||||||
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
|
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||||
|
<item name="colorAccent">@color/colorAccent</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
</resources>
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
package com.wso2.catsage;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To work on unit tests, switch the Test Artifact in the Build Variants view.
|
||||||
|
*/
|
||||||
|
public class ExampleUnitTest {
|
||||||
|
@Test
|
||||||
|
public void addition_isCorrect() throws Exception {
|
||||||
|
assertEquals(4, 2 + 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
|
||||||
|
buildscript {
|
||||||
|
repositories {
|
||||||
|
jcenter()
|
||||||
|
}
|
||||||
|
dependencies {
|
||||||
|
classpath 'com.android.tools.build:gradle:2.1.0'
|
||||||
|
|
||||||
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
// in the individual module build.gradle files
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
allprojects {
|
||||||
|
repositories {
|
||||||
|
jcenter()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
task clean(type: Delete) {
|
||||||
|
delete rootProject.buildDir
|
||||||
|
}
|
||||||
@ -0,0 +1,18 @@
|
|||||||
|
# Project-wide Gradle settings.
|
||||||
|
|
||||||
|
# IDE (e.g. Android Studio) users:
|
||||||
|
# Gradle settings configured through the IDE *will override*
|
||||||
|
# any settings specified in this file.
|
||||||
|
|
||||||
|
# For more details on how to configure your build environment visit
|
||||||
|
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||||
|
|
||||||
|
# Specifies the JVM arguments used for the daemon process.
|
||||||
|
# The setting is particularly useful for tweaking memory settings.
|
||||||
|
# Default value: -Xmx10248m -XX:MaxPermSize=256m
|
||||||
|
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
|
||||||
|
|
||||||
|
# When configured, Gradle will run in incubating parallel mode.
|
||||||
|
# This option should only be used with decoupled projects. More details, visit
|
||||||
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
|
# org.gradle.parallel=true
|
||||||
6
components/iot-plugins/androidsense-plugin/CatsAge/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
6
components/iot-plugins/androidsense-plugin/CatsAge/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
#Mon Dec 28 10:00:20 PST 2015
|
||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
|
||||||
160
components/iot-plugins/androidsense-plugin/CatsAge/gradlew
vendored
Executable file
160
components/iot-plugins/androidsense-plugin/CatsAge/gradlew
vendored
Executable file
@ -0,0 +1,160 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
##############################################################################
|
||||||
|
##
|
||||||
|
## Gradle start up script for UN*X
|
||||||
|
##
|
||||||
|
##############################################################################
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS=""
|
||||||
|
|
||||||
|
APP_NAME="Gradle"
|
||||||
|
APP_BASE_NAME=`basename "$0"`
|
||||||
|
|
||||||
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
|
MAX_FD="maximum"
|
||||||
|
|
||||||
|
warn ( ) {
|
||||||
|
echo "$*"
|
||||||
|
}
|
||||||
|
|
||||||
|
die ( ) {
|
||||||
|
echo
|
||||||
|
echo "$*"
|
||||||
|
echo
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# OS specific support (must be 'true' or 'false').
|
||||||
|
cygwin=false
|
||||||
|
msys=false
|
||||||
|
darwin=false
|
||||||
|
case "`uname`" in
|
||||||
|
CYGWIN* )
|
||||||
|
cygwin=true
|
||||||
|
;;
|
||||||
|
Darwin* )
|
||||||
|
darwin=true
|
||||||
|
;;
|
||||||
|
MINGW* )
|
||||||
|
msys=true
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Attempt to set APP_HOME
|
||||||
|
# Resolve links: $0 may be a link
|
||||||
|
PRG="$0"
|
||||||
|
# Need this for relative symlinks.
|
||||||
|
while [ -h "$PRG" ] ; do
|
||||||
|
ls=`ls -ld "$PRG"`
|
||||||
|
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||||
|
if expr "$link" : '/.*' > /dev/null; then
|
||||||
|
PRG="$link"
|
||||||
|
else
|
||||||
|
PRG=`dirname "$PRG"`"/$link"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
SAVED="`pwd`"
|
||||||
|
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||||
|
APP_HOME="`pwd -P`"
|
||||||
|
cd "$SAVED" >/dev/null
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
# Determine the Java command to use to start the JVM.
|
||||||
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
|
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||||
|
else
|
||||||
|
JAVACMD="$JAVA_HOME/bin/java"
|
||||||
|
fi
|
||||||
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
JAVACMD="java"
|
||||||
|
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Increase the maximum file descriptors if we can.
|
||||||
|
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
|
||||||
|
MAX_FD_LIMIT=`ulimit -H -n`
|
||||||
|
if [ $? -eq 0 ] ; then
|
||||||
|
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||||
|
MAX_FD="$MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
ulimit -n $MAX_FD
|
||||||
|
if [ $? -ne 0 ] ; then
|
||||||
|
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For Darwin, add options to specify how the application appears in the dock
|
||||||
|
if $darwin; then
|
||||||
|
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For Cygwin, switch paths to Windows format before running java
|
||||||
|
if $cygwin ; then
|
||||||
|
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||||
|
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||||
|
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||||
|
|
||||||
|
# We build the pattern for arguments to be converted via cygpath
|
||||||
|
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||||
|
SEP=""
|
||||||
|
for dir in $ROOTDIRSRAW ; do
|
||||||
|
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||||
|
SEP="|"
|
||||||
|
done
|
||||||
|
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||||
|
# Add a user-defined pattern to the cygpath arguments
|
||||||
|
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||||
|
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||||
|
fi
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
i=0
|
||||||
|
for arg in "$@" ; do
|
||||||
|
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||||
|
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||||
|
|
||||||
|
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||||
|
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||||
|
else
|
||||||
|
eval `echo args$i`="\"$arg\""
|
||||||
|
fi
|
||||||
|
i=$((i+1))
|
||||||
|
done
|
||||||
|
case $i in
|
||||||
|
(0) set -- ;;
|
||||||
|
(1) set -- "$args0" ;;
|
||||||
|
(2) set -- "$args0" "$args1" ;;
|
||||||
|
(3) set -- "$args0" "$args1" "$args2" ;;
|
||||||
|
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||||
|
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||||
|
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||||
|
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||||
|
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||||
|
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
|
||||||
|
function splitJvmOpts() {
|
||||||
|
JVM_OPTS=("$@")
|
||||||
|
}
|
||||||
|
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
|
||||||
|
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
|
||||||
|
|
||||||
|
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
||||||
90
components/iot-plugins/androidsense-plugin/CatsAge/gradlew.bat
vendored
Normal file
90
components/iot-plugins/androidsense-plugin/CatsAge/gradlew.bat
vendored
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
@if "%DEBUG%" == "" @echo off
|
||||||
|
@rem ##########################################################################
|
||||||
|
@rem
|
||||||
|
@rem Gradle startup script for Windows
|
||||||
|
@rem
|
||||||
|
@rem ##########################################################################
|
||||||
|
|
||||||
|
@rem Set local scope for the variables with windows NT shell
|
||||||
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
set DEFAULT_JVM_OPTS=
|
||||||
|
|
||||||
|
set DIRNAME=%~dp0
|
||||||
|
if "%DIRNAME%" == "" set DIRNAME=.
|
||||||
|
set APP_BASE_NAME=%~n0
|
||||||
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
@rem Find java.exe
|
||||||
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
|
set JAVA_EXE=java.exe
|
||||||
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
|
if "%ERRORLEVEL%" == "0" goto init
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:findJavaFromJavaHome
|
||||||
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
|
if exist "%JAVA_EXE%" goto init
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:init
|
||||||
|
@rem Get command-line arguments, handling Windowz variants
|
||||||
|
|
||||||
|
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||||
|
if "%@eval[2+2]" == "4" goto 4NT_args
|
||||||
|
|
||||||
|
:win9xME_args
|
||||||
|
@rem Slurp the command line arguments.
|
||||||
|
set CMD_LINE_ARGS=
|
||||||
|
set _SKIP=2
|
||||||
|
|
||||||
|
:win9xME_args_slurp
|
||||||
|
if "x%~1" == "x" goto execute
|
||||||
|
|
||||||
|
set CMD_LINE_ARGS=%*
|
||||||
|
goto execute
|
||||||
|
|
||||||
|
:4NT_args
|
||||||
|
@rem Get arguments from the 4NT Shell from JP Software
|
||||||
|
set CMD_LINE_ARGS=%$
|
||||||
|
|
||||||
|
:execute
|
||||||
|
@rem Setup the command line
|
||||||
|
|
||||||
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
@rem Execute Gradle
|
||||||
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||||
|
|
||||||
|
:end
|
||||||
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||||
|
|
||||||
|
:fail
|
||||||
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
|
rem the _cmd.exe /c_ return code!
|
||||||
|
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||||
|
exit /b 1
|
||||||
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
||||||
@ -0,0 +1 @@
|
|||||||
|
include ':app'
|
||||||
8
components/iot-plugins/androidsense-plugin/MyApplication/.gitignore
vendored
Normal file
8
components/iot-plugins/androidsense-plugin/MyApplication/.gitignore
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
*.iml
|
||||||
|
.gradle
|
||||||
|
/local.properties
|
||||||
|
/.idea/workspace.xml
|
||||||
|
/.idea/libraries
|
||||||
|
.DS_Store
|
||||||
|
/build
|
||||||
|
/captures
|
||||||
1
components/iot-plugins/androidsense-plugin/MyApplication/app/.gitignore
vendored
Normal file
1
components/iot-plugins/androidsense-plugin/MyApplication/app/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/build
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
apply plugin: 'com.android.application'
|
||||||
|
|
||||||
|
android {
|
||||||
|
compileSdkVersion 23
|
||||||
|
buildToolsVersion "23.0.3"
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
applicationId "com.wso2.myapplication"
|
||||||
|
minSdkVersion 15
|
||||||
|
targetSdkVersion 23
|
||||||
|
versionCode 1
|
||||||
|
versionName "1.0"
|
||||||
|
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||||
|
}
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
|
testCompile 'junit:junit:4.12'
|
||||||
|
compile 'com.android.support:appcompat-v7:23.4.0'
|
||||||
|
androidTestCompile 'com.android.support:support-annotations:23.4.0'
|
||||||
|
androidTestCompile 'com.android.support.test:runner:0.5'
|
||||||
|
androidTestCompile 'com.android.support.test:rules:0.5'
|
||||||
|
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
17
components/iot-plugins/androidsense-plugin/MyApplication/app/proguard-rules.pro
vendored
Normal file
17
components/iot-plugins/androidsense-plugin/MyApplication/app/proguard-rules.pro
vendored
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
# Add project specific ProGuard rules here.
|
||||||
|
# By default, the flags in this file are appended to flags specified
|
||||||
|
# in /home/dilan/Software/SDKs/Android/tools/proguard/proguard-android.txt
|
||||||
|
# You can edit the include path and order by changing the proguardFiles
|
||||||
|
# directive in build.gradle.
|
||||||
|
#
|
||||||
|
# For more details, see
|
||||||
|
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||||
|
|
||||||
|
# Add any project specific keep options here:
|
||||||
|
|
||||||
|
# If your project uses WebView with JS, uncomment the following
|
||||||
|
# and specify the fully qualified class name to the JavaScript interface
|
||||||
|
# class:
|
||||||
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||||
|
# public *;
|
||||||
|
#}
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
package com.wso2.myapplication;
|
||||||
|
|
||||||
|
import android.app.Application;
|
||||||
|
import android.test.ApplicationTestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
|
||||||
|
*/
|
||||||
|
public class ApplicationTest extends ApplicationTestCase<Application> {
|
||||||
|
public ApplicationTest() {
|
||||||
|
super(Application.class);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,54 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.wso2.myapplication;
|
||||||
|
|
||||||
|
import android.support.test.rule.ActivityTestRule;
|
||||||
|
import android.support.test.runner.AndroidJUnit4;
|
||||||
|
|
||||||
|
import org.junit.Rule;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
|
import static android.support.test.espresso.Espresso.onView;
|
||||||
|
import static android.support.test.espresso.action.ViewActions.click;
|
||||||
|
import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
|
||||||
|
import static android.support.test.espresso.action.ViewActions.typeText;
|
||||||
|
import static android.support.test.espresso.assertion.ViewAssertions.matches;
|
||||||
|
import static android.support.test.espresso.matcher.ViewMatchers.withId;
|
||||||
|
import static android.support.test.espresso.matcher.ViewMatchers.withText;
|
||||||
|
|
||||||
|
@RunWith(AndroidJUnit4.class)
|
||||||
|
public class MainActivityTest {
|
||||||
|
|
||||||
|
@Rule
|
||||||
|
public ActivityTestRule<MainActivity> mActivityRule = new ActivityTestRule<>(MainActivity.class);
|
||||||
|
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testHi() {
|
||||||
|
|
||||||
|
onView(withId(R.id.editTextInput))
|
||||||
|
.perform(typeText("Dilan"), closeSoftKeyboard());
|
||||||
|
|
||||||
|
onView(withId(R.id.buttonSayHello)).perform(click());
|
||||||
|
|
||||||
|
onView(withId(R.id.textViewHello))
|
||||||
|
.check(matches(withText("Hi Dilan!")));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="com.wso2.myapplication">
|
||||||
|
|
||||||
|
<application
|
||||||
|
android:allowBackup="true"
|
||||||
|
android:icon="@mipmap/ic_launcher"
|
||||||
|
android:label="@string/app_name"
|
||||||
|
android:supportsRtl="true"
|
||||||
|
android:theme="@style/AppTheme">
|
||||||
|
<activity android:name=".MainActivity">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
||||||
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
</application>
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.wso2.myapplication;
|
||||||
|
|
||||||
|
public class Calculator {
|
||||||
|
|
||||||
|
public float add(float x, float y){
|
||||||
|
return x + y;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int square(int value){
|
||||||
|
return value * value;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,37 @@
|
|||||||
|
package com.wso2.myapplication;
|
||||||
|
|
||||||
|
import android.support.v7.app.AppCompatActivity;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.View;
|
||||||
|
import android.widget.Button;
|
||||||
|
import android.widget.EditText;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
public class MainActivity extends AppCompatActivity {
|
||||||
|
|
||||||
|
|
||||||
|
EditText editTextInput;
|
||||||
|
Button buttonSayHello;
|
||||||
|
TextView textViewHello;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_main);
|
||||||
|
|
||||||
|
Calculator calculator = new Calculator();
|
||||||
|
|
||||||
|
editTextInput = (EditText) findViewById(R.id.editTextInput);
|
||||||
|
buttonSayHello = (Button) findViewById(R.id.buttonSayHello);
|
||||||
|
textViewHello = (TextView) findViewById(R.id.textViewHello);
|
||||||
|
|
||||||
|
buttonSayHello.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
String input = editTextInput.getText().toString();
|
||||||
|
textViewHello.setText("Hi " + input + "!");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical"
|
||||||
|
tools:context="com.wso2.myapplication.MainActivity">
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/editTextInput"
|
||||||
|
android:layout_gravity="center_horizontal" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Say Hello!"
|
||||||
|
android:id="@+id/buttonSayHello"
|
||||||
|
android:layout_gravity="center_horizontal" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||||
|
android:text="Large Text"
|
||||||
|
android:id="@+id/textViewHello"
|
||||||
|
android:layout_gravity="center_horizontal" />
|
||||||
|
</LinearLayout>
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 3.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
@ -0,0 +1,6 @@
|
|||||||
|
<resources>
|
||||||
|
<!-- Example customization of dimensions originally defined in res/values/dimens.xml
|
||||||
|
(such as screen margins) for screens with more than 820dp of available width. This
|
||||||
|
would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
|
||||||
|
<dimen name="activity_horizontal_margin">64dp</dimen>
|
||||||
|
</resources>
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="colorPrimary">#3F51B5</color>
|
||||||
|
<color name="colorPrimaryDark">#303F9F</color>
|
||||||
|
<color name="colorAccent">#FF4081</color>
|
||||||
|
</resources>
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
<resources>
|
||||||
|
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||||
|
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||||
|
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||||
|
</resources>
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
<resources>
|
||||||
|
<string name="app_name">MyApplication</string>
|
||||||
|
</resources>
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
<resources>
|
||||||
|
|
||||||
|
<!-- Base application theme. -->
|
||||||
|
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||||
|
<!-- Customize your theme here. -->
|
||||||
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
|
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||||
|
<item name="colorAccent">@color/colorAccent</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
</resources>
|
||||||
@ -0,0 +1,34 @@
|
|||||||
|
package com.wso2.myapplication;
|
||||||
|
|
||||||
|
import junit.framework.TestCase;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by dilan on 7/22/16.
|
||||||
|
*/
|
||||||
|
public class CalculatorTest extends TestCase {
|
||||||
|
|
||||||
|
|
||||||
|
Calculator calculator;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void setUp() throws Exception {
|
||||||
|
super.setUp();
|
||||||
|
calculator = new Calculator();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testAdd() throws Exception {
|
||||||
|
assertEquals(calculator.add(10f, 20f), 30f, 0);
|
||||||
|
assertEquals(calculator.add(30f, 20f), 50f, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSquare() throws Exception {
|
||||||
|
assertEquals(calculator.square(6), 36);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
package com.wso2.myapplication;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To work on unit tests, switch the Test Artifact in the Build Variants view.
|
||||||
|
*/
|
||||||
|
public class ExampleUnitTest {
|
||||||
|
@Test
|
||||||
|
public void addition_isCorrect() throws Exception {
|
||||||
|
assertEquals(4, 2 + 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
|
||||||
|
buildscript {
|
||||||
|
repositories {
|
||||||
|
jcenter()
|
||||||
|
}
|
||||||
|
dependencies {
|
||||||
|
classpath 'com.android.tools.build:gradle:2.1.0'
|
||||||
|
|
||||||
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
// in the individual module build.gradle files
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
allprojects {
|
||||||
|
repositories {
|
||||||
|
jcenter()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
task clean(type: Delete) {
|
||||||
|
delete rootProject.buildDir
|
||||||
|
}
|
||||||
@ -0,0 +1,18 @@
|
|||||||
|
# Project-wide Gradle settings.
|
||||||
|
|
||||||
|
# IDE (e.g. Android Studio) users:
|
||||||
|
# Gradle settings configured through the IDE *will override*
|
||||||
|
# any settings specified in this file.
|
||||||
|
|
||||||
|
# For more details on how to configure your build environment visit
|
||||||
|
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||||
|
|
||||||
|
# Specifies the JVM arguments used for the daemon process.
|
||||||
|
# The setting is particularly useful for tweaking memory settings.
|
||||||
|
# Default value: -Xmx10248m -XX:MaxPermSize=256m
|
||||||
|
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
|
||||||
|
|
||||||
|
# When configured, Gradle will run in incubating parallel mode.
|
||||||
|
# This option should only be used with decoupled projects. More details, visit
|
||||||
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
|
# org.gradle.parallel=true
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
#Mon Dec 28 10:00:20 PST 2015
|
||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
|
||||||
160
components/iot-plugins/androidsense-plugin/MyApplication/gradlew
vendored
Executable file
160
components/iot-plugins/androidsense-plugin/MyApplication/gradlew
vendored
Executable file
@ -0,0 +1,160 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
##############################################################################
|
||||||
|
##
|
||||||
|
## Gradle start up script for UN*X
|
||||||
|
##
|
||||||
|
##############################################################################
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS=""
|
||||||
|
|
||||||
|
APP_NAME="Gradle"
|
||||||
|
APP_BASE_NAME=`basename "$0"`
|
||||||
|
|
||||||
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
|
MAX_FD="maximum"
|
||||||
|
|
||||||
|
warn ( ) {
|
||||||
|
echo "$*"
|
||||||
|
}
|
||||||
|
|
||||||
|
die ( ) {
|
||||||
|
echo
|
||||||
|
echo "$*"
|
||||||
|
echo
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# OS specific support (must be 'true' or 'false').
|
||||||
|
cygwin=false
|
||||||
|
msys=false
|
||||||
|
darwin=false
|
||||||
|
case "`uname`" in
|
||||||
|
CYGWIN* )
|
||||||
|
cygwin=true
|
||||||
|
;;
|
||||||
|
Darwin* )
|
||||||
|
darwin=true
|
||||||
|
;;
|
||||||
|
MINGW* )
|
||||||
|
msys=true
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Attempt to set APP_HOME
|
||||||
|
# Resolve links: $0 may be a link
|
||||||
|
PRG="$0"
|
||||||
|
# Need this for relative symlinks.
|
||||||
|
while [ -h "$PRG" ] ; do
|
||||||
|
ls=`ls -ld "$PRG"`
|
||||||
|
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||||
|
if expr "$link" : '/.*' > /dev/null; then
|
||||||
|
PRG="$link"
|
||||||
|
else
|
||||||
|
PRG=`dirname "$PRG"`"/$link"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
SAVED="`pwd`"
|
||||||
|
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||||
|
APP_HOME="`pwd -P`"
|
||||||
|
cd "$SAVED" >/dev/null
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
# Determine the Java command to use to start the JVM.
|
||||||
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
|
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||||
|
else
|
||||||
|
JAVACMD="$JAVA_HOME/bin/java"
|
||||||
|
fi
|
||||||
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
JAVACMD="java"
|
||||||
|
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Increase the maximum file descriptors if we can.
|
||||||
|
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
|
||||||
|
MAX_FD_LIMIT=`ulimit -H -n`
|
||||||
|
if [ $? -eq 0 ] ; then
|
||||||
|
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||||
|
MAX_FD="$MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
ulimit -n $MAX_FD
|
||||||
|
if [ $? -ne 0 ] ; then
|
||||||
|
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For Darwin, add options to specify how the application appears in the dock
|
||||||
|
if $darwin; then
|
||||||
|
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For Cygwin, switch paths to Windows format before running java
|
||||||
|
if $cygwin ; then
|
||||||
|
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||||
|
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||||
|
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||||
|
|
||||||
|
# We build the pattern for arguments to be converted via cygpath
|
||||||
|
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||||
|
SEP=""
|
||||||
|
for dir in $ROOTDIRSRAW ; do
|
||||||
|
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||||
|
SEP="|"
|
||||||
|
done
|
||||||
|
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||||
|
# Add a user-defined pattern to the cygpath arguments
|
||||||
|
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||||
|
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||||
|
fi
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
i=0
|
||||||
|
for arg in "$@" ; do
|
||||||
|
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||||
|
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||||
|
|
||||||
|
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||||
|
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||||
|
else
|
||||||
|
eval `echo args$i`="\"$arg\""
|
||||||
|
fi
|
||||||
|
i=$((i+1))
|
||||||
|
done
|
||||||
|
case $i in
|
||||||
|
(0) set -- ;;
|
||||||
|
(1) set -- "$args0" ;;
|
||||||
|
(2) set -- "$args0" "$args1" ;;
|
||||||
|
(3) set -- "$args0" "$args1" "$args2" ;;
|
||||||
|
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||||
|
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||||
|
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||||
|
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||||
|
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||||
|
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
|
||||||
|
function splitJvmOpts() {
|
||||||
|
JVM_OPTS=("$@")
|
||||||
|
}
|
||||||
|
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
|
||||||
|
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
|
||||||
|
|
||||||
|
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
||||||
90
components/iot-plugins/androidsense-plugin/MyApplication/gradlew.bat
vendored
Normal file
90
components/iot-plugins/androidsense-plugin/MyApplication/gradlew.bat
vendored
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
@if "%DEBUG%" == "" @echo off
|
||||||
|
@rem ##########################################################################
|
||||||
|
@rem
|
||||||
|
@rem Gradle startup script for Windows
|
||||||
|
@rem
|
||||||
|
@rem ##########################################################################
|
||||||
|
|
||||||
|
@rem Set local scope for the variables with windows NT shell
|
||||||
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
set DEFAULT_JVM_OPTS=
|
||||||
|
|
||||||
|
set DIRNAME=%~dp0
|
||||||
|
if "%DIRNAME%" == "" set DIRNAME=.
|
||||||
|
set APP_BASE_NAME=%~n0
|
||||||
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
@rem Find java.exe
|
||||||
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
|
set JAVA_EXE=java.exe
|
||||||
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
|
if "%ERRORLEVEL%" == "0" goto init
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:findJavaFromJavaHome
|
||||||
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
|
if exist "%JAVA_EXE%" goto init
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:init
|
||||||
|
@rem Get command-line arguments, handling Windowz variants
|
||||||
|
|
||||||
|
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||||
|
if "%@eval[2+2]" == "4" goto 4NT_args
|
||||||
|
|
||||||
|
:win9xME_args
|
||||||
|
@rem Slurp the command line arguments.
|
||||||
|
set CMD_LINE_ARGS=
|
||||||
|
set _SKIP=2
|
||||||
|
|
||||||
|
:win9xME_args_slurp
|
||||||
|
if "x%~1" == "x" goto execute
|
||||||
|
|
||||||
|
set CMD_LINE_ARGS=%*
|
||||||
|
goto execute
|
||||||
|
|
||||||
|
:4NT_args
|
||||||
|
@rem Get arguments from the 4NT Shell from JP Software
|
||||||
|
set CMD_LINE_ARGS=%$
|
||||||
|
|
||||||
|
:execute
|
||||||
|
@rem Setup the command line
|
||||||
|
|
||||||
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
@rem Execute Gradle
|
||||||
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||||
|
|
||||||
|
:end
|
||||||
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||||
|
|
||||||
|
:fail
|
||||||
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
|
rem the _cmd.exe /c_ return code!
|
||||||
|
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||||
|
exit /b 1
|
||||||
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
||||||
@ -0,0 +1 @@
|
|||||||
|
include ':app'
|
||||||
@ -20,6 +20,6 @@
|
|||||||
<eventPublisher name="android_sense_publisher" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventpublisher">
|
<eventPublisher name="android_sense_publisher" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventpublisher">
|
||||||
<from streamName="org.wso2.iot.android.sense" version="1.0.0"/>
|
<from streamName="org.wso2.iot.android.sense" version="1.0.0"/>
|
||||||
<mapping customMapping="disable" type="wso2event"/>
|
<mapping customMapping="disable" type="wso2event"/>
|
||||||
<to eventAdapterType="iot-ui"/>
|
<to eventAdapterType="secured-ui"/>
|
||||||
</eventPublisher>
|
</eventPublisher>
|
||||||
|
|
||||||
|
|||||||
@ -139,9 +139,7 @@ public class ArduinoServiceImpl implements ArduinoService {
|
|||||||
return Response.status(Response.Status.ACCEPTED.getStatusCode()).entity(result).build();
|
return Response.status(Response.Status.ACCEPTED.getStatusCode()).entity(result).build();
|
||||||
} catch (NoSuchElementException ex) {
|
} catch (NoSuchElementException ex) {
|
||||||
result = "There are no more controls for device " + deviceId + " of owner " + owner;
|
result = "There are no more controls for device " + deviceId + " of owner " + owner;
|
||||||
if (log.isDebugEnabled()) {
|
log.error(result, ex);
|
||||||
log.debug(result);
|
|
||||||
}
|
|
||||||
return Response.status(Response.Status.NO_CONTENT.getStatusCode()).entity(result).build();
|
return Response.status(Response.Status.NO_CONTENT.getStatusCode()).entity(result).build();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,6 +20,6 @@
|
|||||||
<eventPublisher name="temperature_publisher" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventpublisher">
|
<eventPublisher name="temperature_publisher" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventpublisher">
|
||||||
<from streamName="org.wso2.iot.devices.temperature" version="1.0.0"/>
|
<from streamName="org.wso2.iot.devices.temperature" version="1.0.0"/>
|
||||||
<mapping customMapping="disable" type="wso2event"/>
|
<mapping customMapping="disable" type="wso2event"/>
|
||||||
<to eventAdapterType="iot-ui"/>
|
<to eventAdapterType="secured-ui"/>
|
||||||
</eventPublisher>
|
</eventPublisher>
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,21 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
package org.wso2.carbon.device.mgt.iot.input.adapter.extension;
|
package org.wso2.carbon.device.mgt.iot.input.adapter.extension;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|||||||
@ -1,3 +1,21 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
package org.wso2.carbon.device.mgt.iot.input.adapter.extension;
|
package org.wso2.carbon.device.mgt.iot.input.adapter.extension;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|||||||
@ -1,3 +1,21 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
package org.wso2.carbon.device.mgt.iot.input.adapter.extension;
|
package org.wso2.carbon.device.mgt.iot.input.adapter.extension;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|||||||
@ -21,21 +21,17 @@ package org.wso2.carbon.device.mgt.iot.input.adapter.http.oauth.exception;
|
|||||||
* This Exception will be thrown, when there any interference with token validation flow.
|
* This Exception will be thrown, when there any interference with token validation flow.
|
||||||
*/
|
*/
|
||||||
public class OAuthTokenValidationException extends Exception {
|
public class OAuthTokenValidationException extends Exception {
|
||||||
private String errMessage;
|
|
||||||
|
|
||||||
public OAuthTokenValidationException(String msg, Exception nestedEx) {
|
public OAuthTokenValidationException(String msg, Exception nestedEx) {
|
||||||
super(msg, nestedEx);
|
super(msg, nestedEx);
|
||||||
setErrorMessage(msg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public OAuthTokenValidationException(String message, Throwable cause) {
|
public OAuthTokenValidationException(String message, Throwable cause) {
|
||||||
super(message, cause);
|
super(message, cause);
|
||||||
setErrorMessage(message);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public OAuthTokenValidationException(String msg) {
|
public OAuthTokenValidationException(String msg) {
|
||||||
super(msg);
|
super(msg);
|
||||||
setErrorMessage(msg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public OAuthTokenValidationException() {
|
public OAuthTokenValidationException() {
|
||||||
@ -45,12 +41,4 @@ public class OAuthTokenValidationException extends Exception {
|
|||||||
public OAuthTokenValidationException(Throwable cause) {
|
public OAuthTokenValidationException(Throwable cause) {
|
||||||
super(cause);
|
super(cause);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getErrorMessage() {
|
|
||||||
return errMessage;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setErrorMessage(String errMessage) {
|
|
||||||
this.errMessage = errMessage;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -42,7 +42,7 @@ public class PropertyUtils {
|
|||||||
ServerConfiguration carbonConfig = ServerConfiguration.getInstance();
|
ServerConfiguration carbonConfig = ServerConfiguration.getInstance();
|
||||||
String portOffset = System.getProperty("portOffset", carbonConfig.getFirstProperty(CARBON_CONFIG_PORT_OFFSET));
|
String portOffset = System.getProperty("portOffset", carbonConfig.getFirstProperty(CARBON_CONFIG_PORT_OFFSET));
|
||||||
try {
|
try {
|
||||||
if ((portOffset != null)) {
|
if (portOffset != null) {
|
||||||
return Integer.parseInt(portOffset.trim());
|
return Integer.parseInt(portOffset.trim());
|
||||||
} else {
|
} else {
|
||||||
return CARBON_DEFAULT_PORT_OFFSET;
|
return CARBON_DEFAULT_PORT_OFFSET;
|
||||||
|
|||||||
@ -55,21 +55,6 @@
|
|||||||
<groupId>org.apache.cxf</groupId>
|
<groupId>org.apache.cxf</groupId>
|
||||||
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
|
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.httpcomponents.wso2</groupId>
|
|
||||||
<artifactId>httpcore</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.wso2.orbit.org.apache.httpcomponents</groupId>
|
|
||||||
<artifactId>httpclient</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.wso2.carbon.identity</groupId>
|
|
||||||
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|||||||
@ -16,13 +16,14 @@
|
|||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import oauth.OAuthTokenValdiator;
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.AuthenticationInfo;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.Authenticator;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authorization.Authorizer;
|
||||||
import util.ServiceHolder;
|
import util.ServiceHolder;
|
||||||
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
|
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
|
||||||
import util.AuthenticationInfo;
|
|
||||||
|
|
||||||
import javax.websocket.CloseReason;
|
import javax.websocket.CloseReason;
|
||||||
import javax.websocket.OnClose;
|
import javax.websocket.OnClose;
|
||||||
@ -56,22 +57,28 @@ public class SuperTenantSubscriptionEndpoint extends SubscriptionEndpoint {
|
|||||||
if (log.isDebugEnabled()) {
|
if (log.isDebugEnabled()) {
|
||||||
log.debug("WebSocket opened, for Session id: " + session.getId() + ", for the Stream:" + streamName);
|
log.debug("WebSocket opened, for Session id: " + session.getId() + ", for the Stream:" + streamName);
|
||||||
}
|
}
|
||||||
AuthenticationInfo authenticationInfo = OAuthTokenValdiator.getInstance().validateToken(session);
|
Authenticator authenticator = ServiceHolder.getWebsocketValidationService().getAuthenticator();
|
||||||
//TODO Authorization
|
AuthenticationInfo authenticationInfo = authenticator.isAutenticated(session);
|
||||||
if (authenticationInfo != null && authenticationInfo.isAuthenticated()) {
|
if (authenticationInfo != null && authenticationInfo.isAuthenticated()) {
|
||||||
|
Authorizer authorizer = ServiceHolder.getWebsocketValidationService().getAuthorizer();
|
||||||
|
boolean isAuthorized = authorizer.isAuthorized(authenticationInfo, session, streamName);
|
||||||
|
if (isAuthorized) {
|
||||||
try {
|
try {
|
||||||
PrivilegedCarbonContext.startTenantFlow();
|
PrivilegedCarbonContext.startTenantFlow();
|
||||||
PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID);
|
PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(
|
||||||
|
MultitenantConstants.SUPER_TENANT_ID);
|
||||||
ServiceHolder.getInstance().getUiOutputCallbackControllerService().subscribeWebsocket(streamName,
|
ServiceHolder.getInstance().getUiOutputCallbackControllerService().subscribeWebsocket(streamName,
|
||||||
version, session);
|
version,
|
||||||
|
session);
|
||||||
} finally {
|
} finally {
|
||||||
PrivilegedCarbonContext.endTenantFlow();
|
PrivilegedCarbonContext.endTenantFlow();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
session.close(new CloseReason(CloseReason.CloseCodes.CANNOT_ACCEPT, "Unauthorized Access"));
|
session.close(new CloseReason(CloseReason.CloseCodes.CANNOT_ACCEPT, "Unauthorized Access"));
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
log.error("Failed to disconnect the unauthorized client.");
|
log.error("Failed to disconnect the unauthorized client.", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,12 +16,13 @@
|
|||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import oauth.OAuthTokenValdiator;
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.AuthenticationInfo;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.Authenticator;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authorization.Authorizer;
|
||||||
import util.ServiceHolder;
|
import util.ServiceHolder;
|
||||||
import util.AuthenticationInfo;
|
|
||||||
|
|
||||||
import javax.websocket.CloseReason;
|
import javax.websocket.CloseReason;
|
||||||
import javax.websocket.OnClose;
|
import javax.websocket.OnClose;
|
||||||
@ -56,22 +57,27 @@ public class TenantSubscriptionEndpoint extends SubscriptionEndpoint {
|
|||||||
if (log.isDebugEnabled()) {
|
if (log.isDebugEnabled()) {
|
||||||
log.debug("WebSocket opened, for Session id: "+session.getId()+", for the Stream:"+streamName);
|
log.debug("WebSocket opened, for Session id: "+session.getId()+", for the Stream:"+streamName);
|
||||||
}
|
}
|
||||||
AuthenticationInfo authenticationInfo = OAuthTokenValdiator.getInstance().validateToken(session);
|
Authenticator authenticator = ServiceHolder.getWebsocketValidationService().getAuthenticator();
|
||||||
//TODO Authorization
|
AuthenticationInfo authenticationInfo = authenticator.isAutenticated(session);
|
||||||
if (authenticationInfo != null && authenticationInfo.isAuthenticated()) {
|
if (authenticationInfo != null && authenticationInfo.isAuthenticated()) {
|
||||||
|
Authorizer authorizer = ServiceHolder.getWebsocketValidationService().getAuthorizer();
|
||||||
|
boolean isAuthorized = authorizer.isAuthorized(authenticationInfo, session, streamName);
|
||||||
|
if (isAuthorized) {
|
||||||
try {
|
try {
|
||||||
PrivilegedCarbonContext.startTenantFlow();
|
PrivilegedCarbonContext.startTenantFlow();
|
||||||
PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tdomain, true);
|
PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tdomain, true);
|
||||||
ServiceHolder.getInstance().getUiOutputCallbackControllerService().subscribeWebsocket(streamName,
|
ServiceHolder.getInstance().getUiOutputCallbackControllerService().subscribeWebsocket(streamName,
|
||||||
version, session);
|
version,
|
||||||
|
session);
|
||||||
} finally {
|
} finally {
|
||||||
PrivilegedCarbonContext.endTenantFlow();
|
PrivilegedCarbonContext.endTenantFlow();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
session.close(new CloseReason(CloseReason.CloseCodes.CANNOT_ACCEPT, "Unauthorized Access"));
|
session.close(new CloseReason(CloseReason.CloseCodes.CANNOT_ACCEPT, "Unauthorized Access"));
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
log.error("Failed to disconnect the unauthorized client.");
|
log.error("Failed to disconnect the unauthorized client.", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -86,7 +92,8 @@ public class TenantSubscriptionEndpoint extends SubscriptionEndpoint {
|
|||||||
@OnMessage
|
@OnMessage
|
||||||
public void onMessage (Session session, String message, @PathParam("streamname") String streamName, @PathParam("tdomain") String tdomain) {
|
public void onMessage (Session session, String message, @PathParam("streamname") String streamName, @PathParam("tdomain") String tdomain) {
|
||||||
if (log.isDebugEnabled()) {
|
if (log.isDebugEnabled()) {
|
||||||
log.debug("Received and dropped message from client. Message: " + message+", for Session id: "+session.getId()+", for tenant domain"+tdomain+", for the Adaptor:"+streamName);
|
log.debug("Received and dropped message from client. Message: " + message + ", for Session id: " +
|
||||||
|
session.getId() + ", for tenant domain" + tdomain + ", for the Adaptor:" + streamName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,13 +1,17 @@
|
|||||||
package util;
|
package util;
|
||||||
|
|
||||||
|
|
||||||
|
import org.apache.commons.logging.Log;
|
||||||
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
||||||
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.UIOutputCallbackControllerService;
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.UIOutputCallbackControllerService;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.service.WebsocketValidationService;
|
||||||
|
|
||||||
public class ServiceHolder {
|
public class ServiceHolder {
|
||||||
|
|
||||||
private static ServiceHolder instance;
|
private static ServiceHolder instance;
|
||||||
private UIOutputCallbackControllerService uiOutputCallbackControllerService;
|
private UIOutputCallbackControllerService uiOutputCallbackControllerService;
|
||||||
|
private static final Log log = LogFactory.getLog(ServiceHolder.class);
|
||||||
|
|
||||||
private ServiceHolder(){
|
private ServiceHolder(){
|
||||||
uiOutputCallbackControllerService = (UIOutputCallbackControllerService) PrivilegedCarbonContext
|
uiOutputCallbackControllerService = (UIOutputCallbackControllerService) PrivilegedCarbonContext
|
||||||
@ -24,4 +28,16 @@ public class ServiceHolder {
|
|||||||
public UIOutputCallbackControllerService getUiOutputCallbackControllerService() {
|
public UIOutputCallbackControllerService getUiOutputCallbackControllerService() {
|
||||||
return uiOutputCallbackControllerService;
|
return uiOutputCallbackControllerService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static WebsocketValidationService getWebsocketValidationService() {
|
||||||
|
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
|
||||||
|
WebsocketValidationService deviceManagementProviderService =
|
||||||
|
(WebsocketValidationService) ctx.getOSGiService(WebsocketValidationService.class, null);
|
||||||
|
if (deviceManagementProviderService == null) {
|
||||||
|
String msg = "Websocket Validation service has not initialized.";
|
||||||
|
log.error(msg);
|
||||||
|
throw new IllegalStateException(msg);
|
||||||
|
}
|
||||||
|
return deviceManagementProviderService;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,23 +1,19 @@
|
|||||||
/*
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
*
|
*
|
||||||
* *
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
* * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
* *
|
* in compliance with the License.
|
||||||
* * WSO2 Inc. licenses this file to you under the Apache License,
|
* You may obtain a copy of the License at
|
||||||
* * Version 2.0 (the "License"); you may not use this file except
|
|
||||||
* * in compliance with the License.
|
|
||||||
* * You may obtain a copy of the License at
|
|
||||||
* *
|
|
||||||
* * http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
* *
|
|
||||||
* * Unless required by applicable law or agreed to in writing,
|
|
||||||
* * software distributed under the License is distributed on an
|
|
||||||
* * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
* * KIND, either express or implied. See the License for the
|
|
||||||
* * specific language governing permissions and limitations
|
|
||||||
* * under the License.
|
|
||||||
* *
|
|
||||||
*
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package util;
|
package util;
|
||||||
@ -25,10 +21,11 @@ package util;
|
|||||||
/**
|
/**
|
||||||
* This class contains the constants related to ui client.
|
* This class contains the constants related to ui client.
|
||||||
*/
|
*/
|
||||||
public class UIConstants {
|
public final class UIConstants {
|
||||||
|
|
||||||
private UIConstants() {
|
private UIConstants() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final String ADAPTER_UI_COLON = ":";
|
public static final String ADAPTER_UI_COLON = ":";
|
||||||
public static final String MAXIMUM_TOTAL_HTTP_CONNECTION = "maximumTotalHttpConnection";
|
public static final String MAXIMUM_TOTAL_HTTP_CONNECTION = "maximumTotalHttpConnection";
|
||||||
public static final String MAXIMUM_HTTP_CONNECTION_PER_HOST = "maximumHttpConnectionPerHost";
|
public static final String MAXIMUM_HTTP_CONNECTION_PER_HOST = "maximumHttpConnectionPerHost";
|
||||||
|
|||||||
@ -63,6 +63,18 @@
|
|||||||
<groupId>org.wso2.carbon.analytics-common</groupId>
|
<groupId>org.wso2.carbon.analytics-common</groupId>
|
||||||
<artifactId>org.wso2.carbon.event.stream.core</artifactId>
|
<artifactId>org.wso2.carbon.event.stream.core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.httpcomponents.wso2</groupId>
|
||||||
|
<artifactId>httpcore</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.wso2.orbit.org.apache.httpcomponents</groupId>
|
||||||
|
<artifactId>httpclient</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.wso2.carbon.identity</groupId>
|
||||||
|
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
@ -123,8 +135,17 @@
|
|||||||
org.wso2.carbon.databridge.commons,
|
org.wso2.carbon.databridge.commons,
|
||||||
org.wso2.carbon.event.stream.core,
|
org.wso2.carbon.event.stream.core,
|
||||||
org.wso2.carbon.event.stream.core.exception,
|
org.wso2.carbon.event.stream.core.exception,
|
||||||
org.wso2.carbon.utils
|
org.wso2.carbon.utils,
|
||||||
|
javax.xml.bind,
|
||||||
|
javax.xml.bind.annotation,
|
||||||
|
javax.xml.parsers; version=0.0.0,
|
||||||
|
org.w3c.dom,
|
||||||
|
org.wso2.carbon.identity.oauth2.stub,
|
||||||
|
org.wso2.carbon.identity.oauth2.stub.dto,
|
||||||
|
org.wso2.carbon.user.api,
|
||||||
|
org.wso2.carbon.utils.multitenancy
|
||||||
</Import-Package>
|
</Import-Package>
|
||||||
|
<DynamicImport-Package>*</DynamicImport-Package>
|
||||||
</instructions>
|
</instructions>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
/*
|
/*
|
||||||
*
|
|
||||||
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
*
|
*
|
||||||
* WSO2 Inc. licenses this file to you under the Apache License,
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
@ -34,7 +33,7 @@ import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration
|
|||||||
import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;
|
import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;
|
||||||
import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterRuntimeException;
|
import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterRuntimeException;
|
||||||
import org.wso2.carbon.event.output.adapter.core.exception.TestConnectionNotSupportedException;
|
import org.wso2.carbon.event.output.adapter.core.exception.TestConnectionNotSupportedException;
|
||||||
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.util.WebSocketSessionUtil;
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.util.WebSocketSessionRequest;
|
||||||
import org.wso2.carbon.event.stream.core.EventStreamService;
|
import org.wso2.carbon.event.stream.core.EventStreamService;
|
||||||
import org.wso2.carbon.event.stream.core.exception.EventStreamConfigurationException;
|
import org.wso2.carbon.event.stream.core.exception.EventStreamConfigurationException;
|
||||||
|
|
||||||
@ -78,7 +77,6 @@ public class UIEventAdapter implements OutputEventAdapter {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() throws OutputEventAdapterException {
|
public void init() throws OutputEventAdapterException {
|
||||||
|
|
||||||
tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
|
tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
|
||||||
|
|
||||||
//ExecutorService will be assigned if it is null
|
//ExecutorService will be assigned if it is null
|
||||||
@ -198,7 +196,6 @@ public class UIEventAdapter implements OutputEventAdapter {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void publish(Object message, Map<String, String> dynamicProperties) {
|
public void publish(Object message, Map<String, String> dynamicProperties) {
|
||||||
|
|
||||||
Event event = (Event) message;
|
Event event = (Event) message;
|
||||||
StringBuilder eventBuilder = new StringBuilder("[");
|
StringBuilder eventBuilder = new StringBuilder("[");
|
||||||
|
|
||||||
@ -257,7 +254,7 @@ public class UIEventAdapter implements OutputEventAdapter {
|
|||||||
streamSpecificEvents.add(eventValues);
|
streamSpecificEvents.add(eventValues);
|
||||||
|
|
||||||
// fetch all valid sessions checked against any queryParameters provided when subscribing.
|
// fetch all valid sessions checked against any queryParameters provided when subscribing.
|
||||||
CopyOnWriteArrayList<WebSocketSessionUtil> validSessions = getValidSessions(event);
|
CopyOnWriteArrayList<WebSocketSessionRequest> validSessions = getValidSessions(event);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
executorService.execute(new WebSocketSender(validSessions, eventString));
|
executorService.execute(new WebSocketSender(validSessions, eventString));
|
||||||
@ -275,7 +272,6 @@ public class UIEventAdapter implements OutputEventAdapter {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void destroy() {
|
public void destroy() {
|
||||||
|
|
||||||
int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
|
int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
|
||||||
|
|
||||||
ConcurrentHashMap<String, String> tenantSpecificAdapterMap = UIEventAdaptorServiceDataHolder
|
ConcurrentHashMap<String, String> tenantSpecificAdapterMap = UIEventAdaptorServiceDataHolder
|
||||||
@ -331,15 +327,15 @@ public class UIEventAdapter implements OutputEventAdapter {
|
|||||||
* @param event the current event received and that which needs to be published to subscribed sessions.
|
* @param event the current event received and that which needs to be published to subscribed sessions.
|
||||||
* @return a list of all validated web-socket sessions against the queryString values.
|
* @return a list of all validated web-socket sessions against the queryString values.
|
||||||
*/
|
*/
|
||||||
private CopyOnWriteArrayList<WebSocketSessionUtil> getValidSessions(Event event) {
|
private CopyOnWriteArrayList<WebSocketSessionRequest> getValidSessions(Event event) {
|
||||||
CopyOnWriteArrayList<WebSocketSessionUtil> validSessions = new CopyOnWriteArrayList<>();
|
CopyOnWriteArrayList<WebSocketSessionRequest> validSessions = new CopyOnWriteArrayList<>();
|
||||||
UIOutputCallbackControllerServiceImpl uiOutputCallbackControllerServiceImpl =
|
UIOutputCallbackControllerServiceImpl uiOutputCallbackControllerServiceImpl =
|
||||||
UIEventAdaptorServiceDataHolder.getUIOutputCallbackRegisterServiceImpl();
|
UIEventAdaptorServiceDataHolder.getUIOutputCallbackRegisterServiceImpl();
|
||||||
// get all subscribed web-socket sessions.
|
// get all subscribed web-socket sessions.
|
||||||
CopyOnWriteArrayList<WebSocketSessionUtil> webSocketSessionUtils =
|
CopyOnWriteArrayList<WebSocketSessionRequest> webSocketSessionUtils =
|
||||||
uiOutputCallbackControllerServiceImpl.getSessions(tenantId, streamId);
|
uiOutputCallbackControllerServiceImpl.getSessions(tenantId, streamId);
|
||||||
if (webSocketSessionUtils != null) {
|
if (webSocketSessionUtils != null) {
|
||||||
for (WebSocketSessionUtil webSocketSessionUtil : webSocketSessionUtils) {
|
for (WebSocketSessionRequest webSocketSessionUtil : webSocketSessionUtils) {
|
||||||
boolean isValidSession = validateEventAgainstSessionFilters(event, webSocketSessionUtil);
|
boolean isValidSession = validateEventAgainstSessionFilters(event, webSocketSessionUtil);
|
||||||
if (isValidSession) {
|
if (isValidSession) {
|
||||||
validSessions.add(webSocketSessionUtil);
|
validSessions.add(webSocketSessionUtil);
|
||||||
@ -360,7 +356,7 @@ public class UIEventAdapter implements OutputEventAdapter {
|
|||||||
* @param webSocketSessionUtil the session which needs validated for its authenticity to receive this event.
|
* @param webSocketSessionUtil the session which needs validated for its authenticity to receive this event.
|
||||||
* @return "true" if the session is valid to receive the event else "false".
|
* @return "true" if the session is valid to receive the event else "false".
|
||||||
*/
|
*/
|
||||||
private boolean validateEventAgainstSessionFilters(Event event, WebSocketSessionUtil webSocketSessionUtil) {
|
private boolean validateEventAgainstSessionFilters(Event event, WebSocketSessionRequest webSocketSessionUtil) {
|
||||||
|
|
||||||
// fetch the queryString Key:Value pair map of the given session.
|
// fetch the queryString Key:Value pair map of the given session.
|
||||||
Map<String, String> queryParamValuePairs = webSocketSessionUtil.getQueryParamValuePairs();
|
Map<String, String> queryParamValuePairs = webSocketSessionUtil.getQueryParamValuePairs();
|
||||||
@ -412,9 +408,9 @@ public class UIEventAdapter implements OutputEventAdapter {
|
|||||||
private class WebSocketSender implements Runnable {
|
private class WebSocketSender implements Runnable {
|
||||||
|
|
||||||
private String message;
|
private String message;
|
||||||
private CopyOnWriteArrayList<WebSocketSessionUtil> webSocketSessionUtils;
|
private CopyOnWriteArrayList<WebSocketSessionRequest> webSocketSessionUtils;
|
||||||
|
|
||||||
public WebSocketSender(CopyOnWriteArrayList<WebSocketSessionUtil> webSocketSessionUtils, String message) {
|
public WebSocketSender(CopyOnWriteArrayList<WebSocketSessionRequest> webSocketSessionUtils, String message) {
|
||||||
this.webSocketSessionUtils = webSocketSessionUtils;
|
this.webSocketSessionUtils = webSocketSessionUtils;
|
||||||
this.message = message;
|
this.message = message;
|
||||||
}
|
}
|
||||||
@ -434,8 +430,8 @@ public class UIEventAdapter implements OutputEventAdapter {
|
|||||||
public void run() {
|
public void run() {
|
||||||
if (webSocketSessionUtils != null) {
|
if (webSocketSessionUtils != null) {
|
||||||
doLogDroppedMessage = true;
|
doLogDroppedMessage = true;
|
||||||
for (WebSocketSessionUtil webSocketSessionUtil : webSocketSessionUtils) {
|
for (WebSocketSessionRequest webSocketSessionUtil : webSocketSessionUtils) {
|
||||||
synchronized (WebSocketSessionUtil.class) {
|
synchronized (WebSocketSessionRequest.class) {
|
||||||
try {
|
try {
|
||||||
webSocketSessionUtil.getSession().getBasicRemote().sendText(message);
|
webSocketSessionUtil.getSession().getBasicRemote().sendText(message);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
/*
|
/*
|
||||||
*
|
|
||||||
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
*
|
*
|
||||||
* WSO2 Inc. licenses this file to you under the Apache License,
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
/*
|
/*
|
||||||
*
|
|
||||||
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
*
|
*
|
||||||
* WSO2 Inc. licenses this file to you under the Apache License,
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
/*
|
/*
|
||||||
*
|
|
||||||
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
*
|
*
|
||||||
* WSO2 Inc. licenses this file to you under the Apache License,
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
@ -19,10 +18,9 @@
|
|||||||
*/
|
*/
|
||||||
package org.wso2.carbon.device.mgt.iot.output.adapter.ui;
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui;
|
||||||
|
|
||||||
import com.google.gson.JsonObject;
|
|
||||||
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
||||||
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.internal.UIEventAdaptorServiceDataHolder;
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.internal.UIEventAdaptorServiceDataHolder;
|
||||||
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.util.WebSocketSessionUtil;
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.util.WebSocketSessionRequest;
|
||||||
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.util.UIEventAdapterConstants;
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.util.UIEventAdapterConstants;
|
||||||
|
|
||||||
import javax.websocket.Session;
|
import javax.websocket.Session;
|
||||||
@ -36,7 +34,7 @@ import java.util.concurrent.LinkedBlockingDeque;
|
|||||||
*/
|
*/
|
||||||
public class UIOutputCallbackControllerServiceImpl implements UIOutputCallbackControllerService {
|
public class UIOutputCallbackControllerServiceImpl implements UIOutputCallbackControllerService {
|
||||||
|
|
||||||
private ConcurrentHashMap<Integer, ConcurrentHashMap<String, CopyOnWriteArrayList<WebSocketSessionUtil>>>
|
private ConcurrentHashMap<Integer, ConcurrentHashMap<String, CopyOnWriteArrayList<WebSocketSessionRequest>>>
|
||||||
outputEventAdaptorSessionMap;
|
outputEventAdaptorSessionMap;
|
||||||
|
|
||||||
public UIOutputCallbackControllerServiceImpl() {
|
public UIOutputCallbackControllerServiceImpl() {
|
||||||
@ -58,7 +56,7 @@ public class UIOutputCallbackControllerServiceImpl implements UIOutputCallbackCo
|
|||||||
version = UIEventAdapterConstants.ADAPTER_UI_DEFAULT_OUTPUT_STREAM_VERSION;
|
version = UIEventAdapterConstants.ADAPTER_UI_DEFAULT_OUTPUT_STREAM_VERSION;
|
||||||
}
|
}
|
||||||
String streamId = streamName + UIEventAdapterConstants.ADAPTER_UI_COLON + version;
|
String streamId = streamName + UIEventAdapterConstants.ADAPTER_UI_COLON + version;
|
||||||
ConcurrentHashMap<String, CopyOnWriteArrayList<WebSocketSessionUtil>> tenantSpecificAdaptorMap =
|
ConcurrentHashMap<String, CopyOnWriteArrayList<WebSocketSessionRequest>> tenantSpecificAdaptorMap =
|
||||||
outputEventAdaptorSessionMap.get(tenantId);
|
outputEventAdaptorSessionMap.get(tenantId);
|
||||||
if (tenantSpecificAdaptorMap == null) {
|
if (tenantSpecificAdaptorMap == null) {
|
||||||
tenantSpecificAdaptorMap = new ConcurrentHashMap<>();
|
tenantSpecificAdaptorMap = new ConcurrentHashMap<>();
|
||||||
@ -66,7 +64,7 @@ public class UIOutputCallbackControllerServiceImpl implements UIOutputCallbackCo
|
|||||||
tenantSpecificAdaptorMap = outputEventAdaptorSessionMap.get(tenantId);
|
tenantSpecificAdaptorMap = outputEventAdaptorSessionMap.get(tenantId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
CopyOnWriteArrayList<WebSocketSessionUtil> adapterSpecificSessions = tenantSpecificAdaptorMap.get(streamId);
|
CopyOnWriteArrayList<WebSocketSessionRequest> adapterSpecificSessions = tenantSpecificAdaptorMap.get(streamId);
|
||||||
if (adapterSpecificSessions == null) {
|
if (adapterSpecificSessions == null) {
|
||||||
adapterSpecificSessions = new CopyOnWriteArrayList<>();
|
adapterSpecificSessions = new CopyOnWriteArrayList<>();
|
||||||
if (null != tenantSpecificAdaptorMap.putIfAbsent(streamId, adapterSpecificSessions)) {
|
if (null != tenantSpecificAdaptorMap.putIfAbsent(streamId, adapterSpecificSessions)) {
|
||||||
@ -74,7 +72,7 @@ public class UIOutputCallbackControllerServiceImpl implements UIOutputCallbackCo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
WebSocketSessionUtil webSocketSessionUtil = new WebSocketSessionUtil(session);
|
WebSocketSessionRequest webSocketSessionUtil = new WebSocketSessionRequest(session);
|
||||||
adapterSpecificSessions.add(webSocketSessionUtil);
|
adapterSpecificSessions.add(webSocketSessionUtil);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -85,8 +83,8 @@ public class UIOutputCallbackControllerServiceImpl implements UIOutputCallbackCo
|
|||||||
* @param streamId - Stream name and version which user register to.
|
* @param streamId - Stream name and version which user register to.
|
||||||
* @return the sessions list.
|
* @return the sessions list.
|
||||||
*/
|
*/
|
||||||
public CopyOnWriteArrayList<WebSocketSessionUtil> getSessions(int tenantId, String streamId) {
|
public CopyOnWriteArrayList<WebSocketSessionRequest> getSessions(int tenantId, String streamId) {
|
||||||
ConcurrentHashMap<String, CopyOnWriteArrayList<WebSocketSessionUtil>> tenantSpecificAdaptorMap
|
ConcurrentHashMap<String, CopyOnWriteArrayList<WebSocketSessionRequest>> tenantSpecificAdaptorMap
|
||||||
= outputEventAdaptorSessionMap.get(tenantId);
|
= outputEventAdaptorSessionMap.get(tenantId);
|
||||||
if (tenantSpecificAdaptorMap != null) {
|
if (tenantSpecificAdaptorMap != null) {
|
||||||
return tenantSpecificAdaptorMap.get(streamId);
|
return tenantSpecificAdaptorMap.get(streamId);
|
||||||
@ -125,15 +123,15 @@ public class UIOutputCallbackControllerServiceImpl implements UIOutputCallbackCo
|
|||||||
version = UIEventAdapterConstants.ADAPTER_UI_DEFAULT_OUTPUT_STREAM_VERSION;
|
version = UIEventAdapterConstants.ADAPTER_UI_DEFAULT_OUTPUT_STREAM_VERSION;
|
||||||
}
|
}
|
||||||
String id = streamName + UIEventAdapterConstants.ADAPTER_UI_COLON + version;
|
String id = streamName + UIEventAdapterConstants.ADAPTER_UI_COLON + version;
|
||||||
ConcurrentHashMap<String, CopyOnWriteArrayList<WebSocketSessionUtil>> tenantSpecificAdaptorMap
|
ConcurrentHashMap<String, CopyOnWriteArrayList<WebSocketSessionRequest>> tenantSpecificAdaptorMap
|
||||||
= outputEventAdaptorSessionMap.get(tenantId);
|
= outputEventAdaptorSessionMap.get(tenantId);
|
||||||
if (tenantSpecificAdaptorMap != null) {
|
if (tenantSpecificAdaptorMap != null) {
|
||||||
CopyOnWriteArrayList<WebSocketSessionUtil> adapterSpecificSessions = tenantSpecificAdaptorMap.get(id);
|
CopyOnWriteArrayList<WebSocketSessionRequest> adapterSpecificSessions = tenantSpecificAdaptorMap.get(id);
|
||||||
if (adapterSpecificSessions != null) {
|
if (adapterSpecificSessions != null) {
|
||||||
WebSocketSessionUtil sessionToRemove = null;
|
WebSocketSessionRequest sessionToRemove = null;
|
||||||
Iterator<WebSocketSessionUtil> iterator = adapterSpecificSessions.iterator();
|
Iterator<WebSocketSessionRequest> iterator = adapterSpecificSessions.iterator();
|
||||||
while (iterator.hasNext()) {
|
while (iterator.hasNext()) {
|
||||||
WebSocketSessionUtil webSocketSessionUtil = iterator.next();
|
WebSocketSessionRequest webSocketSessionUtil = iterator.next();
|
||||||
if (session.getId().equals(webSocketSessionUtil.getSession().getId())) {
|
if (session.getId().equals(webSocketSessionUtil.getSession().getId())) {
|
||||||
sessionToRemove = webSocketSessionUtil;
|
sessionToRemove = webSocketSessionUtil;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -12,7 +12,9 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package util;
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is returned after authentication.
|
* This is returned after authentication.
|
||||||
@ -25,6 +27,12 @@ public class AuthenticationInfo {
|
|||||||
private boolean authenticated;
|
private boolean authenticated;
|
||||||
private String username;
|
private String username;
|
||||||
private String tenantDomain;
|
private String tenantDomain;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To hold authentication related properties eg: scopes in oauth
|
||||||
|
*/
|
||||||
|
private Map<String, Object> properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* returns whether the client is authenticated
|
* returns whether the client is authenticated
|
||||||
*/
|
*/
|
||||||
@ -57,4 +65,12 @@ public class AuthenticationInfo {
|
|||||||
public void setTenantDomain(String tenantDomain) {
|
public void setTenantDomain(String tenantDomain) {
|
||||||
this.tenantDomain = tenantDomain;
|
this.tenantDomain = tenantDomain;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Map<String, Object> getProperties() {
|
||||||
|
return properties;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setProperties(Map<String, Object> properties) {
|
||||||
|
this.properties = properties;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication;
|
||||||
|
|
||||||
|
import javax.websocket.Session;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This interface is used to authenticate a websocket session
|
||||||
|
*/
|
||||||
|
public interface Authenticator {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check whether the client is authenticated to connect.
|
||||||
|
* @param session user object.
|
||||||
|
* @return AuthenicationInfo which contains authentication client information.
|
||||||
|
*/
|
||||||
|
AuthenticationInfo isAutenticated(Session session);
|
||||||
|
}
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication;
|
||||||
|
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.oauth.OAuthTokenValdiator;
|
||||||
|
import javax.websocket.Session;
|
||||||
|
|
||||||
|
public class OAuthAuthenticator implements Authenticator {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AuthenticationInfo isAutenticated(Session session) {
|
||||||
|
return OAuthTokenValdiator.getInstance().validateToken(session);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -12,13 +12,17 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package oauth;
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.oauth;
|
||||||
|
|
||||||
import org.apache.axis2.context.ServiceContext;
|
import org.apache.axis2.context.ServiceContext;
|
||||||
import org.apache.axis2.transport.http.HTTPConstants;
|
import org.apache.axis2.transport.http.HTTPConstants;
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.apache.commons.pool.impl.GenericObjectPool;
|
import org.apache.commons.pool.impl.GenericObjectPool;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.AuthenticationInfo;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.config.Property;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.config.WebsocketConfig;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.constants.WebsocketConstants;
|
||||||
import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub;
|
import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub;
|
||||||
import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO;
|
import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO;
|
||||||
import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO_OAuth2AccessToken;
|
import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO_OAuth2AccessToken;
|
||||||
@ -26,14 +30,14 @@ import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationResponseDTO
|
|||||||
import org.wso2.carbon.user.api.UserStoreException;
|
import org.wso2.carbon.user.api.UserStoreException;
|
||||||
import org.wso2.carbon.utils.CarbonUtils;
|
import org.wso2.carbon.utils.CarbonUtils;
|
||||||
import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
|
import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
|
||||||
import util.AuthenticationInfo;
|
|
||||||
|
|
||||||
import javax.websocket.Session;
|
import javax.websocket.Session;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
|
||||||
import java.rmi.RemoteException;
|
import java.rmi.RemoteException;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -68,7 +72,8 @@ public class OAuthTokenValdiator {
|
|||||||
Properties properties = getWebSocketConfig();
|
Properties properties = getWebSocketConfig();
|
||||||
this.stubs = new GenericObjectPool(new OAuthTokenValidaterStubFactory(properties));
|
this.stubs = new GenericObjectPool(new OAuthTokenValidaterStubFactory(properties));
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
log.error("Failed to parse the web socket config file " + WEBSOCKET_CONFIG_LOCATION);
|
log.error("Failed to parse the web socket org.wso2.carbon.device.mgt.iot.output.adapter.ui.config file " +
|
||||||
|
WEBSOCKET_CONFIG_LOCATION, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -152,6 +157,12 @@ public class OAuthTokenValdiator {
|
|||||||
String tenantDomain = MultitenantUtils.getTenantDomain(authorizedUser);
|
String tenantDomain = MultitenantUtils.getTenantDomain(authorizedUser);
|
||||||
authenticationInfo.setUsername(username);
|
authenticationInfo.setUsername(username);
|
||||||
authenticationInfo.setTenantDomain(tenantDomain);
|
authenticationInfo.setTenantDomain(tenantDomain);
|
||||||
|
String scopes[] = tokenValidationResponse.getScope();
|
||||||
|
if (scopes != null) {
|
||||||
|
Map<String, Object> properties = new HashMap<>();
|
||||||
|
properties.put(WebsocketConstants.SCOPE_IDENTIFIER, scopes);
|
||||||
|
authenticationInfo.setProperties(properties);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
if (log.isDebugEnabled()) {
|
if (log.isDebugEnabled()) {
|
||||||
log.debug("Token validation failed for token: " + token);
|
log.debug("Token validation failed for token: " + token);
|
||||||
@ -169,12 +180,10 @@ public class OAuthTokenValdiator {
|
|||||||
*/
|
*/
|
||||||
private Properties getWebSocketConfig() throws IOException {
|
private Properties getWebSocketConfig() throws IOException {
|
||||||
Properties properties = new Properties();
|
Properties properties = new Properties();
|
||||||
File configFile =new File(WEBSOCKET_CONFIG_LOCATION);
|
List<Property> propertyList = WebsocketConfig.getInstance().getWebsocketValidationConfigs().getAuthenticator()
|
||||||
if (configFile.exists()) {
|
.getProperties().getProperty();
|
||||||
InputStream fileInputStream = new FileInputStream(configFile);
|
for (Property property : propertyList) {
|
||||||
if (fileInputStream != null) {
|
properties.put(property.getName(), property.getValue());
|
||||||
properties.load(fileInputStream);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return properties;
|
return properties;
|
||||||
}
|
}
|
||||||
@ -15,9 +15,8 @@
|
|||||||
* specific language governing permissions and limitations
|
* specific language governing permissions and limitations
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
package oauth;
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.oauth;
|
||||||
|
|
||||||
import oauth.exception.OAuthTokenValidationException;
|
|
||||||
import org.apache.axis2.AxisFault;
|
import org.apache.axis2.AxisFault;
|
||||||
import org.apache.axis2.Constants;
|
import org.apache.axis2.Constants;
|
||||||
import org.apache.axis2.client.Options;
|
import org.apache.axis2.client.Options;
|
||||||
@ -31,10 +30,13 @@ import org.apache.commons.httpclient.contrib.ssl.EasySSLProtocolSocketFactory;
|
|||||||
import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
|
import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
|
||||||
import org.apache.commons.httpclient.protocol.Protocol;
|
import org.apache.commons.httpclient.protocol.Protocol;
|
||||||
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
|
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
|
||||||
|
import org.apache.commons.logging.Log;
|
||||||
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.apache.commons.pool.BasePoolableObjectFactory;
|
import org.apache.commons.pool.BasePoolableObjectFactory;
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.log4j.Logger;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.oauth.exception.OAuthTokenValidationException;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.constants.WebsocketConstants;
|
||||||
import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub;
|
import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub;
|
||||||
import util.UIConstants;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.MalformedURLException;
|
import java.net.MalformedURLException;
|
||||||
@ -46,7 +48,7 @@ import java.util.Properties;
|
|||||||
* This follows object pool pattern to manage the stub for oauth validation service.
|
* This follows object pool pattern to manage the stub for oauth validation service.
|
||||||
*/
|
*/
|
||||||
public class OAuthTokenValidaterStubFactory extends BasePoolableObjectFactory {
|
public class OAuthTokenValidaterStubFactory extends BasePoolableObjectFactory {
|
||||||
private static final Logger log = Logger.getLogger(OAuthTokenValidaterStubFactory.class);
|
private static final Log log = LogFactory.getLog(OAuthTokenValidaterStubFactory.class);
|
||||||
private HttpClient httpClient;
|
private HttpClient httpClient;
|
||||||
Properties tokenValidationProperties;
|
Properties tokenValidationProperties;
|
||||||
|
|
||||||
@ -91,7 +93,7 @@ public class OAuthTokenValidaterStubFactory extends BasePoolableObjectFactory {
|
|||||||
private OAuth2TokenValidationServiceStub generateStub() throws OAuthTokenValidationException {
|
private OAuth2TokenValidationServiceStub generateStub() throws OAuthTokenValidationException {
|
||||||
OAuth2TokenValidationServiceStub stub;
|
OAuth2TokenValidationServiceStub stub;
|
||||||
try {
|
try {
|
||||||
URL hostURL = new URL(tokenValidationProperties.getProperty((UIConstants.TOKEN_VALIDATION_ENDPOINT_URL)));
|
URL hostURL = new URL(tokenValidationProperties.getProperty((WebsocketConstants.TOKEN_VALIDATION_ENDPOINT_URL)));
|
||||||
if (hostURL != null) {
|
if (hostURL != null) {
|
||||||
stub = new OAuth2TokenValidationServiceStub(hostURL.toString());
|
stub = new OAuth2TokenValidationServiceStub(hostURL.toString());
|
||||||
if (stub != null) {
|
if (stub != null) {
|
||||||
@ -102,8 +104,8 @@ public class OAuthTokenValidaterStubFactory extends BasePoolableObjectFactory {
|
|||||||
HttpTransportProperties.Authenticator auth =
|
HttpTransportProperties.Authenticator auth =
|
||||||
new HttpTransportProperties.Authenticator();
|
new HttpTransportProperties.Authenticator();
|
||||||
auth.setPreemptiveAuthentication(true);
|
auth.setPreemptiveAuthentication(true);
|
||||||
String username = tokenValidationProperties.getProperty(UIConstants.USERNAME);
|
String username = tokenValidationProperties.getProperty(WebsocketConstants.USERNAME);
|
||||||
String password = tokenValidationProperties.getProperty(UIConstants.PASSWORD);
|
String password = tokenValidationProperties.getProperty(WebsocketConstants.PASSWORD);
|
||||||
auth.setPassword(username);
|
auth.setPassword(username);
|
||||||
auth.setUsername(password);
|
auth.setUsername(password);
|
||||||
Options options = client.getOptions();
|
Options options = client.getOptions();
|
||||||
@ -167,9 +169,9 @@ public class OAuthTokenValidaterStubFactory extends BasePoolableObjectFactory {
|
|||||||
private HttpClient createHttpClient() {
|
private HttpClient createHttpClient() {
|
||||||
HttpConnectionManagerParams params = new HttpConnectionManagerParams();
|
HttpConnectionManagerParams params = new HttpConnectionManagerParams();
|
||||||
params.setDefaultMaxConnectionsPerHost(Integer.parseInt(tokenValidationProperties.getProperty(
|
params.setDefaultMaxConnectionsPerHost(Integer.parseInt(tokenValidationProperties.getProperty(
|
||||||
UIConstants.MAXIMUM_HTTP_CONNECTION_PER_HOST)));
|
WebsocketConstants.MAXIMUM_HTTP_CONNECTION_PER_HOST)));
|
||||||
params.setMaxTotalConnections(Integer.parseInt(tokenValidationProperties.getProperty(
|
params.setMaxTotalConnections(Integer.parseInt(tokenValidationProperties.getProperty(
|
||||||
UIConstants.MAXIMUM_TOTAL_HTTP_CONNECTION)));
|
WebsocketConstants.MAXIMUM_TOTAL_HTTP_CONNECTION)));
|
||||||
HttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager();
|
HttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager();
|
||||||
connectionManager.setParams(params);
|
connectionManager.setParams(params);
|
||||||
return new HttpClient(connectionManager);
|
return new HttpClient(connectionManager);
|
||||||
@ -15,27 +15,23 @@
|
|||||||
* specific language governing permissions and limitations
|
* specific language governing permissions and limitations
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
package oauth.exception;
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.oauth.exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This Exception will be thrown, when there any interference with token validation flow.
|
* This Exception will be thrown, when there any interference with token validation flow.
|
||||||
*/
|
*/
|
||||||
public class OAuthTokenValidationException extends Exception {
|
public class OAuthTokenValidationException extends Exception {
|
||||||
private String errMessage;
|
|
||||||
|
|
||||||
public OAuthTokenValidationException(String msg, Exception nestedEx) {
|
public OAuthTokenValidationException(String msg, Exception nestedEx) {
|
||||||
super(msg, nestedEx);
|
super(msg, nestedEx);
|
||||||
setErrorMessage(msg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public OAuthTokenValidationException(String message, Throwable cause) {
|
public OAuthTokenValidationException(String message, Throwable cause) {
|
||||||
super(message, cause);
|
super(message, cause);
|
||||||
setErrorMessage(message);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public OAuthTokenValidationException(String msg) {
|
public OAuthTokenValidationException(String msg) {
|
||||||
super(msg);
|
super(msg);
|
||||||
setErrorMessage(msg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public OAuthTokenValidationException() {
|
public OAuthTokenValidationException() {
|
||||||
@ -46,11 +42,4 @@ public class OAuthTokenValidationException extends Exception {
|
|||||||
super(cause);
|
super(cause);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getErrorMessage() {
|
|
||||||
return errMessage;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setErrorMessage(String errMessage) {
|
|
||||||
this.errMessage = errMessage;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* you may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.authorization;
|
||||||
|
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.AuthenticationInfo;
|
||||||
|
|
||||||
|
import javax.websocket.Session;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check whether the client is authorized to connect.
|
||||||
|
*/
|
||||||
|
public interface Authorizer {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check whether the client is authorized to connect with the stream.
|
||||||
|
* @param authenticationInfo authenticated client information.
|
||||||
|
* @param session request session of the client.
|
||||||
|
* @param stream stream name of the client connecting to.
|
||||||
|
* @return true if authorized else return false.
|
||||||
|
*/
|
||||||
|
boolean isAuthorized(AuthenticationInfo authenticationInfo, Session session, String stream);
|
||||||
|
}
|
||||||
@ -0,0 +1,55 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* you may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.authorization;
|
||||||
|
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.AuthenticationInfo;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.constants.WebsocketConstants;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.util.WebSocketSessionRequest;
|
||||||
|
|
||||||
|
import javax.websocket.Session;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This authorizer crossvalidates the request with device id and device type.
|
||||||
|
*/
|
||||||
|
public class DeviceAuthorizer implements Authorizer {
|
||||||
|
private static final String STATS_SCOPE_IDENTIFIER = "stats";
|
||||||
|
private static final String DEVICE_MGT_SCOPE_IDENTIFIER = "device-mgt";
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isAuthorized(AuthenticationInfo authenticationInfo, Session session, String stream) {
|
||||||
|
WebSocketSessionRequest webSocketSessionRequest = new WebSocketSessionRequest(session);
|
||||||
|
Map<String, String> queryParams = webSocketSessionRequest.getQueryParamValuePairs();
|
||||||
|
String deviceId = queryParams.get("deviceId");
|
||||||
|
String deviceType = queryParams.get("deviceType");
|
||||||
|
Object scopeObject = authenticationInfo.getProperties().get(WebsocketConstants.SCOPE_IDENTIFIER);
|
||||||
|
|
||||||
|
if (deviceId != null && !deviceId.isEmpty() && deviceType != null && !deviceType.isEmpty()
|
||||||
|
&& scopeObject != null) {
|
||||||
|
String scopes[] = (String[]) scopeObject;
|
||||||
|
String requiredScope = DEVICE_MGT_SCOPE_IDENTIFIER + ":" + deviceType + ":" + deviceId + ":"
|
||||||
|
+ STATS_SCOPE_IDENTIFIER;
|
||||||
|
for (String scope : scopes) {
|
||||||
|
if (requiredScope.equals(scope)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,107 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* you may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.config;
|
||||||
|
|
||||||
|
import javax.xml.bind.annotation.XmlAccessType;
|
||||||
|
import javax.xml.bind.annotation.XmlAccessorType;
|
||||||
|
import javax.xml.bind.annotation.XmlAttribute;
|
||||||
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>Java class for Authenticator complex type.
|
||||||
|
*
|
||||||
|
* <p>The following schema fragment specifies the expected content contained within this class.
|
||||||
|
*
|
||||||
|
* <pre>
|
||||||
|
* <complexType name="Authenticator">
|
||||||
|
* <complexContent>
|
||||||
|
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
|
||||||
|
* <sequence>
|
||||||
|
* <element name="Properties" type="{}Properties"/>
|
||||||
|
* </sequence>
|
||||||
|
* <attribute name="class" type="{http://www.w3.org/2001/XMLSchema}string" />
|
||||||
|
* </restriction>
|
||||||
|
* </complexContent>
|
||||||
|
* </complexType>
|
||||||
|
* </pre>
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
@XmlAccessorType(XmlAccessType.FIELD)
|
||||||
|
@XmlType(name = "Authenticator", propOrder = {
|
||||||
|
"properties"
|
||||||
|
})
|
||||||
|
public class Authenticator {
|
||||||
|
|
||||||
|
@XmlElement(name = "Properties", required = false)
|
||||||
|
protected Properties properties;
|
||||||
|
@XmlAttribute(name = "class")
|
||||||
|
protected String clazz;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the value of the properties property.
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
* possible object is
|
||||||
|
* {@link Properties }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public Properties getProperties() {
|
||||||
|
return properties;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the value of the properties property.
|
||||||
|
*
|
||||||
|
* @param value
|
||||||
|
* allowed object is
|
||||||
|
* {@link Properties }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public void setProperties(Properties value) {
|
||||||
|
this.properties = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the value of the clazz property.
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
* possible object is
|
||||||
|
* {@link String }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public String getClazz() {
|
||||||
|
return clazz;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the value of the clazz property.
|
||||||
|
*
|
||||||
|
* @param value
|
||||||
|
* allowed object is
|
||||||
|
* {@link String }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public void setClazz(String value) {
|
||||||
|
this.clazz = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,107 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* you may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.config;
|
||||||
|
|
||||||
|
import javax.xml.bind.annotation.XmlAccessType;
|
||||||
|
import javax.xml.bind.annotation.XmlAccessorType;
|
||||||
|
import javax.xml.bind.annotation.XmlAttribute;
|
||||||
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>Java class for Authorizer complex type.
|
||||||
|
*
|
||||||
|
* <p>The following schema fragment specifies the expected content contained within this class.
|
||||||
|
*
|
||||||
|
* <pre>
|
||||||
|
* <complexType name="Authorizer">
|
||||||
|
* <complexContent>
|
||||||
|
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
|
||||||
|
* <sequence>
|
||||||
|
* <element name="Properties" type="{}Properties"/>
|
||||||
|
* </sequence>
|
||||||
|
* <attribute name="class" type="{http://www.w3.org/2001/XMLSchema}string" />
|
||||||
|
* </restriction>
|
||||||
|
* </complexContent>
|
||||||
|
* </complexType>
|
||||||
|
* </pre>
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
@XmlAccessorType(XmlAccessType.FIELD)
|
||||||
|
@XmlType(name = "Authorizer", propOrder = {
|
||||||
|
"properties"
|
||||||
|
})
|
||||||
|
public class Authorizer {
|
||||||
|
|
||||||
|
@XmlElement(name = "Properties", required = false)
|
||||||
|
protected Properties properties;
|
||||||
|
@XmlAttribute(name = "class")
|
||||||
|
protected String clazz;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the value of the properties property.
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
* possible object is
|
||||||
|
* {@link Properties }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public Properties getProperties() {
|
||||||
|
return properties;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the value of the properties property.
|
||||||
|
*
|
||||||
|
* @param value
|
||||||
|
* allowed object is
|
||||||
|
* {@link Properties }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public void setProperties(Properties value) {
|
||||||
|
this.properties = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the value of the clazz property.
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
* possible object is
|
||||||
|
* {@link String }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public String getClazz() {
|
||||||
|
return clazz;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the value of the clazz property.
|
||||||
|
*
|
||||||
|
* @param value
|
||||||
|
* allowed object is
|
||||||
|
* {@link String }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public void setClazz(String value) {
|
||||||
|
this.clazz = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,86 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* you may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.config;
|
||||||
|
|
||||||
|
import javax.xml.bind.annotation.XmlAccessType;
|
||||||
|
import javax.xml.bind.annotation.XmlAccessorType;
|
||||||
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>Java class for Properties complex type.
|
||||||
|
*
|
||||||
|
* <p>The following schema fragment specifies the expected content contained within this class.
|
||||||
|
*
|
||||||
|
* <pre>
|
||||||
|
* <complexType name="Properties">
|
||||||
|
* <complexContent>
|
||||||
|
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
|
||||||
|
* <sequence>
|
||||||
|
* <element name="Property" type="{}Property" maxOccurs="unbounded" minOccurs="0"/>
|
||||||
|
* </sequence>
|
||||||
|
* </restriction>
|
||||||
|
* </complexContent>
|
||||||
|
* </complexType>
|
||||||
|
* </pre>
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
@XmlAccessorType(XmlAccessType.FIELD)
|
||||||
|
@XmlType(name = "Properties", propOrder = {
|
||||||
|
"property"
|
||||||
|
})
|
||||||
|
public class Properties {
|
||||||
|
|
||||||
|
@XmlElement(name = "Property")
|
||||||
|
protected List<Property> property;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the value of the property property.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This accessor method returns a reference to the live list,
|
||||||
|
* not a snapshot. Therefore any modification you make to the
|
||||||
|
* returned list will be present inside the JAXB object.
|
||||||
|
* This is why there is not a <CODE>set</CODE> method for the property property.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* For example, to add a new item, do as follows:
|
||||||
|
* <pre>
|
||||||
|
* getProperty().add(newItem);
|
||||||
|
* </pre>
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* Objects of the following type(s) are allowed in the list
|
||||||
|
* {@link Property }
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public List<Property> getProperty() {
|
||||||
|
if (property == null) {
|
||||||
|
property = new ArrayList<Property>();
|
||||||
|
}
|
||||||
|
return this.property;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,104 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* you may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.config;
|
||||||
|
|
||||||
|
import javax.xml.bind.annotation.XmlAccessType;
|
||||||
|
import javax.xml.bind.annotation.XmlAccessorType;
|
||||||
|
import javax.xml.bind.annotation.XmlAttribute;
|
||||||
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
import javax.xml.bind.annotation.XmlValue;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>Java class for Property complex type.
|
||||||
|
*
|
||||||
|
* <p>The following schema fragment specifies the expected content contained within this class.
|
||||||
|
*
|
||||||
|
* <pre>
|
||||||
|
* <complexType name="Property">
|
||||||
|
* <simpleContent>
|
||||||
|
* <extension base="<http://www.w3.org/2001/XMLSchema>string">
|
||||||
|
* <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
|
||||||
|
* </extension>
|
||||||
|
* </simpleContent>
|
||||||
|
* </complexType>
|
||||||
|
* </pre>
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
@XmlAccessorType(XmlAccessType.FIELD)
|
||||||
|
@XmlType(name = "Property", propOrder = {
|
||||||
|
"value"
|
||||||
|
})
|
||||||
|
public class Property {
|
||||||
|
|
||||||
|
@XmlValue
|
||||||
|
protected String value;
|
||||||
|
@XmlAttribute(name = "name")
|
||||||
|
protected String name;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the value of the value property.
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
* possible object is
|
||||||
|
* {@link String }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public String getValue() {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the value of the value property.
|
||||||
|
*
|
||||||
|
* @param value
|
||||||
|
* allowed object is
|
||||||
|
* {@link String }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public void setValue(String value) {
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the value of the name property.
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
* possible object is
|
||||||
|
* {@link String }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public String getName() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the value of the name property.
|
||||||
|
*
|
||||||
|
* @param value
|
||||||
|
* allowed object is
|
||||||
|
* {@link String }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public void setName(String value) {
|
||||||
|
this.name = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,71 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* you may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.config;
|
||||||
|
|
||||||
|
import org.w3c.dom.Document;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.util.WebsocketUtils;
|
||||||
|
import org.wso2.carbon.utils.CarbonUtils;
|
||||||
|
|
||||||
|
import javax.xml.bind.JAXBContext;
|
||||||
|
import javax.xml.bind.JAXBException;
|
||||||
|
import javax.xml.bind.Unmarshaller;
|
||||||
|
import java.io.File;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This class represents the configuration that are needed for scopes to permission map.
|
||||||
|
*/
|
||||||
|
public class WebsocketConfig {
|
||||||
|
|
||||||
|
private static WebsocketConfig config = new WebsocketConfig();
|
||||||
|
private WebsocketValidationConfigs websocketValidationConfigs;
|
||||||
|
|
||||||
|
private static final String WEBSOCKET_VALIDATION_CONFIG_PATH =
|
||||||
|
CarbonUtils.getEtcCarbonConfigDirPath() + File.separator + "websocket-validation.xml";
|
||||||
|
|
||||||
|
private WebsocketConfig() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public static WebsocketConfig getInstance() {
|
||||||
|
return config;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void init() throws WebsocketValidationConfigurationFailedException {
|
||||||
|
try {
|
||||||
|
File deviceMgtConfig = new File(WEBSOCKET_VALIDATION_CONFIG_PATH);
|
||||||
|
Document doc = WebsocketUtils.convertToDocument(deviceMgtConfig);
|
||||||
|
|
||||||
|
/* Un-marshaling DeviceMGtScope configuration */
|
||||||
|
JAXBContext ctx = JAXBContext.newInstance(WebsocketValidationConfigs.class);
|
||||||
|
Unmarshaller unmarshaller = ctx.createUnmarshaller();
|
||||||
|
//unmarshaller.setSchema(getSchema());
|
||||||
|
websocketValidationConfigs = (WebsocketValidationConfigs) unmarshaller.unmarshal(doc);
|
||||||
|
} catch (JAXBException e) {
|
||||||
|
throw new WebsocketValidationConfigurationFailedException("Error occurred while un-marshalling Websocket" +
|
||||||
|
" Config", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public WebsocketValidationConfigs getWebsocketValidationConfigs() {
|
||||||
|
return websocketValidationConfigs;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setWebsocketValidationConfigs(WebsocketValidationConfigs websocketValidationConfigs) {
|
||||||
|
websocketValidationConfigs = websocketValidationConfigs;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,106 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* you may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.config;
|
||||||
|
|
||||||
|
import javax.xml.bind.annotation.XmlAccessType;
|
||||||
|
import javax.xml.bind.annotation.XmlAccessorType;
|
||||||
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>Java class for WebsocketValidationConfigs complex type.
|
||||||
|
*
|
||||||
|
* <p>The following schema fragment specifies the expected content contained within this class.
|
||||||
|
*
|
||||||
|
* <pre>
|
||||||
|
* <complexType name="WebsocketValidationConfigs">
|
||||||
|
* <complexContent>
|
||||||
|
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
|
||||||
|
* <sequence>
|
||||||
|
* <element name="Authenticator" type="{}Authenticator"/>
|
||||||
|
* <element name="Authorizer" type="{}Authorizer"/>
|
||||||
|
* </sequence>
|
||||||
|
* </restriction>
|
||||||
|
* </complexContent>
|
||||||
|
* </complexType>
|
||||||
|
* </pre>
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
@XmlRootElement(name = "WebsocketValidationConfigs")
|
||||||
|
@XmlAccessorType(XmlAccessType.FIELD)
|
||||||
|
public class WebsocketValidationConfigs {
|
||||||
|
|
||||||
|
@XmlElement(name = "Authenticator", required = true)
|
||||||
|
protected Authenticator authenticator;
|
||||||
|
@XmlElement(name = "Authorizer", required = true)
|
||||||
|
protected Authorizer authorizer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the value of the authenticator property.
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
* possible object is
|
||||||
|
* {@link Authenticator }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public Authenticator getAuthenticator() {
|
||||||
|
return authenticator;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the value of the authenticator property.
|
||||||
|
*
|
||||||
|
* @param value
|
||||||
|
* allowed object is
|
||||||
|
* {@link Authenticator }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public void setAuthenticator(Authenticator value) {
|
||||||
|
this.authenticator = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the value of the authorizer property.
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
* possible object is
|
||||||
|
* {@link Authorizer }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public Authorizer getAuthorizer() {
|
||||||
|
return authorizer;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the value of the authorizer property.
|
||||||
|
*
|
||||||
|
* @param value
|
||||||
|
* allowed object is
|
||||||
|
* {@link Authorizer }
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public void setAuthorizer(Authorizer value) {
|
||||||
|
this.authorizer = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,44 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.config;
|
||||||
|
|
||||||
|
public class WebsocketValidationConfigurationFailedException extends Exception {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = -3151279329290703928L;
|
||||||
|
|
||||||
|
public WebsocketValidationConfigurationFailedException(String msg, Exception nestedEx) {
|
||||||
|
super(msg, nestedEx);
|
||||||
|
}
|
||||||
|
|
||||||
|
public WebsocketValidationConfigurationFailedException(String message, Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
public WebsocketValidationConfigurationFailedException(String msg) {
|
||||||
|
super(msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
public WebsocketValidationConfigurationFailedException() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
public WebsocketValidationConfigurationFailedException(Throwable cause) {
|
||||||
|
super(cause);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.constants;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This holds the constants related to this feature
|
||||||
|
*/
|
||||||
|
public class WebsocketConstants {
|
||||||
|
|
||||||
|
private WebsocketConstants() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final String SCOPE_IDENTIFIER = "scopes";
|
||||||
|
public static final String MAXIMUM_TOTAL_HTTP_CONNECTION = "maximumTotalHttpConnection";
|
||||||
|
public static final String MAXIMUM_HTTP_CONNECTION_PER_HOST = "maximumHttpConnectionPerHost";
|
||||||
|
public static final String TOKEN_VALIDATION_ENDPOINT_URL = "tokenValidationEndpoint";
|
||||||
|
public static final String USERNAME = "username";
|
||||||
|
public static final String PASSWORD = "password";
|
||||||
|
}
|
||||||
@ -1,5 +1,4 @@
|
|||||||
/*
|
/*
|
||||||
*
|
|
||||||
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
*
|
*
|
||||||
* WSO2 Inc. licenses this file to you under the Apache License,
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
@ -32,9 +31,9 @@ public final class UIEventAdaptorServiceDataHolder {
|
|||||||
|
|
||||||
private static UIOutputCallbackControllerServiceImpl UIOutputCallbackRegisterServiceImpl;
|
private static UIOutputCallbackControllerServiceImpl UIOutputCallbackRegisterServiceImpl;
|
||||||
private static ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>>
|
private static ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>>
|
||||||
tenantSpecificOutputEventStreamAdapterMap = new ConcurrentHashMap<Integer,ConcurrentHashMap<String, String>>();
|
tenantSpecificOutputEventStreamAdapterMap = new ConcurrentHashMap<>();
|
||||||
private static ConcurrentHashMap<Integer, ConcurrentHashMap<String, LinkedBlockingDeque<Object>>>
|
private static ConcurrentHashMap<Integer, ConcurrentHashMap<String, LinkedBlockingDeque<Object>>>
|
||||||
tenantSpecificStreamEventMap = new ConcurrentHashMap<Integer, ConcurrentHashMap<String, LinkedBlockingDeque<Object>>>();
|
tenantSpecificStreamEventMap = new ConcurrentHashMap<>();
|
||||||
private static EventStreamService eventStreamService;
|
private static EventStreamService eventStreamService;
|
||||||
|
|
||||||
public static void registerEventStreamService(EventStreamService eventBuilderService) {
|
public static void registerEventStreamService(EventStreamService eventBuilderService) {
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
/*
|
/*
|
||||||
*
|
|
||||||
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
*
|
*
|
||||||
* WSO2 Inc. licenses this file to you under the Apache License,
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
@ -24,6 +23,12 @@ import org.apache.commons.logging.LogFactory;
|
|||||||
import org.osgi.service.component.ComponentContext;
|
import org.osgi.service.component.ComponentContext;
|
||||||
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.UIEventAdapterFactory;
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.UIEventAdapterFactory;
|
||||||
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.UIOutputCallbackControllerServiceImpl;
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.UIOutputCallbackControllerServiceImpl;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.Authenticator;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authorization.Authorizer;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.config.WebsocketConfig;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.config.WebsocketValidationConfigurationFailedException;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.service.WebsocketValidationService;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.service.WebsocketValidationServiceImpl;
|
||||||
import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory;
|
import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory;
|
||||||
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.UIOutputCallbackControllerService;
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.UIOutputCallbackControllerService;
|
||||||
import org.wso2.carbon.event.stream.core.EventStreamService;
|
import org.wso2.carbon.event.stream.core.EventStreamService;
|
||||||
@ -58,8 +63,37 @@ public class UILocalEventAdapterServiceComponent {
|
|||||||
if (log.isDebugEnabled()) {
|
if (log.isDebugEnabled()) {
|
||||||
log.debug("Successfully deployed the output ui adapter service");
|
log.debug("Successfully deployed the output ui adapter service");
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
|
WebsocketConfig.getInstance().init();
|
||||||
|
WebsocketValidationServiceImpl websocketValidationService = new WebsocketValidationServiceImpl();
|
||||||
|
String authenticatorClassName = WebsocketConfig.getInstance().getWebsocketValidationConfigs()
|
||||||
|
.getAuthenticator().getClazz();
|
||||||
|
String authorizerClassName = WebsocketConfig.getInstance().getWebsocketValidationConfigs()
|
||||||
|
.getAuthorizer().getClazz();
|
||||||
|
if (authenticatorClassName != null && !authenticatorClassName.isEmpty()) {
|
||||||
|
Class<? extends Authenticator> authenticatorClass = Class.forName(authenticatorClassName)
|
||||||
|
.asSubclass(Authenticator.class);
|
||||||
|
Authenticator authenticator = authenticatorClass.newInstance();
|
||||||
|
websocketValidationService.setAuthenticator(authenticator);
|
||||||
|
}
|
||||||
|
if (authorizerClassName != null && !authorizerClassName.isEmpty()) {
|
||||||
|
Class<? extends Authorizer> authorizerClass = Class.forName(authorizerClassName)
|
||||||
|
.asSubclass(Authorizer.class);
|
||||||
|
Authorizer authorizer = authorizerClass.newInstance();
|
||||||
|
websocketValidationService.setAuthorizer(authorizer);
|
||||||
|
}
|
||||||
|
context.getBundleContext().registerService(
|
||||||
|
WebsocketValidationService.class.getName(), websocketValidationService, null);
|
||||||
|
} catch (WebsocketValidationConfigurationFailedException e) {
|
||||||
|
log.error("Failed to initialize configuration for websocket.", e);
|
||||||
|
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
|
||||||
|
log.error("Failed to initialize the class authentication and authorization given " +
|
||||||
|
"in the websocket validation configuration.", e);
|
||||||
|
}
|
||||||
} catch (RuntimeException e) {
|
} catch (RuntimeException e) {
|
||||||
log.error("Can not create the output ui adapter service ", e);
|
log.error("Can not create the output ui adapter service ", e);
|
||||||
|
} catch (Throwable e) {
|
||||||
|
log.error("Error occurred while activating UI Event Adapter Service Component", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,33 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* you may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.service;
|
||||||
|
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.Authenticator;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authorization.Authorizer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This returns the configured authenticator and authorizer for websocket.
|
||||||
|
*/
|
||||||
|
public interface WebsocketValidationService {
|
||||||
|
|
||||||
|
Authenticator getAuthenticator();
|
||||||
|
|
||||||
|
Authorizer getAuthorizer();
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* you may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.service;
|
||||||
|
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authentication.Authenticator;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.authorization.Authorizer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This returns the configured authenticator and authorizer for websocket.
|
||||||
|
*/
|
||||||
|
public class WebsocketValidationServiceImpl implements WebsocketValidationService{
|
||||||
|
private Authenticator authenticator;
|
||||||
|
private Authorizer authorizer;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Authenticator getAuthenticator() {
|
||||||
|
return authenticator;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Authorizer getAuthorizer() {
|
||||||
|
return authorizer;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAuthenticator(Authenticator authenticator) {
|
||||||
|
this.authenticator = authenticator;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAuthorizer(Authorizer authorizer) {
|
||||||
|
this.authorizer = authorizer;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,11 +1,10 @@
|
|||||||
/*
|
/*
|
||||||
*
|
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
* Copyright (c) 2014-2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
|
||||||
*
|
*
|
||||||
* WSO2 Inc. licenses this file to you under the Apache License,
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
* Version 2.0 (the "License"); you may not use this file except
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
* in compliance with the License.
|
* in compliance with the License.
|
||||||
* You may obtain a copy of the License at
|
* you may obtain a copy of the License at
|
||||||
*
|
*
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
@ -15,8 +14,8 @@
|
|||||||
* KIND, either express or implied. See the License for the
|
* KIND, either express or implied. See the License for the
|
||||||
* specific language governing permissions and limitations
|
* specific language governing permissions and limitations
|
||||||
* under the License.
|
* under the License.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.util;
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -27,7 +26,7 @@ public class UIEventAdapterConstants {
|
|||||||
private UIEventAdapterConstants() {
|
private UIEventAdapterConstants() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final String ADAPTER_TYPE_UI = "iot-ui";
|
public static final String ADAPTER_TYPE_UI = "secured-ui";
|
||||||
public static final String ADAPTER_USAGE_TIPS_PREFIX = "ui.usage.tips_prefix";
|
public static final String ADAPTER_USAGE_TIPS_PREFIX = "ui.usage.tips_prefix";
|
||||||
public static final String ADAPTER_USAGE_TIPS_POSTFIX = "ui.usage.tips_postfix";
|
public static final String ADAPTER_USAGE_TIPS_POSTFIX = "ui.usage.tips_postfix";
|
||||||
public static final String ADAPTER_UI_DEFAULT_OUTPUT_STREAM_VERSION = "1.0.0";
|
public static final String ADAPTER_UI_DEFAULT_OUTPUT_STREAM_VERSION = "1.0.0";
|
||||||
|
|||||||
@ -1,5 +1,22 @@
|
|||||||
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.util;
|
/*
|
||||||
|
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* you may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.util;
|
||||||
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
@ -13,15 +30,15 @@ import java.util.Map;
|
|||||||
* of the Session object derived from processing some of the (default) existing attributes.
|
* of the Session object derived from processing some of the (default) existing attributes.
|
||||||
* Ex: Query-String's [Key:Value] Map derived from the queryString attribute of the original class.
|
* Ex: Query-String's [Key:Value] Map derived from the queryString attribute of the original class.
|
||||||
*/
|
*/
|
||||||
public class WebSocketSessionUtil {
|
public class WebSocketSessionRequest {
|
||||||
private static final Log log = LogFactory.getLog(WebSocketSessionUtil.class);
|
private static final Log log = LogFactory.getLog(WebSocketSessionRequest.class);
|
||||||
|
|
||||||
private static final String QUERY_STRING_SEPERATOR = "&";
|
private static final String QUERY_STRING_SEPERATOR = "&";
|
||||||
private static final String QUERY_KEY_VALUE_SEPERATOR = "=";
|
private static final String QUERY_KEY_VALUE_SEPERATOR = "=";
|
||||||
private Map<String, String> queryParamValuePairs = null;
|
private Map<String, String> queryParamValuePairs = null;
|
||||||
private Session session;
|
private Session session;
|
||||||
|
|
||||||
public WebSocketSessionUtil(Session session) {
|
public WebSocketSessionRequest(Session session) {
|
||||||
this.session = session;
|
this.session = session;
|
||||||
setQueryParamValuePairs();
|
setQueryParamValuePairs();
|
||||||
}
|
}
|
||||||
@ -42,19 +59,15 @@ public class WebSocketSessionUtil {
|
|||||||
if (session.getQueryString() != null) {
|
if (session.getQueryString() != null) {
|
||||||
String queryString = session.getQueryString();
|
String queryString = session.getQueryString();
|
||||||
String[] allQueryParamPairs = queryString.split(QUERY_STRING_SEPERATOR);
|
String[] allQueryParamPairs = queryString.split(QUERY_STRING_SEPERATOR);
|
||||||
|
|
||||||
for (String keyValuePair : allQueryParamPairs) {
|
for (String keyValuePair : allQueryParamPairs) {
|
||||||
String[] thisQueryParamPair = keyValuePair.split(QUERY_KEY_VALUE_SEPERATOR);
|
String[] thisQueryParamPair = keyValuePair.split(QUERY_KEY_VALUE_SEPERATOR);
|
||||||
|
|
||||||
if (thisQueryParamPair.length != 2) {
|
if (thisQueryParamPair.length != 2) {
|
||||||
log.warn("Invalid query string [" + queryString + "] passed in.");
|
log.warn("Invalid query string [" + queryString + "] passed in.");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (queryParamValuePairs == null) {
|
if (queryParamValuePairs == null) {
|
||||||
queryParamValuePairs = new HashMap<>();
|
queryParamValuePairs = new HashMap<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
queryParamValuePairs.put(thisQueryParamPair[0], thisQueryParamPair[1]);
|
queryParamValuePairs.put(thisQueryParamPair[0], thisQueryParamPair[1]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -0,0 +1,45 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
||||||
|
*
|
||||||
|
* WSO2 Inc. licenses this file to you under the Apache License,
|
||||||
|
* Version 2.0 (the "License"); you may not use this file except
|
||||||
|
* in compliance with the License.
|
||||||
|
* you may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.wso2.carbon.device.mgt.iot.output.adapter.ui.util;
|
||||||
|
|
||||||
|
import org.w3c.dom.Document;
|
||||||
|
import org.wso2.carbon.device.mgt.iot.output.adapter.ui.config.WebsocketValidationConfigurationFailedException;
|
||||||
|
|
||||||
|
import javax.xml.parsers.DocumentBuilder;
|
||||||
|
import javax.xml.parsers.DocumentBuilderFactory;
|
||||||
|
import java.io.File;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This class holds util methods used by OAuth extension bundle.
|
||||||
|
*/
|
||||||
|
public class WebsocketUtils {
|
||||||
|
|
||||||
|
public static Document convertToDocument(File file) throws WebsocketValidationConfigurationFailedException {
|
||||||
|
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
|
||||||
|
factory.setNamespaceAware(true);
|
||||||
|
try {
|
||||||
|
DocumentBuilder docBuilder = factory.newDocumentBuilder();
|
||||||
|
return docBuilder.parse(file);
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new WebsocketValidationConfigurationFailedException("Error occurred while parsing file, while converting " +
|
||||||
|
"to a org.w3c.dom.Document", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -28,9 +28,13 @@ import org.wso2.carbon.device.mgt.iot.devicetype.config.DeviceManagementConfigur
|
|||||||
import org.wso2.carbon.device.mgt.iot.raspberrypi.plugin.constants.RaspberrypiConstants;
|
import org.wso2.carbon.device.mgt.iot.raspberrypi.plugin.constants.RaspberrypiConstants;
|
||||||
import org.wso2.carbon.device.mgt.iot.raspberrypi.plugin.internal.RaspberrypiManagementDataHolder;
|
import org.wso2.carbon.device.mgt.iot.raspberrypi.plugin.internal.RaspberrypiManagementDataHolder;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
public class RaspberrypiManagerService implements DeviceManagementService {
|
public class RaspberrypiManagerService implements DeviceManagementService {
|
||||||
|
|
||||||
private DeviceManager deviceManager;
|
private DeviceManager deviceManager;
|
||||||
|
private PushNotificationConfig pushNotificationConfig;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getType() {
|
public String getType() {
|
||||||
@ -40,6 +44,21 @@ public class RaspberrypiManagerService implements DeviceManagementService {
|
|||||||
@Override
|
@Override
|
||||||
public void init() throws DeviceManagementException {
|
public void init() throws DeviceManagementException {
|
||||||
deviceManager = new RaspberrypiManager();
|
deviceManager = new RaspberrypiManager();
|
||||||
|
this.pushNotificationConfig = this.populatePushNotificationConfig();
|
||||||
|
}
|
||||||
|
|
||||||
|
private PushNotificationConfig populatePushNotificationConfig() {
|
||||||
|
DeviceManagementConfiguration deviceManagementConfiguration = RaspberrypiManagementDataHolder.getInstance()
|
||||||
|
.getDeviceTypeConfigService().getConfiguration(RaspberrypiConstants.DEVICE_TYPE,
|
||||||
|
RaspberrypiConstants.DEVICE_TYPE_PROVIDER_DOMAIN);
|
||||||
|
org.wso2.carbon.device.mgt.iot.devicetype.config.PushNotificationConfig sourceConfig =
|
||||||
|
deviceManagementConfiguration.getPushNotificationConfig();
|
||||||
|
Map<String, String> staticProps = new HashMap<>();
|
||||||
|
for (org.wso2.carbon.device.mgt.iot.devicetype.config.PushNotificationConfig.Property
|
||||||
|
property : sourceConfig.getProperties()) {
|
||||||
|
staticProps.put(property.getName(), property.getValue());
|
||||||
|
}
|
||||||
|
return new PushNotificationConfig(sourceConfig.getPushNotificationProvider(), staticProps);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -64,7 +83,7 @@ public class RaspberrypiManagerService implements DeviceManagementService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PushNotificationConfig getPushNotificationConfig() {
|
public PushNotificationConfig getPushNotificationConfig() {
|
||||||
return null;
|
return pushNotificationConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl;
|
package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl;
|
||||||
|
|
||||||
|
import org.apache.commons.codec.binary.Base64;
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
@ -82,6 +83,7 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService {
|
|||||||
private static final String MQTT_PROTOCOL = "MQTT";
|
private static final String MQTT_PROTOCOL = "MQTT";
|
||||||
private static final String KEY_TYPE = "PRODUCTION";
|
private static final String KEY_TYPE = "PRODUCTION";
|
||||||
private static ApiApplicationKey apiApplicationKey;
|
private static ApiApplicationKey apiApplicationKey;
|
||||||
|
private static final String DEVICE_MGT_SCOPE_IDENTIFIER = "device-mgt";
|
||||||
private static Log log = LogFactory.getLog(VirtualFireAlarmServiceImpl.class);
|
private static Log log = LogFactory.getLog(VirtualFireAlarmServiceImpl.class);
|
||||||
|
|
||||||
@POST
|
@POST
|
||||||
@ -309,10 +311,13 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService {
|
|||||||
VirtualFireAlarmConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true);
|
VirtualFireAlarmConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true);
|
||||||
}
|
}
|
||||||
JWTClient jwtClient = APIUtil.getJWTClientManagerService().getJWTClient();
|
JWTClient jwtClient = APIUtil.getJWTClientManagerService().getJWTClient();
|
||||||
String scopes = "cdmf/" + VirtualFireAlarmConstants.DEVICE_TYPE + "/" + deviceId;
|
String device = "{ \"scope\":\"mqtt-publisher mqtt-subscriber\", \"deviceIdentifiers\":[{\"id\":\""+deviceId+"\", " +
|
||||||
|
"\"type\":\""+VirtualFireAlarmConstants.DEVICE_TYPE+"\"}]}";
|
||||||
|
Map<String, String> params = new HashMap<String, String>();
|
||||||
|
params.put("device", Base64.encodeBase64String(device.getBytes()));
|
||||||
AccessTokenInfo accessTokenInfo = jwtClient.getAccessToken(apiApplicationKey.getConsumerKey(),
|
AccessTokenInfo accessTokenInfo = jwtClient.getAccessToken(apiApplicationKey.getConsumerKey(),
|
||||||
apiApplicationKey.getConsumerSecret(), owner,
|
apiApplicationKey.getConsumerSecret(), owner,
|
||||||
scopes);
|
null, params);
|
||||||
String accessToken = accessTokenInfo.getAccessToken();
|
String accessToken = accessTokenInfo.getAccessToken();
|
||||||
String refreshToken = accessTokenInfo.getRefreshToken();
|
String refreshToken = accessTokenInfo.getRefreshToken();
|
||||||
XmppAccount newXmppAccount = new XmppAccount();
|
XmppAccount newXmppAccount = new XmppAccount();
|
||||||
|
|||||||
@ -45,7 +45,7 @@ public class XmppConfig {
|
|||||||
List<PushNotificationConfig.Property> properties = deviceManagementConfiguration.getPushNotificationConfig()
|
List<PushNotificationConfig.Property> properties = deviceManagementConfiguration.getPushNotificationConfig()
|
||||||
.getProperties();
|
.getProperties();
|
||||||
String provider = deviceManagementConfiguration.getPushNotificationConfig().getPushNotificationProvider();
|
String provider = deviceManagementConfiguration.getPushNotificationConfig().getPushNotificationProvider();
|
||||||
if (provider.equals("XMPP")) {
|
if ("XMPP".equals(provider)) {
|
||||||
enabled = true;
|
enabled = true;
|
||||||
}
|
}
|
||||||
if (enabled) {
|
if (enabled) {
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user