Commit 9ba13d59 authored by Benjamin Pucher's avatar Benjamin Pucher

merge with new specure version in progress

parent 33265297
......@@ -2,3 +2,4 @@ build/
.gradle/
*.iml
.DS_Store
=========================================================================
Open-RMBT
Copyright 2013-2014 alladin-IT GmbH
Copyright 2013-2016 SPECURE GmbH
This product includes software developed at
alladin-IT GmbH (http://www.alladin.at/).
SPECURE GmbH (https://www.specure.com/).
This product includes software developed at
alladin-IT GmbH (https://alladin.at/).
This product includes software developed at
Rundfunk und Telekom Regulierungs-GmbH (RTR-GmbH)
(https://www.rtr.at/).
......
......@@ -9,22 +9,29 @@ C, consisting of:
- Android client
- control Servlet based on Restlet
- map Servlet based on Restlet
- statistics Servlet based on Restlet
- test server (written in C)
- qos test server
*Open-RMBT* is released under the [Apache License, Version 2.0]. It was developed
by [alladin-IT GmbH] and financed by the
[Austrian Regulatory Authority for Broadcasting and Telecommunications (RTR-GmbH)] [RTR-GmbH].
by [alladin-IT GmbH] and [SPECURE GmbH] and financed by the
[Austrian Regulatory Authority for Broadcasting and Telecommunications (RTR-GmbH)] and the [Agency for communication networks and services of the Republic of Slovenia].
[alladin-IT GmbH]: http://alladin.at/
[RTR]: https://www.rtr.at/
[alladin-IT GmbH]: https://alladin.at/
[SPECURE GmbH]: https://www.specure.com/
[Austrian Regulatory Authority for Broadcasting and Telecommunications (RTR-GmbH)]: https://www.rtr.at/
[Agency for communication networks and services of the Republic of Slovenia]: http://www.akos-rs.si/
[Apache License, Version 2.0]: http://www.apache.org/licenses/LICENSE-2.0
The following Eclipse projects are distributed in this release:
- **RMBTSharedCode** - common libraries and classes for *RMBTControlServer*
- **RMBTSharedCode** - common libraries and classes
- **RMBTUtil** - common libraries and classes
- **RMBTControlServer** - Servlet acting as control server for the clients
- **RMBTMapServer** - Servlet acting as map server
- **server** - actual test server
- **RMBTStatisticServer** - Servlet acting as statistics server
- **RMBTServer** - speed test server
- **RMBTQoSServer** - qos test server
- **RMBTClient** - client code used by *RMBTAndroid*, the command line client and the Applet
- **RMBTAndroid** - Android App
......@@ -43,13 +50,13 @@ The following third party libraries are required dependencies:
### Android Support Library ###
- see <http://developer.android.com/tools/extras/support-library.html>
- copy as "RMBTAndroid/libs/android-support-v4.jar"
- copy as "RMBTAndroid/libs/android-support-v13.jar"
### Guava ###
- Apache 2.0. License
- available at <https://code.google.com/p/guava-libraries/>
- copy as "RMBTSharedCode/lib/guava-14.0.jar"
- copy as "RMBTSharedCode/lib/guava-18.0.jar"
### dnsjava ###
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry excluding="at/alladin/rmbt/client/applet/RMBTApplet.java" kind="src" path="src_RMBTClient"/>
<classpathentry excluding="at/alladin/rmbt/client/RMBTClientRunner.java|at/alladin/rmbt/client/applet/" kind="src" path="src_RMBTClient"/>
<classpathentry kind="src" path="gen"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry exported="true" kind="lib" path="/home/mlatner/.android/android-sdks/extras/android/support/v4/android-support-v4.jar"/>
<classpathentry kind="lib" path="/RMBTClient/libs/commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="/RMBTClient/libs/dnsjava-2.1.6.jar"/>
<classpathentry kind="lib" path="/RMBTClient/libs/jopt-simple-3.2.jar"/>
<classpathentry kind="lib" path="/RMBTClient/libs/org.json.jar"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/RMBTUtil"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
bin/
gen/
src_RMBTClient/
local.properties
build/
lib/
crashlytics.properties
assets/crashlytics-build.properties
res/values/com_crashlytics_export_strings.xml
.idea/
captures/
/bin
/gen
/src_RMBTClient
/local.properties
......@@ -5,6 +5,7 @@
<projects>
<project>google-play-services_lib</project>
<project>RMBTClient</project>
<project>RMBTUtil</project>
</projects>
<buildSpec>
<buildCommand>
......@@ -36,7 +37,7 @@
<link>
<name>src_RMBTClient</name>
<type>2</type>
<location>/home/mlatner/WorkspaceLuna/open-rmbt/RMBTClient/src</location>
<locationURI>PARENT-1-PROJECT_LOC/RMBTClient/src</locationURI>
</link>
</linkedResources>
</projectDescription>
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.6
......@@ -11,5 +11,8 @@
#proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt
# Project target.
target=android-19
android.library.reference.1=../../google-play-services_lib
target=android-22
android.library.reference.1=../google-play-services_lib
#target=android-22
#android.library.reference.1=../../google-play-services_lib
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2015 SPECURE GmbH
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.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
>
......@@ -9,8 +25,8 @@
android:fromYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:toXScale="1.25"
android:toYScale="1.25"
android:toXScale="1.1"
android:toYScale="1.1"
/>
<scale
android:fillEnabled="true"
......@@ -21,7 +37,7 @@
android:fromYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:toXScale="0.8"
android:toYScale="0.8"
android:toXScale="0.9"
android:toYScale="0.9"
/>
</set>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2015 SPECURE GmbH
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.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android" >
<!--
<scale
android:interpolator="@android:anim/linear_interpolator"
android:fromXScale="1"
android:toXScale="1"
android:fromYScale="1"
android:toYScale="0"
android:pivotY="50%"
android:duration="3000" />
-->
<alpha android:fromAlpha="1" android:toAlpha="0" android:duration="2700" />
</set>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2015 SPECURE GmbH
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.
-->
<scale xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="400"
android:fromXScale="1"
......@@ -7,5 +23,5 @@
android:pivotY="50%"
android:repeatCount="1"
android:repeatMode="reverse"
android:toXScale="1.25"
android:toYScale="1.25" />
\ No newline at end of file
android:toXScale="1.1"
android:toYScale="1.1" />
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2015 SPECURE GmbH
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.
-->
<rotate xmlns:android="http://schemas.android.com/apk/res/android"
android:fromDegrees="0"
android:toDegrees="360"
......
RMBTAndroid/res/drawable-hdpi/result_progress_darkblue.png

287 Bytes | W: | H:

RMBTAndroid/res/drawable-hdpi/result_progress_darkblue.png

2.8 KB | W: | H:

RMBTAndroid/res/drawable-hdpi/result_progress_darkblue.png
RMBTAndroid/res/drawable-hdpi/result_progress_darkblue.png
RMBTAndroid/res/drawable-hdpi/result_progress_darkblue.png
RMBTAndroid/res/drawable-hdpi/result_progress_darkblue.png
  • 2-up
  • Swipe
  • Onion skin
RMBTAndroid/res/drawable-hdpi/result_progress_lightblue.png

299 Bytes | W: | H:

RMBTAndroid/res/drawable-hdpi/result_progress_lightblue.png

2.82 KB | W: | H:

RMBTAndroid/res/drawable-hdpi/result_progress_lightblue.png
RMBTAndroid/res/drawable-hdpi/result_progress_lightblue.png
RMBTAndroid/res/drawable-hdpi/result_progress_lightblue.png
RMBTAndroid/res/drawable-hdpi/result_progress_lightblue.png
  • 2-up
  • Swipe
  • Onion skin