diff --git a/gastsystem/index.php b/gastsystem/index.php index aed2c09..2bf2adb 100644 --- a/gastsystem/index.php +++ b/gastsystem/index.php @@ -9,8 +9,8 @@ - - + + @@ -115,7 +115,7 @@
  OrderSprinter
-
1.6.10  
+
2.0.0  
diff --git a/gastsystem/install.php b/gastsystem/install.php index e24221c..f0b8283 100644 --- a/gastsystem/install.php +++ b/gastsystem/install.php @@ -114,10 +114,10 @@ if (isset($_POST['code'])) { } else { echo ""; echo "Installation Gastsystem"; - echo ''; + echo ''; echo ""; echo "
"; - echo "Installation OrderSprinter-Gastsystem 1.6.10

"; + echo "Installation OrderSprinter-Gastsystem 2.0.0

"; echo "
"; echo "
"; echo "
"; diff --git a/gastsystem/php/config.php b/gastsystem/php/config.php index 939b62a..c534985 100644 --- a/gastsystem/php/config.php +++ b/gastsystem/php/config.php @@ -2,7 +2,7 @@ error_reporting(E_ERROR); // Database to use: 'mysql' or 'file' -defined('DB') || define ( 'DB','file' ); +defined('DB') || define ( 'DB','mysql' ); // Datenbank-Zugangsdaten defined('MYSQL_HOST') || define ( 'MYSQL_HOST','localhost' ); @@ -24,4 +24,4 @@ defined('IMAGES_FILE') || define ('IMAGES_FILE', 'images.db'); defined('QUEUE_FILE') || define ('QUEUE_FILE', 'queue.db'); defined('LOG') || define ('LOG', false); -defined('MAX_LOG_CHARS') || define ('MAX_LOG_CHARS', 10000); \ No newline at end of file +defined('MAX_LOG_CHARS') || define ('MAX_LOG_CHARS', 10000); diff --git a/gastsystem/php/menu.php b/gastsystem/php/menu.php index 1690743..fa04139 100644 --- a/gastsystem/php/menu.php +++ b/gastsystem/php/menu.php @@ -33,7 +33,7 @@ class Menu { $prodids[] = $p["id"]; } } - $sql = "SELECT IFNULL(content,'') as content FROM %images% WHERE contenttype=? AND productid=?"; + $sql = "SELECT COALESCE(content,'') as content FROM %images% WHERE contenttype=? AND productid=?"; foreach($prodids as $prodid) { $img = DbUtils::getImageData($pdo, '', $prodid); if (!is_null($img)) { diff --git a/gastsystem/php/queue.php b/gastsystem/php/queue.php index 5ec0ea6..ff6911a 100644 --- a/gastsystem/php/queue.php +++ b/gastsystem/php/queue.php @@ -16,9 +16,9 @@ class Queue { foreach($orders as $anOrder) { $prodid = $anOrder["prodid"]; DbUtils::execSql($pdo, $sql, array($ordertime,$prodid,$tableid,$tablecode,$dailycode)); - $pdo->commit(); DbUtils::log("Added product with id $prodid to mysql queue table"); } + $pdo->commit(); return array("status" => "OK"); } else { diff --git a/javaprinter/javaprinter.jar b/javaprinter/javaprinter.jar deleted file mode 100644 index ee43df0..0000000 Binary files a/javaprinter/javaprinter.jar and /dev/null differ diff --git a/javaprinter/config.json b/printserver/javaprinter/config.json similarity index 100% rename from javaprinter/config.json rename to printserver/javaprinter/config.json diff --git a/printserver/javaprinter/javaprinter.jar b/printserver/javaprinter/javaprinter.jar new file mode 100644 index 0000000..79c3d0d Binary files /dev/null and b/printserver/javaprinter/javaprinter.jar differ diff --git a/javaprinter/javaprinter_lib/LICENSE-apache-commons.txt b/printserver/javaprinter/javaprinter_lib/LICENSE-apache-commons.txt similarity index 100% rename from javaprinter/javaprinter_lib/LICENSE-apache-commons.txt rename to printserver/javaprinter/javaprinter_lib/LICENSE-apache-commons.txt diff --git a/javaprinter/javaprinter_lib/LICENSE-jackson-jr.html b/printserver/javaprinter/javaprinter_lib/LICENSE-jackson-jr.html similarity index 100% rename from javaprinter/javaprinter_lib/LICENSE-jackson-jr.html rename to printserver/javaprinter/javaprinter_lib/LICENSE-jackson-jr.html diff --git a/javaprinter/javaprinter_lib/LICENSE-usb4java.md b/printserver/javaprinter/javaprinter_lib/LICENSE-usb4java.md similarity index 100% rename from javaprinter/javaprinter_lib/LICENSE-usb4java.md rename to printserver/javaprinter/javaprinter_lib/LICENSE-usb4java.md diff --git a/javaprinter/javaprinter_lib/LICENSE_usb-api_CommonPublicLicense.txt b/printserver/javaprinter/javaprinter_lib/LICENSE_usb-api_CommonPublicLicense.txt similarity index 100% rename from javaprinter/javaprinter_lib/LICENSE_usb-api_CommonPublicLicense.txt rename to printserver/javaprinter/javaprinter_lib/LICENSE_usb-api_CommonPublicLicense.txt diff --git a/javaprinter/javaprinter_lib/commons-codec-1.10.jar b/printserver/javaprinter/javaprinter_lib/commons-codec-1.10.jar similarity index 100% rename from javaprinter/javaprinter_lib/commons-codec-1.10.jar rename to printserver/javaprinter/javaprinter_lib/commons-codec-1.10.jar diff --git a/javaprinter/javaprinter_lib/commons-lang3-3.2.1.jar b/printserver/javaprinter/javaprinter_lib/commons-lang3-3.2.1.jar similarity index 100% rename from javaprinter/javaprinter_lib/commons-lang3-3.2.1.jar rename to printserver/javaprinter/javaprinter_lib/commons-lang3-3.2.1.jar diff --git a/javaprinter/javaprinter_lib/jackson-annotations-2.5.4.jar b/printserver/javaprinter/javaprinter_lib/jackson-annotations-2.5.4.jar similarity index 100% rename from javaprinter/javaprinter_lib/jackson-annotations-2.5.4.jar rename to printserver/javaprinter/javaprinter_lib/jackson-annotations-2.5.4.jar diff --git a/javaprinter/javaprinter_lib/jackson-core-2.5.4.jar b/printserver/javaprinter/javaprinter_lib/jackson-core-2.5.4.jar similarity index 100% rename from javaprinter/javaprinter_lib/jackson-core-2.5.4.jar rename to printserver/javaprinter/javaprinter_lib/jackson-core-2.5.4.jar diff --git a/javaprinter/javaprinter_lib/jackson-databind-2.5.4.jar b/printserver/javaprinter/javaprinter_lib/jackson-databind-2.5.4.jar similarity index 100% rename from javaprinter/javaprinter_lib/jackson-databind-2.5.4.jar rename to printserver/javaprinter/javaprinter_lib/jackson-databind-2.5.4.jar diff --git a/javaprinter/javaprinter_lib/libusb4java-1.2.0-linux-arm.jar b/printserver/javaprinter/javaprinter_lib/libusb4java-1.2.0-linux-arm.jar similarity index 100% rename from javaprinter/javaprinter_lib/libusb4java-1.2.0-linux-arm.jar rename to printserver/javaprinter/javaprinter_lib/libusb4java-1.2.0-linux-arm.jar diff --git a/javaprinter/javaprinter_lib/libusb4java-1.2.0-linux-x86.jar b/printserver/javaprinter/javaprinter_lib/libusb4java-1.2.0-linux-x86.jar similarity index 100% rename from javaprinter/javaprinter_lib/libusb4java-1.2.0-linux-x86.jar rename to printserver/javaprinter/javaprinter_lib/libusb4java-1.2.0-linux-x86.jar diff --git a/javaprinter/javaprinter_lib/libusb4java-1.2.0-linux-x86_64.jar b/printserver/javaprinter/javaprinter_lib/libusb4java-1.2.0-linux-x86_64.jar similarity index 100% rename from javaprinter/javaprinter_lib/libusb4java-1.2.0-linux-x86_64.jar rename to printserver/javaprinter/javaprinter_lib/libusb4java-1.2.0-linux-x86_64.jar diff --git a/javaprinter/javaprinter_lib/usb-api-1.0.2.jar b/printserver/javaprinter/javaprinter_lib/usb-api-1.0.2.jar similarity index 100% rename from javaprinter/javaprinter_lib/usb-api-1.0.2.jar rename to printserver/javaprinter/javaprinter_lib/usb-api-1.0.2.jar diff --git a/javaprinter/javaprinter_lib/usb4java-1.2.0.jar b/printserver/javaprinter/javaprinter_lib/usb4java-1.2.0.jar similarity index 100% rename from javaprinter/javaprinter_lib/usb4java-1.2.0.jar rename to printserver/javaprinter/javaprinter_lib/usb4java-1.2.0.jar diff --git a/javaprinter/javaprinter_lib/usb4java-javax-1.2.0.jar b/printserver/javaprinter/javaprinter_lib/usb4java-javax-1.2.0.jar similarity index 100% rename from javaprinter/javaprinter_lib/usb4java-javax-1.2.0.jar rename to printserver/javaprinter/javaprinter_lib/usb4java-javax-1.2.0.jar diff --git a/javaprinter/readme.txt b/printserver/javaprinter/readme.txt similarity index 90% rename from javaprinter/readme.txt rename to printserver/javaprinter/readme.txt index 032621e..930c5fc 100644 --- a/javaprinter/readme.txt +++ b/printserver/javaprinter/readme.txt @@ -19,7 +19,7 @@ java -jar javaprinter.jar /Pfad/zur/config.json. In der Konfigurationsdatei können unter anderem folgende Parameter gesetzt werden: - printersize: maximale Anzahl der Zeichen pro Zeile, die der Drucker ausgeben kann -- printcode: Printcode, wie in der Verwaltungsoberfläche vom OrderSprinter angegeben ist. Wurde kein Printcode vergeben, können keine Druckjobs ausgegeben werden. +- printcode: Printcode, wie in der Administrationsoberfläche vom OrderSprinter angegeben ist. Wurde kein Printcode vergeben, können keine Druckjobs ausgegeben werden. - logoscale: Skalierung des Logos auf dem Kassenbon. Mit diesem Wert kann die Abbildung vergrößert oder verkleiner werden. - baseurl: Basis-Webadresse des Webservers auf dem OrderSprinter läuft (z.B. http://www.mein-restaurant.de/ordersprinter) - baseusername und basepass: Ist der OrderSprinter-Webserver über BasicAuthentication geschützt, so können hier Benutzername und Passwort angegeben werden. diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/windows/OrderSprinterPrintserver.exe similarity index 68% rename from printserver/OrderSprinterPrintserver.exe rename to printserver/windows/OrderSprinterPrintserver.exe index eb85d2e..4111be8 100644 Binary files a/printserver/OrderSprinterPrintserver.exe and b/printserver/windows/OrderSprinterPrintserver.exe differ diff --git a/readme.txt b/readme.txt index 577d11a..f23f517 100644 --- a/readme.txt +++ b/readme.txt @@ -14,9 +14,13 @@ Spider ist eine eigenständige Webapplikation, mit der man verschiedene OrderSpr printserver: ------------ +In diesem Ordner befinden sich die beiden Printserver, einmal für Windows und einmal als Java-Version für den Einsatz auf Linux.Systemen. + +printserver/windows: +-------------------- In diesem Ordner befindet sich der Windows-Printserver. Er kann alleine oder in Kombination mit dem Javaprinter eingesetzt werden. -javaprinter: +printserver/javaprinter: ------------ In diesem Ordner befindet sich der Java-Printserver. Er eignet sich für den Einsatz auf Linux-Systemen. Er kann alleine oder in Kombination mit dem Windows-Printserver eingesetzt werden. @@ -29,3 +33,8 @@ gastsystem: In diesem Ordner befindet sich die Webapplikation für das Gastbestellsystem. Wenn es also gewünscht ist, dass auch Gäste von ihrem Tisch aus Bestellungen aufgeben können, so benötigt man diese Komponente. Das Gastsystem setzt man bevorzugt auf einem Server auf, welches im Internet erreichbar ist. Es muss allerdings vom Webserver, auf dem die Kernapplikation läuft, erreichbar sein. +tseconnector: +------------- +In diesem Ordner befindet sich die Komponente für die Ansteuerung der TSE als Java-Programm. Im ersten Schritt werden nur die lokalen TSE der Firma Swissbit unterstützt. + +Zur Benutzung sei auf die Beschreibung in der Bedienungsanleitung verwiesen. \ No newline at end of file diff --git a/scripts/Liesmich.txt b/scripts/Liesmich.txt index 44af2dc..ad59470 100644 --- a/scripts/Liesmich.txt +++ b/scripts/Liesmich.txt @@ -20,7 +20,7 @@ Im Skript müssen am Anfang einige Variablen angepasst werden: - der Gerätenamen des Sticks - die Zugangsparameter der Datenbank (lassen sich aus der config.php) entnehmen, wenn nicht mehr bekannt. Die Angabe ist nur erforderlich, wenn mysqldump statt das OrderSprinter-internen Backup verwendet werden soll. - die Server-Baseadresse -- der Remoteaccess-Code, wie er zuvor in der Verwaltungsansicht eingestellt werden muss +- der Remoteaccess-Code, wie er zuvor in der Administrationsansicht eingestellt werden muss - das Format json oder zip: Wurde in der OrderSprinter-Konfiguration ein tmp-Verzeichnis festgelegt, so werden komprimierte Backups erzeugt (zip), anderenfalls ist json einzutragen. Im Skript ist standardmäßig die OrderSprinter-interne Backuperstellung aktiviert (Zeile, die mit "wget" beginnt). Alternativ kann auch das MySQL-Dump verwendet werden, dazu ist die mit wget diff --git a/spider/install/installer.php b/spider/install/installer.php index 34ba322..4d3c6f3 100644 --- a/spider/install/installer.php +++ b/spider/install/installer.php @@ -85,7 +85,7 @@ class Installer { } Database::dropTables($pdo); Database::createEmptyTables($pdo, $prefix); - Database::setVersion($pdo,$prefix,"1.6.10"); + Database::setVersion($pdo,$prefix,"2.0.0"); Database::setAccessPassword($pdo,$prefix,$adminpass); Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour return array("status" => "OK","msg" => "Installation successful"); diff --git a/tseconnector/swissbit/nativelibs/linux32/libWormAPI.so b/tseconnector/swissbit/nativelibs/linux32/libWormAPI.so new file mode 100644 index 0000000..e97678d Binary files /dev/null and b/tseconnector/swissbit/nativelibs/linux32/libWormAPI.so differ diff --git a/tseconnector/swissbit/nativelibs/linux32/libWormAPIJni.so b/tseconnector/swissbit/nativelibs/linux32/libWormAPIJni.so new file mode 100644 index 0000000..1bdaa3b Binary files /dev/null and b/tseconnector/swissbit/nativelibs/linux32/libWormAPIJni.so differ diff --git a/tseconnector/swissbit/nativelibs/linux64/libWormAPI.so b/tseconnector/swissbit/nativelibs/linux64/libWormAPI.so new file mode 100644 index 0000000..dc79065 Binary files /dev/null and b/tseconnector/swissbit/nativelibs/linux64/libWormAPI.so differ diff --git a/tseconnector/swissbit/nativelibs/linux64/libWormAPIJni.so b/tseconnector/swissbit/nativelibs/linux64/libWormAPIJni.so new file mode 100644 index 0000000..5990ded Binary files /dev/null and b/tseconnector/swissbit/nativelibs/linux64/libWormAPIJni.so differ diff --git a/tseconnector/swissbit/nativelibs/windows64/WormAPI.dll b/tseconnector/swissbit/nativelibs/windows64/WormAPI.dll new file mode 100644 index 0000000..313a846 Binary files /dev/null and b/tseconnector/swissbit/nativelibs/windows64/WormAPI.dll differ diff --git a/tseconnector/swissbit/nativelibs/windows64/WormAPIJni.dll b/tseconnector/swissbit/nativelibs/windows64/WormAPIJni.dll new file mode 100644 index 0000000..c7690f5 Binary files /dev/null and b/tseconnector/swissbit/nativelibs/windows64/WormAPIJni.dll differ diff --git a/tseconnector/swissbit/tseconnector.jar b/tseconnector/swissbit/tseconnector.jar new file mode 100644 index 0000000..b6546dc Binary files /dev/null and b/tseconnector/swissbit/tseconnector.jar differ diff --git a/tseconnector/swissbit/tseconnector_lib/LICENSE-apache-commons.txt b/tseconnector/swissbit/tseconnector_lib/LICENSE-apache-commons.txt new file mode 100644 index 0000000..75b5248 --- /dev/null +++ b/tseconnector/swissbit/tseconnector_lib/LICENSE-apache-commons.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/tseconnector/swissbit/tseconnector_lib/LICENSE-jackson-jr.html b/tseconnector/swissbit/tseconnector_lib/LICENSE-jackson-jr.html new file mode 100644 index 0000000..891050c --- /dev/null +++ b/tseconnector/swissbit/tseconnector_lib/LICENSE-jackson-jr.html @@ -0,0 +1,1606 @@ + + + + + + + + + + + + + jackson-jr/LICENSE at master · FasterXML/jackson-jr · GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Skip to content +
+ + + + + + + + + + + +
+
+
+ +
+
+
+ + + + +

+ + /jackson-jr + + + + + +

+
+
+ +
+
+
+ + + +
+ +
+

HTTPS clone URL

+
+ + + + +
+
+ + +
+

Subversion checkout URL

+
+ + + + +
+
+ + + +
You can clone with +
or
. + + + +
+ + + + + + + Download ZIP + +
+
+ +
+ + + + + + + + + + +
+
+ @cowtowncoder + cowtowncoder + + +
+ + + +
+ +
+
+
+ +
+ Raw + Blame + History +
+ + + + + +
+ +
+ 192 lines (155 sloc) + + 10.273 kB +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
1. Definitions.
+
"License" shall mean the terms and conditions for use, reproduction, and
distribution as defined by Sections 1 through 9 of this document.
+
"Licensor" shall mean the copyright owner or entity authorized by the copyright
owner that is granting the License.
+
"Legal Entity" shall mean the union of the acting entity and all other entities
that control, are controlled by, or are under common control with that entity.
For the purposes of this definition, "control" means (i) the power, direct or
indirect, to cause the direction or management of such entity, whether by
contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
+
"You" (or "Your") shall mean an individual or Legal Entity exercising
permissions granted by this License.
+
"Source" form shall mean the preferred form for making modifications, including
but not limited to software source code, documentation source, and configuration
files.
+
"Object" form shall mean any form resulting from mechanical transformation or
translation of a Source form, including but not limited to compiled object code,
generated documentation, and conversions to other media types.
+
"Work" shall mean the work of authorship, whether in Source or Object form, made
available under the License, as indicated by a copyright notice that is included
in or attached to the work (an example is provided in the Appendix below).
+
"Derivative Works" shall mean any work, whether in Source or Object form, that
is based on (or derived from) the Work and for which the editorial revisions,
annotations, elaborations, or other modifications represent, as a whole, an
original work of authorship. For the purposes of this License, Derivative Works
shall not include works that remain separable from, or merely link (or bind by
name) to the interfaces of, the Work and Derivative Works thereof.
+
"Contribution" shall mean any work of authorship, including the original version
of the Work and any modifications or additions to that Work or Derivative Works
thereof, that is intentionally submitted to Licensor for inclusion in the Work
by the copyright owner or by an individual or Legal Entity authorized to submit
on behalf of the copyright owner. For the purposes of this definition,
"submitted" means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems, and
issue tracking systems that are managed by, or on behalf of, the Licensor for
the purpose of discussing and improving the Work, but excluding communication
that is conspicuously marked or otherwise designated in writing by the copyright
owner as "Not a Contribution."
+
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
of whom a Contribution has been received by Licensor and subsequently
incorporated within the Work.
+
2. Grant of Copyright License.
+
Subject to the terms and conditions of this License, each Contributor hereby
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the Work and such
Derivative Works in Source or Object form.
+
3. Grant of Patent License.
+
Subject to the terms and conditions of this License, each Contributor hereby
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable (except as stated in this section) patent license to make, have
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
such license applies only to those patent claims licensable by such Contributor
that are necessarily infringed by their Contribution(s) alone or by combination
of their Contribution(s) with the Work to which such Contribution(s) was
submitted. If You institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
Contribution incorporated within the Work constitutes direct or contributory
patent infringement, then any patent licenses granted to You under this License
for that Work shall terminate as of the date such litigation is filed.
+
4. Redistribution.
+
You may reproduce and distribute copies of the Work or Derivative Works thereof
in any medium, with or without modifications, and in Source or Object form,
provided that You meet the following conditions:
+
You must give any other recipients of the Work or Derivative Works a copy of
this License; and
You must cause any modified files to carry prominent notices stating that You
changed the files; and
You must retain, in the Source form of any Derivative Works that You distribute,
all copyright, patent, trademark, and attribution notices from the Source form
of the Work, excluding those notices that do not pertain to any part of the
Derivative Works; and
If the Work includes a "NOTICE" text file as part of its distribution, then any
Derivative Works that You distribute must include a readable copy of the
attribution notices contained within such NOTICE file, excluding those notices
that do not pertain to any part of the Derivative Works, in at least one of the
following places: within a NOTICE text file distributed as part of the
Derivative Works; within the Source form or documentation, if provided along
with the Derivative Works; or, within a display generated by the Derivative
Works, if and wherever such third-party notices normally appear. The contents of
the NOTICE file are for informational purposes only and do not modify the
License. You may add Your own attribution notices within Derivative Works that
You distribute, alongside or as an addendum to the NOTICE text from the Work,
provided that such additional attribution notices cannot be construed as
modifying the License.
You may add Your own copyright statement to Your modifications and may provide
additional or different license terms and conditions for use, reproduction, or
distribution of Your modifications, or for any such Derivative Works as a whole,
provided Your use, reproduction, and distribution of the Work otherwise complies
with the conditions stated in this License.
+
5. Submission of Contributions.
+
Unless You explicitly state otherwise, any Contribution intentionally submitted
for inclusion in the Work by You to the Licensor shall be under the terms and
conditions of this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify the terms of
any separate license agreement you may have executed with Licensor regarding
such Contributions.
+
6. Trademarks.
+
This License does not grant permission to use the trade names, trademarks,
service marks, or product names of the Licensor, except as required for
reasonable and customary use in describing the origin of the Work and
reproducing the content of the NOTICE file.
+
7. Disclaimer of Warranty.
+
Unless required by applicable law or agreed to in writing, Licensor provides the
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
including, without limitation, any warranties or conditions of TITLE,
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
solely responsible for determining the appropriateness of using or
redistributing the Work and assume any risks associated with Your exercise of
permissions under this License.
+
8. Limitation of Liability.
+
In no event and under no legal theory, whether in tort (including negligence),
contract, or otherwise, unless required by applicable law (such as deliberate
and grossly negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special, incidental,
or consequential damages of any character arising as a result of this License or
out of the use or inability to use the Work (including but not limited to
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
any and all other commercial damages or losses), even if such Contributor has
been advised of the possibility of such damages.
+
9. Accepting Warranty or Additional Liability.
+
While redistributing the Work or Derivative Works thereof, You may choose to
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
other liability obligations and/or rights consistent with this License. However,
in accepting such obligations, You may act only on Your own behalf and on Your
sole responsibility, not on behalf of any other Contributor, and only if You
agree to indemnify, defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason of your
accepting any such warranty or additional liability.
+
END OF TERMS AND CONDITIONS
+
APPENDIX: How to apply the Apache License to your work
+
To apply the Apache License to your work, attach the following boilerplate
notice, with the fields enclosed by brackets "[]" replaced with your own
identifying information. (Don't include the brackets!) The text should be
enclosed in the appropriate comment syntax for the file format. We also
recommend that a file or class name and description of purpose be included on
the same "printed page" as the copyright notice for easier identification within
third-party archives.
+
Copyright [yyyy] [name of copyright owner]
+
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.
+ +
+ +
+ +Jump to Line + + +
+ +
+ +
+
+ + +
+ +
+ +
+ + +
+
+
+ +
+
+
+
+
+
+ + + + + + +
+
+ + + + + + +
+ + + Something went wrong with that request. Please try again. +
+ + + + + + + + + diff --git a/tseconnector/swissbit/tseconnector_lib/LICENSE-json-simple.txt b/tseconnector/swissbit/tseconnector_lib/LICENSE-json-simple.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/tseconnector/swissbit/tseconnector_lib/LICENSE-json-simple.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/tseconnector/swissbit/tseconnector_lib/LICENSE_Swissbit_Wormapi.pdf b/tseconnector/swissbit/tseconnector_lib/LICENSE_Swissbit_Wormapi.pdf new file mode 100644 index 0000000..111dff6 Binary files /dev/null and b/tseconnector/swissbit/tseconnector_lib/LICENSE_Swissbit_Wormapi.pdf differ diff --git a/tseconnector/swissbit/tseconnector_lib/WormAPI.jar b/tseconnector/swissbit/tseconnector_lib/WormAPI.jar new file mode 100644 index 0000000..08d4bcf Binary files /dev/null and b/tseconnector/swissbit/tseconnector_lib/WormAPI.jar differ diff --git a/tseconnector/swissbit/tseconnector_lib/commons-codec-1.14.jar b/tseconnector/swissbit/tseconnector_lib/commons-codec-1.14.jar new file mode 100644 index 0000000..49ffa9b Binary files /dev/null and b/tseconnector/swissbit/tseconnector_lib/commons-codec-1.14.jar differ diff --git a/tseconnector/swissbit/tseconnector_lib/jackson-annotations-2.10.1.jar b/tseconnector/swissbit/tseconnector_lib/jackson-annotations-2.10.1.jar new file mode 100644 index 0000000..a10399c Binary files /dev/null and b/tseconnector/swissbit/tseconnector_lib/jackson-annotations-2.10.1.jar differ diff --git a/tseconnector/swissbit/tseconnector_lib/jackson-core-2.10.1.jar b/tseconnector/swissbit/tseconnector_lib/jackson-core-2.10.1.jar new file mode 100644 index 0000000..1640a4e Binary files /dev/null and b/tseconnector/swissbit/tseconnector_lib/jackson-core-2.10.1.jar differ diff --git a/tseconnector/swissbit/tseconnector_lib/jackson-databind-2.10.1.jar b/tseconnector/swissbit/tseconnector_lib/jackson-databind-2.10.1.jar new file mode 100644 index 0000000..abe3748 Binary files /dev/null and b/tseconnector/swissbit/tseconnector_lib/jackson-databind-2.10.1.jar differ diff --git a/tseconnector/swissbit/tseconnector_lib/json-simple-1.1.1.jar b/tseconnector/swissbit/tseconnector_lib/json-simple-1.1.1.jar new file mode 100644 index 0000000..66347a6 Binary files /dev/null and b/tseconnector/swissbit/tseconnector_lib/json-simple-1.1.1.jar differ diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe index eb85d2e..4111be8 100644 Binary files a/webapp/OrderSprinterPrintserver.exe and b/webapp/OrderSprinterPrintserver.exe differ diff --git a/webapp/bar.html b/webapp/bar.html index cac5e23..61c2af5 100644 --- a/webapp/bar.html +++ b/webapp/bar.html @@ -5,7 +5,7 @@ - + @@ -13,8 +13,8 @@ - - + + - + -
Banner
+
+ Banner +
-