Commit 62b9ee28 authored by Vasek Sraier's avatar Vasek Sraier

removed code unrelated to Android app

parent 2b707b8f
Pipeline #42436 passed with stage
in 1 second
# This is an environment definition for docker deployment
RMBT_SECRET_KEY=rmbt_secret_key
RMBT_DB_USER=rmbt
RMBT_DB_PASSWORD=pgpass
RMBT_DB_HOST=pghost
TOMCAT_USER=admin
TOMCAT_PASSWORD=devpass
QOS_SERVER_NAME=qos.netmetr
SPEED_SERVER_NAME=speed.netmetr
......@@ -5,38 +5,6 @@ before_script:
stages:
- AndroidApp
- ControlServer
- MapServer
- QoSServer
- StatisticServer
ControlServer:
stage: ControlServer
except:
- tags
allow_failure: true
script:
- >
if git diff $LAST_PIPELINE_COMMIT HEAD --name-only|grep RMBTControlServer; then
echo "Starting Control Server build!" &&
cd RMBTControlServer/ && ./gradlew clean build && cd ..
fi;
artifacts:
paths:
- RMBTControlServer/build/libs/RMBTControlServer.war
ControlServerRelease:
stage: ControlServer
only:
- tags
allow_failure: true
script:
- >
echo "Starting Control Server build!" &&
cd RMBTControlServer/ && ./gradlew clean build && cd ..
artifacts:
paths:
- RMBTControlServer/build/libs/RMBTControlServer.war
AndroidAppDev:
stage: AndroidApp
......@@ -77,88 +45,4 @@ AndroidAppRelease:
cd RMBTAndroid/ && ./gradlew clean assembleRelease test lint && cd ..
artifacts:
paths:
- RMBTAndroid/build/outputs/apk/release/*.apk
StatisticServer:
stage: StatisticServer
except:
- tags
allow_failure: true
script:
- >
if git diff $LAST_PIPELINE_COMMIT HEAD --name-only|grep RMBTStatisticServer; then
echo "Starting Statistic Server build!" &&
cd RMBTStatisticServer/ && ./gradlew clean build && cd ..
fi;
artifacts:
paths:
- RMBTStatisticServer/build/libs/RMBTStatisticServer.war
StatisticServerRelease:
stage: StatisticServer
only:
- tags
allow_failure: true
script:
- >
echo "Starting Statistic Server build!" &&
cd RMBTStatisticServer/ && ./gradlew clean build && cd ..
artifacts:
paths:
- RMBTStatisticServer/build/libs/RMBTStatisticServer.war
QoSServer:
stage: QoSServer
except:
- tags
allow_failure: true
script:
- >
if git diff $LAST_PIPELINE_COMMIT HEAD --name-only|grep RMBTQoSServer; then
echo "Starting QoS Server build!" &&
cd RMBTQoSServer/ && ./gradlew clean build && cd ..
fi;
artifacts:
paths:
- RMBTQoSServer/build/libs/RMBTQoSServer.jar
QoSServerRelease:
stage: QoSServer
only:
- tags
allow_failure: true
script:
- >
echo "Starting QoS Server build!" &&
cd RMBTQoSServer/ && ./gradlew clean build && cd ..
artifacts:
paths:
- RMBTQoSServer/build/libs/RMBTQoSServer.jar
MapServer:
stage: MapServer
except:
- tags
allow_failure: true
script:
- >
if git diff $LAST_PIPELINE_COMMIT HEAD --name-only|grep RMBTMapServer; then
echo "Starting Map Server build!" &&
cd RMBTMapServer/ && ./gradlew clean build && cd ..
fi;
artifacts:
paths:
- RMBTMapServer/build/libs/RMBTMapServer.war
MapServerRelease:
stage: MapServer
only:
- tags
allow_failure: true
script:
- >
echo "Starting Map Server build!" &&
cd RMBTMapServer/ && ./gradlew clean build && cd ..
artifacts:
paths:
- RMBTMapServer/build/libs/RMBTMapServer.war
- RMBTAndroid/build/outputs/apk/release/*.apk
\ No newline at end of file
The following third party libraries are required dependencies:
### Google Play Services ###
- see <http://developer.android.com/google/play-services/setup.html>.
- copy "extras/google/google_play_services/libproject" as "google-play-services_lib" into the source distribution of *Open-RMBT*.
### Android Support Library ###
- see <http://developer.android.com/tools/extras/support-library.html>
- 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-18.0.jar"
### dnsjava ###
- BSD License
- available at <http://www.xbill.org/dnsjava/>
- copy as "RMBTSharedCode/lib/dnsjava-2.1.4.jar"
### PostgreSQL JDBC Driver ###
- BSD License
- available at <http://jdbc.postgresql.org/>
- copy as "RMBTSharedCode/lib/postgresql-9.2-1002.jdbc4.jar"
### JSON in Java ###
- MIT License (+ "The Software shall be used for Good, not Evil.")
- available at <http://www.json.org/java/index.html>
- copy as "RMBTSharedCode/lib/org.json.jar" and "RMBTClient/lib/org.json.jar"
### Simple Logging Facade for Java (SLF4J) ###
- MIT License
- available at <http://www.slf4j.org/>
- copy as "RMBTAndroid/libs/slf4j-android-1.5.8.jar"
### JOpt Simple ###
- MIT License
- available at <http://pholser.github.com/jopt-simple/>
- copy as "RMBTClient/lib/jopt-simple-3.2.jar"
### Apache Commons ###
- Apache 2.0 License
- available at <http://commons.apache.org/>
- copy as:
- "RMBTClient/lib/commons-logging-1.1.1.jar"
- "RMBTClient/lib/org.apache.httpclient.jar"
- "RMBTClient/lib/org.apache.httpcore.jar"
- "RMBTControlServer/WebContent/WEB-INF/lib/commons-csv-1.0.jar"
- "RMBTControlServer/WebContent/WEB-INF/lib/commons-io-2.4.jar"
### Restlet Framework ###
- Version: 2.1
- Licenses:
- Apache 2.0
- LGPL license version 3.0
- LGPL license version 2.1
- CDDL license version 1.0 or
- EPL license version 1.0
- available at <http://restlet.org/>
- copy as:
- "RMBTControlServer/WebContent/WEB-INF/lib/org.restlet.jar"
- "RMBTControlServer/WebContent/WEB-INF/lib/org.restlet.ext.json.jar"
- "RMBTControlServer/WebContent/WEB-INF/lib/org.restlet.ext.servlet.jar"
- "RMBTMapServer/WebContent/WEB-INF/lib/org.restlet.jar"
- "RMBTMapServer/WebContent/WEB-INF/lib/org.restlet.ext.json.jar"
- "RMBTMapServer/WebContent/WEB-INF/lib/org.restlet.ext.servlet.jar"
### PostGIS/ODBC ###
- Version: 2.1
- Licenses:
- GPL license version 2.0 (for PostGIS)
- LGPL license version 2.1 (for PostGIS/JDBC)
- available at <http://postgis.net/>
- copy as:
- "RMBTMapServer/WebContent/WEB-INF/lib/postgis.jar"
\ No newline at end of file
Open-RMBT
Netmetr Android
===============
*Open-RMBT* is an open source, multi-threaded bandwidth test written in Java and
C, consisting of:
- command line client
- Java Applet client
- 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 [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]: 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
- **RMBTUtil** - common libraries and classes
- **RMBTControlServer** - Servlet acting as control server for the clients
- **RMBTMapServer** - Servlet acting as map 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
Android client application for NetMetr.
Dependencies
---------------
See [DEPENDENCIES.md](DEPENDENCIES.md)
The following third party libraries are required dependencies:
### Google Play Services ###
- see <http://developer.android.com/google/play-services/setup.html>.
- copy "extras/google/google_play_services/libproject" as "google-play-services_lib" into the source distribution of *Open-RMBT*.
### Android Support Library ###
- see <http://developer.android.com/tools/extras/support-library.html>
- copy as "RMBTAndroid/libs/android-support-v13.jar"
### JSON in Java ###
- MIT License (+ "The Software shall be used for Good, not Evil.")
- available at <http://www.json.org/java/index.html>
- copy as "RMBTSharedCode/lib/org.json.jar" and "RMBTClient/lib/org.json.jar"
### Simple Logging Facade for Java (SLF4J) ###
- MIT License
- available at <http://www.slf4j.org/>
- copy as "RMBTAndroid/libs/slf4j-android-1.5.8.jar"
# Local testing setup using Docker
### JOpt Simple ###
See [docker/README.md](docker/README.md)
- MIT License
- available at <http://pholser.github.com/jopt-simple/>
- copy as "RMBTClient/lib/jopt-simple-3.2.jar"
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="src" path="/RMBTSharedCode">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
<classpathentry combineaccessrules="false" kind="src" path="/RMBTUtil"/>
<classpathentry combineaccessrules="false" kind="src" path="/util"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>RMBTControlServer</name>
<comment></comment>
<projects>
<project>RMBTSharedCode</project>
<project>RMBTUtil</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.zeroturnaround.eclipse.rebelXmlBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
<nature>org.zeroturnaround.eclipse.jrebelNature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="WebContent"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="output" path=""/>
</classpath>
eclipse.preferences.version=1
encoding//src/at/alladin/rmbt/res/Configuration.properties=UTF-8
encoding//src/at/alladin/rmbt/res/SystemMessages.properties=UTF-8
encoding//src/at/alladin/rmbt/res/SystemMessages_cs.properties=UTF-8
encoding//src/at/alladin/rmbt/res/SystemMessages_de.properties=UTF-8
encoding//src/at/alladin/rmbt/res/SystemMessages_es.properties=UTF-8
encoding//src/at/alladin/rmbt/res/SystemMessages_fr.properties=UTF-8
encoding//src/at/alladin/rmbt/res/SystemMessages_hr.properties=UTF-8
encoding//src/at/alladin/rmbt/res/SystemMessages_is.properties=UTF-8
encoding//src/at/alladin/rmbt/res/SystemMessages_pl.properties=UTF-8
encoding//src/at/alladin/rmbt/res/SystemMessages_sl.properties=UTF-8
encoding//src/at/alladin/rmbt/res/SystemMessages_sr-latn.properties=UTF-8
encoding//src/at/alladin/rmbt/res/SystemMessages_sr.properties=UTF-8
encoding//src/at/alladin/rmbt/res/SystemMessages_sv.properties=UTF-8
encoding//src/rebel.xml=UTF-8
encoding/<project>=UTF-8
eclipse.preferences.version=1
line.separator=\n
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.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
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
XDOCLETBUILDERACTIVE=true
XDOCLETHOME=
XDOCLETUSEGLOBAL=true
XDOCLETVERSION=1.2.1
eclipse.preferences.version=1
eclipse.preferences.version=1
org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="RMBTControlServer">
<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<dependent-module archiveName="RMBTSharedCode.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/RMBTSharedCode/RMBTSharedCode">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="RMBTUtil.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/RMBTUtil/RMBTUtil">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="RMBTControlServer"/>
<property name="java-output-path" value="/RMBTControlServer/build/classes"/>
</wb-module>
</project-modules>
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="Apache Tomcat v7.0"/>
<fixed facet="wst.jsdt.web"/>
<fixed facet="java"/>
<fixed facet="jst.web"/>
<installed facet="java" version="1.7"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project>
org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
eclipse.preferences.version=1
org.eclipse.wst.ws.service.policy.projectEnabled=false
<?xml version="1.0" encoding="UTF-8"?>
<Context path="/RMBTControlServer" docBase="RMBTControlServer" crossContext="true" reloadable="true">
<Resource name="jdbc/rmbt" auth="Container"
type="javax.sql.DataSource"
driverClassName="org.postgresql.Driver"
username="DB_USERNAME"
password="DB_PASSWORD"
maxActive="10"
maxIdle="5"
maxWait="-1"
removeAbandoned="true"
removeAbandonedTimeout="60"
logAbandoned="true"
url="jdbc:postgresql://localhost:5432/rmbt"/>