From 71c0c9081e89122e732fe1ad8baf3b4d5ebaa835 Mon Sep 17 00:00:00 2001
From: Sebastian Lopienski <Sebastian.Lopienski@cern.ch>
Date: Thu, 18 Dec 2014 17:01:14 +0100
Subject: [PATCH] Minor fixes in apps.json

---
 share/apps.json                               |  27 +++++++++++-------
 .../icons/OmniTouch 8660 My Teamwork.png      | Bin 0 -> 2034 bytes
 2 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 share/images/icons/OmniTouch 8660 My Teamwork.png

diff --git a/share/apps.json b/share/apps.json
index e59311de0..8e20fc122 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -312,7 +312,7 @@
 			"website": "jfrog.com/open-source/#os-arti",
 			"cats": [ 47 ],
 			"env": "^ArtifactoryUpdates$",
-			"script": [ "wicket/resource/org\\.artifactory." ],
+			"script": [ "wicket/resource/org\\.artifactory\\." ],
 			"html": [ "<span class=\"version\">Artifactory(?: Pro)?(?: Power Pack)?(?: ([\\d.]+))?\\;version:\\1" ]
 		},
 		"AsciiDoc": {
@@ -867,11 +867,6 @@
 			"meta": { "generator": "DataLife Engine" },
 			"implies": [ "PHP", "Apache" ]
 		},
-		"DAV": {
-			"website": "???",
-			"cats": [ 33 ],
-			"headers": { "Server": "\\bDAV\\b(?:/([\\d.]+))?\\;version:\\1" }
-		},
 		"David Webbox": {
 			"website": "www.tobit.com",
 			"cats": [ 22 ],
@@ -1518,7 +1513,8 @@
 		"Happy ICS Server": {
 			"website": "???",
 			"cats": [ 22 ],
-			"headers": { "Server": "Happy ICS Server(?:/([\\d.]+))?\\;version:\\1" }
+			"headers": { "Server": "Happy ICS Server(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": "OmniTouch 8660 My Teamwork"
 		},
 		"HeadJS": {
 			"website": "headjs.com",
@@ -1599,7 +1595,7 @@
 		"HTTP-Server": {
 			"website": "???",
 			"cats": [ 22 ],
-			"headers": { "Server": "\\bHTTP-Server(?: ?/?V?([\\d.]+))?\\;version:\\1" }
+			"headers": { "Server": "(?:^|[^-])\\bHTTP-Server(?: ?/?V?([\\d.]+))?\\;version:\\1" }
 		},
 		"HubSpot": {
 			"website": "hubspot.com",
@@ -2210,7 +2206,7 @@
 			"cats": [ 18 ],
 			"url": "\\.aspx(?:$|\\?)",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
-			"headers": { "X-Powered-By": "ASP\\.NET\\;confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1", "Set-Cookie": "(ASPSESSION|ASP\\.NET_SessionId)" },
+			"headers": { "X-Powered-By": "ASP\\.NET\\;confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1", "Set-Cookie": "ASPSESSION|ASP\\.NET_SessionId" },
 			"implies": "IIS\\;confidence:50"
 		},
 		"Microsoft HTTPAPI": {
@@ -2295,6 +2291,12 @@
 			"headers": { "Server": "mod_auth_pam(?:/([\\d\\.]+))?\\;version:\\1" },
 			"implies": "Apache"
 		},
+		"mod_dav": {
+			"website": "webdav.org/mod_dav",
+			"cats": [ 33 ],
+			"headers": { "Server": "\\b(?:mod_)?DAV\\b(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": "Apache"
+		},
 		"mod_fastcgi": {
 			"website": "www.fastcgi.com/mod_fastcgi/docs/mod_fastcgi.html",
 			"cats": [ 33 ],
@@ -2547,6 +2549,10 @@
 			"headers": { "Set-Cookie": "october_session=" },
 			"implies": "Laravel"
 		},
+		"OmniTouch 8660 My Teamwork": {
+			"website": "enterprise.alcatel-lucent.com",
+			"cats": [ 19 ]
+		},
 		"Open AdStream": {
 			"website": "xaxis.com",
 			"cats": [ 36 ],
@@ -2644,8 +2650,7 @@
 		"Oracle HTTP Server": {
 			"website": "oracle.com",
 			"cats": [ 22 ],
-			"headers": { "Server": "Oracle-HTTP-Server(?:/([\\d.]+))?\\;version:\\1" },
-			"excludes": [ "HTTP-Server" ]
+			"headers": { "Server": "Oracle-HTTP-Server(?:/([\\d.]+))?\\;version:\\1" }
 		},
 		"Oracle Recommendations On Demand": {
 			"website": "www.oracle.com/us/products/applications/commerce/recommendations-on-demand/index.html",
diff --git a/share/images/icons/OmniTouch 8660 My Teamwork.png b/share/images/icons/OmniTouch 8660 My Teamwork.png
new file mode 100644
index 0000000000000000000000000000000000000000..012c09d7d13638347bb6e80bfce15191d7c4e16d
GIT binary patch
literal 2034
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
Q;Q#;t07*qoM6N<$g2xT>H~;_u

literal 0
HcmV?d00001