From fa54df2d4bb91c01e109b18349537326b940a5a7 Mon Sep 17 00:00:00 2001 From: Martin Deinhofer Date: Mon, 15 Feb 2016 22:43:57 +0100 Subject: [PATCH] in copy-custom-files: don't copy facetrackerlk and xfacetrackerlk released models removed old webservice/index.html files added APE.properties for installer --- APE.properties | 8 +- .../custom/bin/ARE/data/webservice/index.html | 448 ------------------ .../ARE/data/webservice/websockettest.html | 55 --- .../custom/bin/ARE/data/webservice/index.html | 448 ------------------ .../ARE/data/webservice/websockettest.html | 55 --- .../SmartHome-Integrated(W).acs | 76 +-- .../enOcean/enOcean-Lights(WLM).acs | 155 +----- build.xml | 3 + imported.xml | 4 +- 9 files changed, 51 insertions(+), 1201 deletions(-) delete mode 100644 CameraInput/FacetrackerLK-windows/custom/bin/ARE/data/webservice/index.html delete mode 100644 CameraInput/FacetrackerLK-windows/custom/bin/ARE/data/webservice/websockettest.html delete mode 100644 CameraInput/XFacetrackerLK/custom/bin/ARE/data/webservice/index.html delete mode 100644 CameraInput/XFacetrackerLK/custom/bin/ARE/data/webservice/websockettest.html diff --git a/APE.properties b/APE.properties index 3230f4c..ffbfb6a 100644 --- a/APE.properties +++ b/APE.properties @@ -31,13 +31,13 @@ APE.embedJava=false fx.deploy.nativeBundles=all #Name and version of the application -fx.application.name=p4all-demo-bundled +fx.application.name=asterics-prosperity4all-demos-bundled fx.application.version=0.1 #Provide more detailed information here -fx.info.title=Assistive Technology Application -fx.info.vendor=Asterics consortium -fx.info.description= +fx.info.title=AsTeRICS Prosperity4All Demos bundled +fx.info.vendor=UAS Technikum Wien, AsTeRICS consortium +fx.info.description=This application contains demos for each of the AsTeRICS building blocks contributed to the www.prosperity4all.eu project. fx.info.license=MIT | GPLv3 fx.info.category=Assistive Technology diff --git a/CameraInput/FacetrackerLK-windows/custom/bin/ARE/data/webservice/index.html b/CameraInput/FacetrackerLK-windows/custom/bin/ARE/data/webservice/index.html deleted file mode 100644 index c8ab474..0000000 --- a/CameraInput/FacetrackerLK-windows/custom/bin/ARE/data/webservice/index.html +++ /dev/null @@ -1,448 +0,0 @@ - - - - - - - - - - - - - - -
-

Websocket message:

-

-

-
- -
- - - -
- -
-

WebSocket Plugin:

-
-

inA:

-       -   - -
- - -
- -
- - - - - \ No newline at end of file diff --git a/CameraInput/FacetrackerLK-windows/custom/bin/ARE/data/webservice/websockettest.html b/CameraInput/FacetrackerLK-windows/custom/bin/ARE/data/webservice/websockettest.html deleted file mode 100644 index 684b323..0000000 --- a/CameraInput/FacetrackerLK-windows/custom/bin/ARE/data/webservice/websockettest.html +++ /dev/null @@ -1,55 +0,0 @@ - - -WebSocket Test - -

WebSocket Test

-
\ No newline at end of file diff --git a/CameraInput/XFacetrackerLK/custom/bin/ARE/data/webservice/index.html b/CameraInput/XFacetrackerLK/custom/bin/ARE/data/webservice/index.html deleted file mode 100644 index c8ab474..0000000 --- a/CameraInput/XFacetrackerLK/custom/bin/ARE/data/webservice/index.html +++ /dev/null @@ -1,448 +0,0 @@ - - - - - - - - - - - - - - -
-

Websocket message:

-

-

-
- -
- - - -
- -
-

WebSocket Plugin:

-
-

inA:

-       -   - -
- - -
- -
- - - - - \ No newline at end of file diff --git a/CameraInput/XFacetrackerLK/custom/bin/ARE/data/webservice/websockettest.html b/CameraInput/XFacetrackerLK/custom/bin/ARE/data/webservice/websockettest.html deleted file mode 100644 index 684b323..0000000 --- a/CameraInput/XFacetrackerLK/custom/bin/ARE/data/webservice/websockettest.html +++ /dev/null @@ -1,55 +0,0 @@ - - -WebSocket Test - -

WebSocket Test

-
\ No newline at end of file diff --git a/SmartHomeIntegration/custom/bin/ARE/models/SmartHomeIntegration/SmartHome-Integrated(W).acs b/SmartHomeIntegration/custom/bin/ARE/models/SmartHomeIntegration/SmartHome-Integrated(W).acs index ec189d7..14b66e2 100644 --- a/SmartHomeIntegration/custom/bin/ARE/models/SmartHomeIntegration/SmartHome-Integrated(W).acs +++ b/SmartHomeIntegration/custom/bin/ARE/models/SmartHomeIntegration/SmartHome-Integrated(W).acs @@ -1,5 +1,5 @@ - + @@ -90,10 +90,10 @@ 28 - 6587 - 2787 - 938 - 1000 + 8188 + 3000 + 1000 + 889 @@ -158,7 +158,7 @@ - + @@ -201,10 +201,10 @@ 506 - 4150 - 2787 - 2438 - 1000 + 5250 + 3000 + 2875 + 889 @@ -444,7 +444,7 @@ - + @@ -457,9 +457,9 @@ 349 - 4150 - 3787 - 3375 + 4188 + 4000 + 3312 1111 @@ -536,10 +536,10 @@ 168 - 7822 - 121 - 1562 - 2444 + 9322 + 3232 + 625 + 1111 @@ -622,10 +622,10 @@ 329 - 650 - 2787 + 625 + 4000 3500 - 2111 + 1111 @@ -800,10 +800,10 @@ 519 - 650 - 5009 - 8688 - 4333 + 625 + 5222 + 8562 + 4111 @@ -876,8 +876,8 @@ - - + + @@ -888,10 +888,10 @@ 844 - 7525 - 2787 - 1812 - 778 + 7562 + 4000 + 1625 + 1111 @@ -1008,10 +1008,10 @@ 732 - 697 - 1121 - 7062 - 1556 + 625 + 3000 + 4562 + 889 @@ -1513,10 +1513,10 @@ false false - 685 - 2711 + 610 + 2889 8688 - 6667 + 6556 \ No newline at end of file diff --git a/SmartHomeIntegration/enOcean/custom/bin/ARE/models/SmartHomeIntegration/enOcean/enOcean-Lights(WLM).acs b/SmartHomeIntegration/enOcean/custom/bin/ARE/models/SmartHomeIntegration/enOcean/enOcean-Lights(WLM).acs index d0b2caf..b97634e 100644 --- a/SmartHomeIntegration/enOcean/custom/bin/ARE/models/SmartHomeIntegration/enOcean/enOcean-Lights(WLM).acs +++ b/SmartHomeIntegration/enOcean/custom/bin/ARE/models/SmartHomeIntegration/enOcean/enOcean-Lights(WLM).acs @@ -1,5 +1,5 @@ - + KNX Demo application This model controls the lightning of the KNX Gamma Trainingskit. @@ -83,71 +83,6 @@ individually with other string formatting plugins. 4889 - - My Plugin description - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 418 - 106 - - Enables the ARE to communicate with an EnOcean wireless network @@ -239,8 +174,8 @@ individually with other string formatting plugins. - 687 - 128 + 438 + 104 @@ -361,90 +296,6 @@ individually with other string formatting plugins. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build.xml b/build.xml index cf9d7fe..fef63f3 100644 --- a/build.xml +++ b/build.xml @@ -20,6 +20,9 @@ + + + diff --git a/imported.xml b/imported.xml index 363bd57..3612849 100644 --- a/imported.xml +++ b/imported.xml @@ -123,7 +123,9 @@ - + + +