diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index b87e9d00..94f9fe8d 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -119,16 +119,6 @@ ${org.springframework.version} compile - - javax.xml.bind - jaxb-api - 2.0 - - - javax.xml.bind - jsr173_api - 1.0 - org.apache.xmlgraphics fop @@ -188,12 +178,6 @@ ${org.springframework.version} runtime - - javax.transaction - jta - 1.0.1B - runtime - org.springframework spring-jdbc @@ -236,21 +220,15 @@ 1.7 - javax.servlet - servlet-api - 2.4 + javax + javaee-api + 6.0 provided - - javax.servlet - jstl - 1.2 - javax.mail mail 1.4 - compile mysql @@ -323,8 +301,49 @@ swagger-springmvc 0.6.6 + + com.wordnik + swagger-annotations_2.9.1 + 1.2.0 + + + + coverage + + + + org.jacoco + jacoco-maven-plugin + 0.6.4.201312101107 + + + + pre-unit-test + + prepare-agent + + + + + post-unit-test + test + + report + + + + + + + hsqldb @@ -511,34 +530,7 @@ org.apache.maven.plugins maven-surefire-plugin - - org.jacoco - jacoco-maven-plugin - 0.6.4.201312101107 - - - - pre-unit-test - - prepare-agent - - - - - post-unit-test - test - - report - - - - + org.apache.tomcat.maven tomcat7-maven-plugin @@ -557,7 +549,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.1.0.v20131115 + 9.1.1.v20140108 foo 9999 diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java b/wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java index e5a6f417..d50e8e45 100644 --- a/wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java +++ b/wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java @@ -47,7 +47,7 @@ public class SupportedUserAgent implements Serializable { boolean result = browser == Browser.FIREFOX && majorVersion >= 10; result = result || browser == Browser.FIREFOX2 && majorVersion >= 17; - result = result || browser == Browser.IE8 || browser == Browser.IE9; + result = result || browser == Browser.IE8 || browser == Browser.IE9 || browser == Browser.IE11 ; result = result || browser == Browser.IE && majorVersion >= 8; result = result || browser == Browser.OPERA10 && majorVersion >= 11; result = result || browser == Browser.CHROME && majorVersion >= 18; diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java index 68d80fd2..3d1d3fca 100644 --- a/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java @@ -104,8 +104,6 @@ class LockManagerImpl implements LockManager { } private void unlock(int mapId) { - System.out.println("Unlocking:"+mapId); - logger.debug("Unlock map id:" + mapId); lockInfoByMapId.remove(mapId); } diff --git a/wise-webapp/src/main/java/com/wisemapping/util/Browser.java b/wise-webapp/src/main/java/com/wisemapping/util/Browser.java index 90aaa85c..40c33edf 100644 --- a/wise-webapp/src/main/java/com/wisemapping/util/Browser.java +++ b/wise-webapp/src/main/java/com/wisemapping/util/Browser.java @@ -44,309 +44,308 @@ import java.util.regex.Pattern; /** * Enum constants for most common browsers, including e-mail clients and bots. + * * @author harald - * */ public enum Browser { - OPERA( Manufacturer.OPERA, null, 1, "Opera", new String[] { "Opera" }, null, BrowserType.WEB_BROWSER, RenderingEngine.PRESTO, "Opera\\/(([\\d]+)\\.([\\w]+))"), // before MSIE - OPERA_MINI( Manufacturer.OPERA, Browser.OPERA, 20, "Opera Mini", new String[] { "Opera Mini"}, null, BrowserType.MOBILE_BROWSER, RenderingEngine.PRESTO, null), // Opera for mobile devices - /** - * For some strange reason Opera uses 9.80 in the user-agent string. - */ - OPERA10( Manufacturer.OPERA, Browser.OPERA, 10, "Opera 10", new String[] { "Opera/9.8" }, null, BrowserType.WEB_BROWSER, RenderingEngine.PRESTO, "Version\\/(([\\d]+)\\.([\\w]+))"), - OPERA9( Manufacturer.OPERA, Browser.OPERA, 5, "Opera 9", new String[] { "Opera/9" }, null, BrowserType.WEB_BROWSER, RenderingEngine.PRESTO, null), - KONQUEROR( Manufacturer.OTHER, null, 1, "Konqueror", new String[] { "Konqueror"}, null, BrowserType.WEB_BROWSER, RenderingEngine.KHTML, "Konqueror\\/(([0-9]+)\\.?([\\w]+)?(-[\\w]+)?)" ), + OPERA(Manufacturer.OPERA, null, 1, "Opera", new String[]{"Opera"}, null, BrowserType.WEB_BROWSER, RenderingEngine.PRESTO, "Opera\\/(([\\d]+)\\.([\\w]+))"), // before MSIE + OPERA_MINI(Manufacturer.OPERA, Browser.OPERA, 20, "Opera Mini", new String[]{"Opera Mini"}, null, BrowserType.MOBILE_BROWSER, RenderingEngine.PRESTO, null), // Opera for mobile devices + /** + * For some strange reason Opera uses 9.80 in the user-agent string. + */ + OPERA10(Manufacturer.OPERA, Browser.OPERA, 10, "Opera 10", new String[]{"Opera/9.8"}, null, BrowserType.WEB_BROWSER, RenderingEngine.PRESTO, "Version\\/(([\\d]+)\\.([\\w]+))"), + OPERA9(Manufacturer.OPERA, Browser.OPERA, 5, "Opera 9", new String[]{"Opera/9"}, null, BrowserType.WEB_BROWSER, RenderingEngine.PRESTO, null), + KONQUEROR(Manufacturer.OTHER, null, 1, "Konqueror", new String[]{"Konqueror"}, null, BrowserType.WEB_BROWSER, RenderingEngine.KHTML, "Konqueror\\/(([0-9]+)\\.?([\\w]+)?(-[\\w]+)?)"), - /** - * Outlook email client - */ - OUTLOOK( Manufacturer.MICROSOFT, null, 100, "Outlook", new String[] {"MSOffice"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.WORD, "MSOffice (([0-9]+))"), // before IE7 - /** - * Microsoft Outlook 2007 identifies itself as MSIE7 but uses the html rendering engine of Word 2007. - * Example user agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; SLCC1; .NET CLR 2.0.50727; .NET CLR 3.0.04506; .NET CLR 1.1.4322; MSOffice 12) - */ - OUTLOOK2007( Manufacturer.MICROSOFT, Browser.OUTLOOK, 107, "Outlook 2007", new String[] {"MSOffice 12"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.WORD, null), // before IE7 - /** - * Outlook 2010 is still using the rendering engine of Word. http://www.fixoutlook.org - */ - OUTLOOK2010( Manufacturer.MICROSOFT, Browser.OUTLOOK, 108, "Outlook 2010", new String[] {"MSOffice 14"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.WORD, null), // before IE7 + /** + * Outlook email client + */ + OUTLOOK(Manufacturer.MICROSOFT, null, 100, "Outlook", new String[]{"MSOffice"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.WORD, "MSOffice (([0-9]+))"), // before IE7 + /** + * Microsoft Outlook 2007 identifies itself as MSIE7 but uses the html rendering engine of Word 2007. + * Example user agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; SLCC1; .NET CLR 2.0.50727; .NET CLR 3.0.04506; .NET CLR 1.1.4322; MSOffice 12) + */ + OUTLOOK2007(Manufacturer.MICROSOFT, Browser.OUTLOOK, 107, "Outlook 2007", new String[]{"MSOffice 12"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.WORD, null), // before IE7 + /** + * Outlook 2010 is still using the rendering engine of Word. http://www.fixoutlook.org + */ + OUTLOOK2010(Manufacturer.MICROSOFT, Browser.OUTLOOK, 108, "Outlook 2010", new String[]{"MSOffice 14"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.WORD, null), // before IE7 - /** - * Family of Internet Explorer browsers - */ - IE( Manufacturer.MICROSOFT, null, 1, "Internet Explorer", new String[] { "MSIE"}, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, "MSIE (([\\d]+)\\.([\\w]+))" ), // before Mozilla - /** - * Since version 7 Outlook Express is identifying itself. By detecting Outlook Express we can not - * identify the Internet Explorer version which is probably used for the rendering. - * Obviously this product is now called Windows Live Mail Desktop or just Windows Live Mail. - */ - OUTLOOK_EXPRESS7( Manufacturer.MICROSOFT, Browser.IE, 110, "Windows Live Mail", new String[] {"Outlook-Express/7.0"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.TRIDENT, null), // before IE7, previously known as Outlook Express. First released in 2006, offered with different name later - /** - * Since 2007 the mobile edition of Internet Explorer identifies itself as IEMobile in the user-agent. - * If previous versions have to be detected, use the operating system information as well. - */ - IEMOBILE7( Manufacturer.MICROSOFT, Browser.IE, 121, "IE Mobile 7", new String[] { "IEMobile 7" }, null, BrowserType.MOBILE_BROWSER, RenderingEngine.TRIDENT, null), // before MSIE strings - IEMOBILE6( Manufacturer.MICROSOFT, Browser.IE, 120, "IE Mobile 6", new String[] { "IEMobile 6" }, null, BrowserType.MOBILE_BROWSER, RenderingEngine.TRIDENT, null), // before MSIE - IE9( Manufacturer.MICROSOFT, Browser.IE, 90, "Internet Explorer 9", new String[] { "MSIE 9" }, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, null ), // before MSIE - IE8( Manufacturer.MICROSOFT, Browser.IE, 80, "Internet Explorer 8", new String[] { "MSIE 8" }, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, null ), // before MSIE - IE7( Manufacturer.MICROSOFT, Browser.IE, 70, "Internet Explorer 7", new String[] { "MSIE 7" }, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, null), // before MSIE - IE6( Manufacturer.MICROSOFT, Browser.IE, 60, "Internet Explorer 6", new String[] { "MSIE 6" }, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, null ), // before MSIE - IE5_5( Manufacturer.MICROSOFT, Browser.IE, 55, "Internet Explorer 5.5", new String[] { "MSIE 5.5" }, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, null), // before MSIE - IE5( Manufacturer.MICROSOFT, Browser.IE, 50, "Internet Explorer 5", new String[] { "MSIE 5" }, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, null ), // before MSIE + /** + * Family of Internet Explorer browsers + */ + IE11(Manufacturer.MICROSOFT, null, 1, "Internet Explorer", new String[]{") like Gecko"}, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, "Mozilla/5.0 (([\\d]+)\\.([\\w]+))"), // before Mozilla - /** - * Google Chrome browser - */ - CHROME( Manufacturer.GOOGLE, null, 1, "Chrome", new String[] { "Chrome" }, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, "Chrome\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?(\\.[\\w]+)?)" ), // before Mozilla - CHROME10( Manufacturer.GOOGLE, Browser.CHROME, 15, "Chrome 10", new String[] { "Chrome/10" }, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null ), // before Mozilla - CHROME9( Manufacturer.GOOGLE, Browser.CHROME, 10, "Chrome 9", new String[] { "Chrome/9" }, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null ), // before Mozilla - CHROME8( Manufacturer.GOOGLE, Browser.CHROME, 5, "Chrome 8", new String[] { "Chrome/8" }, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null ), // before Mozilla + /** + * Family of Internet Explorer browsers + */ + IE(Manufacturer.MICROSOFT, null, 1, "Internet Explorer", new String[]{"MSIE"}, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, "MSIE (([\\d]+)\\.([\\w]+))"), // before Mozilla + /** + * Since version 7 Outlook Express is identifying itself. By detecting Outlook Express we can not + * identify the Internet Explorer version which is probably used for the rendering. + * Obviously this product is now called Windows Live Mail Desktop or just Windows Live Mail. + */ + OUTLOOK_EXPRESS7(Manufacturer.MICROSOFT, Browser.IE, 110, "Windows Live Mail", new String[]{"Outlook-Express/7.0"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.TRIDENT, null), // before IE7, previously known as Outlook Express. First released in 2006, offered with different name later + /** + * Since 2007 the mobile edition of Internet Explorer identifies itself as IEMobile in the user-agent. + * If previous versions have to be detected, use the operating system information as well. + */ + IEMOBILE7(Manufacturer.MICROSOFT, Browser.IE, 121, "IE Mobile 7", new String[]{"IEMobile 7"}, null, BrowserType.MOBILE_BROWSER, RenderingEngine.TRIDENT, null), // before MSIE strings + IEMOBILE6(Manufacturer.MICROSOFT, Browser.IE, 120, "IE Mobile 6", new String[]{"IEMobile 6"}, null, BrowserType.MOBILE_BROWSER, RenderingEngine.TRIDENT, null), // before MSIE + IE9(Manufacturer.MICROSOFT, Browser.IE, 90, "Internet Explorer 9", new String[]{"MSIE 9"}, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, null), // before MSIE + IE8(Manufacturer.MICROSOFT, Browser.IE, 80, "Internet Explorer 8", new String[]{"MSIE 8"}, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, null), // before MSIE + IE7(Manufacturer.MICROSOFT, Browser.IE, 70, "Internet Explorer 7", new String[]{"MSIE 7"}, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, null), // before MSIE + IE6(Manufacturer.MICROSOFT, Browser.IE, 60, "Internet Explorer 6", new String[]{"MSIE 6"}, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, null), // before MSIE + IE5_5(Manufacturer.MICROSOFT, Browser.IE, 55, "Internet Explorer 5.5", new String[]{"MSIE 5.5"}, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, null), // before MSIE + IE5(Manufacturer.MICROSOFT, Browser.IE, 50, "Internet Explorer 5", new String[]{"MSIE 5"}, null, BrowserType.WEB_BROWSER, RenderingEngine.TRIDENT, null), // before MSIE - OMNIWEB( Manufacturer.OTHER, null, 2, "Omniweb", new String[] { "OmniWeb" }, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null), // + /** + * Google Chrome browser + */ + CHROME(Manufacturer.GOOGLE, null, 1, "Chrome", new String[]{"Chrome"}, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, "Chrome\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?(\\.[\\w]+)?)"), // before Mozilla + CHROME10(Manufacturer.GOOGLE, Browser.CHROME, 15, "Chrome 10", new String[]{"Chrome/10"}, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null), // before Mozilla + CHROME9(Manufacturer.GOOGLE, Browser.CHROME, 10, "Chrome 9", new String[]{"Chrome/9"}, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null), // before Mozilla + CHROME8(Manufacturer.GOOGLE, Browser.CHROME, 5, "Chrome 8", new String[]{"Chrome/8"}, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null), // before Mozilla - SAFARI( Manufacturer.APPLE, null, 1, "Safari", new String[] { "Safari" }, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, "Version\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?)" ), // before AppleWebKit - SAFARI5( Manufacturer.APPLE, Browser.SAFARI, 3, "Safari 5", new String[] { "Version/5" }, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null ), // before AppleWebKit - MOBILE_SAFARI( Manufacturer.APPLE, Browser.SAFARI, 2, "Mobile Safari", new String[] { "Mobile Safari","Mobile/" }, null, BrowserType.MOBILE_BROWSER, RenderingEngine.WEBKIT, null ), // before Safari - SAFARI4( Manufacturer.APPLE, Browser.SAFARI, 4, "Safari 4", new String[] { "Version/4" }, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null ), // before AppleWebKit - - APPLE_MAIL( Manufacturer.APPLE, null, 50, "Apple Mail", new String[] { "AppleWebKit" }, null, BrowserType.EMAIL_CLIENT, RenderingEngine.WEBKIT, null), // Microsoft Entrourage/Outlook 2010 also only identifies itself as AppleWebKit - LOTUS_NOTES( Manufacturer.OTHER, null, 3, "Lotus Notes", new String[] { "Lotus-Notes" }, null, BrowserType.EMAIL_CLIENT, RenderingEngine.OTHER, "Lotus-Notes\\/(([\\d]+)\\.([\\w]+))"), // before Mozilla + OMNIWEB(Manufacturer.OTHER, null, 2, "Omniweb", new String[]{"OmniWeb"}, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null), // - /* - * Thunderbird email client, based on the same Gecko engine Firefox is using. - */ - THUNDERBIRD( Manufacturer.MOZILLA, null, 110, "Thunderbird", new String[] { "Thunderbird" }, null, BrowserType.EMAIL_CLIENT, RenderingEngine.GECKO, "Thunderbird\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?(\\.[\\w]+)?)" ), // using Gecko Engine - THUNDERBIRD3( Manufacturer.MOZILLA, Browser.THUNDERBIRD, 130, "Thunderbird 3", new String[] { "Thunderbird/3" }, null, BrowserType.EMAIL_CLIENT, RenderingEngine.GECKO, null ), // using Gecko Engine - THUNDERBIRD2( Manufacturer.MOZILLA, Browser.THUNDERBIRD, 120, "Thunderbird 2", new String[] { "Thunderbird/2" }, null, BrowserType.EMAIL_CLIENT, RenderingEngine.GECKO, null ), // using Gecko Engine + SAFARI(Manufacturer.APPLE, null, 1, "Safari", new String[]{"Safari"}, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, "Version\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?)"), // before AppleWebKit + SAFARI5(Manufacturer.APPLE, Browser.SAFARI, 3, "Safari 5", new String[]{"Version/5"}, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null), // before AppleWebKit + MOBILE_SAFARI(Manufacturer.APPLE, Browser.SAFARI, 2, "Mobile Safari", new String[]{"Mobile Safari", "Mobile/"}, null, BrowserType.MOBILE_BROWSER, RenderingEngine.WEBKIT, null), // before Safari + SAFARI4(Manufacturer.APPLE, Browser.SAFARI, 4, "Safari 4", new String[]{"Version/4"}, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null), // before AppleWebKit - CAMINO( Manufacturer.OTHER, null, 5, "Camino", new String[] { "Camino" }, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, "Camino\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?)" ), // using Gecko Engine - CAMINO2( Manufacturer.OTHER, Browser.CAMINO, 17, "Camino 2", new String[] { "Camino/2" }, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, null ), // using Gecko Engine - FLOCK( Manufacturer.OTHER, null, 4, "Flock", new String[]{"Flock"}, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, "Flock\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?)"), - - FIREFOX( Manufacturer.MOZILLA, null, 10, "Firefox", new String[] { "Firefox" }, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, "Firefox\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?(\\.[\\w]+)?)"), // using Gecko Engine - FIREFOX3MOBILE( Manufacturer.MOZILLA, Browser.FIREFOX, 31, "Firefox 3 Mobile", new String[] { "Firefox/3.5 Maemo" }, null, BrowserType.MOBILE_BROWSER, RenderingEngine.GECKO, null ), // using Gecko Engine - FIREFOX4( Manufacturer.MOZILLA, Browser.FIREFOX, 40, "Firefox 4", new String[] { "Firefox/4" }, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, null ), // using Gecko Engine - FIREFOX3( Manufacturer.MOZILLA, Browser.FIREFOX, 30, "Firefox 3", new String[] { "Firefox/3" }, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, null ), // using Gecko Engine - FIREFOX2( Manufacturer.MOZILLA, Browser.FIREFOX, 20, "Firefox 2", new String[] { "Firefox/2" }, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, null ), // using Gecko Engine - FIREFOX1_5( Manufacturer.MOZILLA, Browser.FIREFOX, 15, "Firefox 1.5", new String[] { "Firefox/1.5" }, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, null ), // using Gecko Engine - - SEAMONKEY( Manufacturer.OTHER, null, 15, "SeaMonkey", new String[]{"SeaMonkey"}, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, "SeaMonkey\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?)"), // using Gecko Engine - - BOT( Manufacturer.OTHER, null,12, "Robot/Spider", new String[]{"Mediapartners-Google","Googlebot","bot", "spider", "crawler", "Feedfetcher", "Slurp", "Twiceler", "Nutch", "BecomeBot"}, null, BrowserType.ROBOT, RenderingEngine.OTHER, null), - - MOZILLA( Manufacturer.MOZILLA, null, 1, "Mozilla", new String[] { "Mozilla", "Moozilla" }, null, BrowserType.WEB_BROWSER, RenderingEngine.OTHER, null), // rest of the mozilla browsers - - CFNETWORK( Manufacturer.OTHER, null, 6, "CFNetwork", new String[] { "CFNetwork" }, null, BrowserType.UNKNOWN, RenderingEngine.OTHER, null ), // Mac OS X cocoa library - - EUDORA( Manufacturer.OTHER, null, 7, "Eudora", new String[] { "Eudora", "EUDORA" }, null, BrowserType.EMAIL_CLIENT, RenderingEngine.OTHER, null ), // email client by Qualcomm - - POCOMAIL( Manufacturer.OTHER, null, 8, "PocoMail", new String[] { "PocoMail" }, null, BrowserType.EMAIL_CLIENT, RenderingEngine.OTHER, null ), - - THEBAT( Manufacturer.OTHER, null, 9, "The Bat!", new String[]{"The Bat"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.OTHER, null), // Email Client - - NETFRONT( Manufacturer.OTHER, null, 10, "NetFront", new String[]{"NetFront"}, null, BrowserType.MOBILE_BROWSER, RenderingEngine.OTHER, null), // mobile device browser - - EVOLUTION( Manufacturer.OTHER, null, 11, "Evolution", new String[]{"CamelHttpStream"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.OTHER, null), // http://www.go-evolution.org/Camel.Stream - - LYNX( Manufacturer.OTHER, null, 13, "Lynx", new String[]{"Lynx"}, null, BrowserType.TEXT_BROWSER, RenderingEngine.OTHER, "Lynx\\/(([0-9]+)\\.([\\d]+)\\.?([\\w-+]+)?\\.?([\\w-+]+)?)"), - - DOWNLOAD( Manufacturer.OTHER, null, 16, "Downloading Tool", new String[]{"cURL","wget"}, null, BrowserType.TEXT_BROWSER, RenderingEngine.OTHER, null), - - UNKNOWN( Manufacturer.OTHER, null, 14, "Unknown", new String[0], null, BrowserType.UNKNOWN, RenderingEngine.OTHER, null ); - - - private final short id; - private final String name; - private final String[] aliases; - private final String[] excludeList; // don't match when these values are in the agent-string - private final BrowserType browserType; - private final Manufacturer manufacturer; - private final RenderingEngine renderingEngine; - private final Browser parent; - private List children; - private Pattern versionRegEx; - - private Browser(Manufacturer manufacturer, Browser parent, int versionId, String name, String[] aliases, String[] exclude, BrowserType browserType, RenderingEngine renderingEngine, String versionRegexString) { - this.id = (short) ( ( manufacturer.getId() << 8) + (byte) versionId); - this.name = name; - this.parent = parent; - this.children = new ArrayList(); - if (this.parent != null) { - this.parent.children.add(this); - } - this.aliases = aliases; - this.excludeList = exclude; - this.browserType = browserType; - this.manufacturer = manufacturer; - this.renderingEngine = renderingEngine; - if (versionRegexString != null) { - this.versionRegEx = Pattern.compile(versionRegexString); - } - } - - public short getId() { - return id; - } + APPLE_MAIL(Manufacturer.APPLE, null, 50, "Apple Mail", new String[]{"AppleWebKit"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.WEBKIT, null), // Microsoft Entrourage/Outlook 2010 also only identifies itself as AppleWebKit + LOTUS_NOTES(Manufacturer.OTHER, null, 3, "Lotus Notes", new String[]{"Lotus-Notes"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.OTHER, "Lotus-Notes\\/(([\\d]+)\\.([\\w]+))"), // before Mozilla - public String getName() { - return name; - } - - private Pattern getVersionRegEx() { - if (this.versionRegEx == null) { - if (this.getGroup() != this) - return this.getGroup().getVersionRegEx(); - else - return null; - } - return this.versionRegEx; - } - - /** - * Detects the detailed version information of the browser. Depends on the userAgent to be available. - * Returns null if it can not detect the version information. - * @return Version - */ - public Version getVersion(String userAgentString) { - Pattern pattern = this.getVersionRegEx(); - if (userAgentString != null && pattern != null) { - Matcher matcher = pattern.matcher(userAgentString); - if (matcher.find()) { - String fullVersionString = matcher.group(1); - String majorVersion = matcher.group(2); - String minorVersion = "0"; - if (matcher.groupCount() > 2) // usually but not always there is a minor version - minorVersion = matcher.group(3); - return new Version (fullVersionString,majorVersion,minorVersion); - } - } - return null; - } - - /** - * @return the browserType - */ - public BrowserType getBrowserType() { - return browserType; - } + /* + * Thunderbird email client, based on the same Gecko engine Firefox is using. + */ + THUNDERBIRD(Manufacturer.MOZILLA, null, 110, "Thunderbird", new String[]{"Thunderbird"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.GECKO, "Thunderbird\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?(\\.[\\w]+)?)"), // using Gecko Engine + THUNDERBIRD3(Manufacturer.MOZILLA, Browser.THUNDERBIRD, 130, "Thunderbird 3", new String[]{"Thunderbird/3"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.GECKO, null), // using Gecko Engine + THUNDERBIRD2(Manufacturer.MOZILLA, Browser.THUNDERBIRD, 120, "Thunderbird 2", new String[]{"Thunderbird/2"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.GECKO, null), // using Gecko Engine - /** - * @return the manufacturer - */ - public Manufacturer getManufacturer() { - return manufacturer; - } - - /** - * @return the rendering engine - */ - public RenderingEngine getRenderingEngine() { - return renderingEngine; - } + CAMINO(Manufacturer.OTHER, null, 5, "Camino", new String[]{"Camino"}, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, "Camino\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?)"), // using Gecko Engine + CAMINO2(Manufacturer.OTHER, Browser.CAMINO, 17, "Camino 2", new String[]{"Camino/2"}, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, null), // using Gecko Engine + FLOCK(Manufacturer.OTHER, null, 4, "Flock", new String[]{"Flock"}, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, "Flock\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?)"), + + FIREFOX(Manufacturer.MOZILLA, null, 10, "Firefox", new String[]{"Firefox"}, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, "Firefox\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?(\\.[\\w]+)?)"), // using Gecko Engine + FIREFOX3MOBILE(Manufacturer.MOZILLA, Browser.FIREFOX, 31, "Firefox 3 Mobile", new String[]{"Firefox/3.5 Maemo"}, null, BrowserType.MOBILE_BROWSER, RenderingEngine.GECKO, null), // using Gecko Engine + FIREFOX4(Manufacturer.MOZILLA, Browser.FIREFOX, 40, "Firefox 4", new String[]{"Firefox/4"}, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, null), // using Gecko Engine + FIREFOX3(Manufacturer.MOZILLA, Browser.FIREFOX, 30, "Firefox 3", new String[]{"Firefox/3"}, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, null), // using Gecko Engine + FIREFOX2(Manufacturer.MOZILLA, Browser.FIREFOX, 20, "Firefox 2", new String[]{"Firefox/2"}, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, null), // using Gecko Engine + FIREFOX1_5(Manufacturer.MOZILLA, Browser.FIREFOX, 15, "Firefox 1.5", new String[]{"Firefox/1.5"}, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, null), // using Gecko Engine + + SEAMONKEY(Manufacturer.OTHER, null, 15, "SeaMonkey", new String[]{"SeaMonkey"}, null, BrowserType.WEB_BROWSER, RenderingEngine.GECKO, "SeaMonkey\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?)"), // using Gecko Engine + + BOT(Manufacturer.OTHER, null, 12, "Robot/Spider", new String[]{"Mediapartners-Google", "Googlebot", "bot", "spider", "crawler", "Feedfetcher", "Slurp", "Twiceler", "Nutch", "BecomeBot"}, null, BrowserType.ROBOT, RenderingEngine.OTHER, null), + + MOZILLA(Manufacturer.MOZILLA, null, 1, "Mozilla", new String[]{"Mozilla", "Moozilla"}, null, BrowserType.WEB_BROWSER, RenderingEngine.OTHER, null), // rest of the mozilla browsers + + CFNETWORK(Manufacturer.OTHER, null, 6, "CFNetwork", new String[]{"CFNetwork"}, null, BrowserType.UNKNOWN, RenderingEngine.OTHER, null), // Mac OS X cocoa library + + EUDORA(Manufacturer.OTHER, null, 7, "Eudora", new String[]{"Eudora", "EUDORA"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.OTHER, null), // email client by Qualcomm + + POCOMAIL(Manufacturer.OTHER, null, 8, "PocoMail", new String[]{"PocoMail"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.OTHER, null), + + THEBAT(Manufacturer.OTHER, null, 9, "The Bat!", new String[]{"The Bat"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.OTHER, null), // Email Client + + NETFRONT(Manufacturer.OTHER, null, 10, "NetFront", new String[]{"NetFront"}, null, BrowserType.MOBILE_BROWSER, RenderingEngine.OTHER, null), // mobile device browser + + EVOLUTION(Manufacturer.OTHER, null, 11, "Evolution", new String[]{"CamelHttpStream"}, null, BrowserType.EMAIL_CLIENT, RenderingEngine.OTHER, null), // http://www.go-evolution.org/Camel.Stream + + LYNX(Manufacturer.OTHER, null, 13, "Lynx", new String[]{"Lynx"}, null, BrowserType.TEXT_BROWSER, RenderingEngine.OTHER, "Lynx\\/(([0-9]+)\\.([\\d]+)\\.?([\\w-+]+)?\\.?([\\w-+]+)?)"), + + DOWNLOAD(Manufacturer.OTHER, null, 16, "Downloading Tool", new String[]{"cURL", "wget"}, null, BrowserType.TEXT_BROWSER, RenderingEngine.OTHER, null), + + UNKNOWN(Manufacturer.OTHER, null, 14, "Unknown", new String[0], null, BrowserType.UNKNOWN, RenderingEngine.OTHER, null); + private final short id; + private final String name; + private final String[] aliases; + private final String[] excludeList; // don't match when these values are in the agent-string + private final BrowserType browserType; + private final Manufacturer manufacturer; + private final RenderingEngine renderingEngine; + private final Browser parent; + private List children; + private Pattern versionRegEx; + + private Browser(Manufacturer manufacturer, Browser parent, int versionId, String name, String[] aliases, String[] exclude, BrowserType browserType, RenderingEngine renderingEngine, String versionRegexString) { + this.id = (short) ((manufacturer.getId() << 8) + (byte) versionId); + this.name = name; + this.parent = parent; + this.children = new ArrayList<>(); + if (this.parent != null) { + this.parent.children.add(this); + } + this.aliases = aliases; + this.excludeList = exclude; + this.browserType = browserType; + this.manufacturer = manufacturer; + this.renderingEngine = renderingEngine; + if (versionRegexString != null) { + this.versionRegEx = Pattern.compile(versionRegexString); + } + } + + /** + * Iterates over all Browsers to compare the browser signature with + * the user agent string. If no match can be found Browser.UNKNOWN will + * be returned. + * + * @param agentString + * @return Browser + */ + public static Browser parseUserAgentString(String agentString) { + for (Browser browser : Browser.values()) { + // only check top level objects + if (browser.parent == null) { + Browser match = browser.checkUserAgent(agentString); + if (match != null) { + return match; // either current operatingSystem or a child object + } + } + } + return Browser.UNKNOWN; + } + + /** + * Returns the enum constant of this type with the specified id. + * Throws IllegalArgumentException if the value does not exist. + * + * @param id + * @return + */ + public static Browser valueOf(short id) { + for (Browser browser : Browser.values()) { + if (browser.getId() == id) + return browser; + } + + // same behavior as standard valueOf(string) method + throw new IllegalArgumentException( + "No enum const for id " + id); + } + + public short getId() { + return id; + } + + public String getName() { + return name; + } + + private Pattern getVersionRegEx() { + if (this.versionRegEx == null) { + if (this.getGroup() != this) + return this.getGroup().getVersionRegEx(); + else + return null; + } + return this.versionRegEx; + } + + /** + * Detects the detailed version information of the browser. Depends on the userAgent to be available. + * Returns null if it can not detect the version information. + * + * @return Version + */ + public Version getVersion(String userAgentString) { + Pattern pattern = this.getVersionRegEx(); + if (userAgentString != null && pattern != null) { + Matcher matcher = pattern.matcher(userAgentString); + if (matcher.find()) { + String fullVersionString = matcher.group(1); + String majorVersion = matcher.group(2); + String minorVersion = "0"; + if (matcher.groupCount() > 2) // usually but not always there is a minor version + minorVersion = matcher.group(3); + return new Version(fullVersionString, majorVersion, minorVersion); + } + } + return null; + } + + /** + * @return the browserType + */ + public BrowserType getBrowserType() { + return browserType; + } + + /** + * @return the manufacturer + */ + public Manufacturer getManufacturer() { + return manufacturer; + } + + /** + * @return the rendering engine + */ + public RenderingEngine getRenderingEngine() { + return renderingEngine; + } + + /** + * @return top level browser family + */ + public Browser getGroup() { + if (this.parent != null) { + return parent.getGroup(); + } + return this; + } + + /* + * Checks if the given user-agent string matches to the browser. + * Only checks for one specific browser. + */ + public boolean isInUserAgentString(String agentString) { + for (String alias : aliases) { + if (agentString.toLowerCase().indexOf(alias.toLowerCase()) != -1) + return true; + } + return false; + } + + /** + * Checks if the given user-agent does not contain one of the tokens which should not match. + * In most cases there are no excluding tokens, so the impact should be small. + * + * @param agentString + * @return + */ + private boolean containsExcludeToken(String agentString) { + if (excludeList != null) { + for (String exclude : excludeList) { + if (agentString.toLowerCase().indexOf(exclude.toLowerCase()) != -1) + return true; + } + } + return false; + } + + private Browser checkUserAgent(String agentString) { + if (this.isInUserAgentString(agentString)) { + if (this.children.size() > 0) { + for (Browser childBrowser : this.children) { + Browser match = childBrowser.checkUserAgent(agentString); + if (match != null) { + return match; + } + } + } + // if children didn't match we continue checking the current to prevent false positives + if (!this.containsExcludeToken(agentString)) { + return this; + } + + } + return null; + } - /** - * @return top level browser family - */ - public Browser getGroup() { - if (this.parent != null) { - return parent.getGroup(); - } - return this; - } - /* - * Checks if the given user-agent string matches to the browser. - * Only checks for one specific browser. - */ - public boolean isInUserAgentString(String agentString) - { - for (String alias : aliases) - { - if (agentString.toLowerCase().indexOf(alias.toLowerCase()) != -1) - return true; - } - return false; - } - - /** - * Checks if the given user-agent does not contain one of the tokens which should not match. - * In most cases there are no excluding tokens, so the impact should be small. - * @param agentString - * @return - */ - private boolean containsExcludeToken(String agentString) - { - if (excludeList != null) { - for (String exclude : excludeList) { - if (agentString.toLowerCase().indexOf(exclude.toLowerCase()) != -1) - return true; - } - } - return false; - } - - private Browser checkUserAgent(String agentString) { - if (this.isInUserAgentString(agentString)) { - if (this.children.size() > 0) { - for (Browser childBrowser : this.children) { - Browser match = childBrowser.checkUserAgent(agentString); - if (match != null) { - return match; - } - } - } - // if children didn't match we continue checking the current to prevent false positives - if (!this.containsExcludeToken(agentString)) { - return this; - } - - } - return null; - } - - /** - * Iterates over all Browsers to compare the browser signature with - * the user agent string. If no match can be found Browser.UNKNOWN will - * be returned. - * @param agentString - * @return Browser - */ - public static Browser parseUserAgentString(String agentString) - { - for (Browser browser : Browser.values()) - { - // only check top level objects - if (browser.parent == null) { - Browser match = browser.checkUserAgent(agentString); - if (match != null) { - return match; // either current operatingSystem or a child object - } - } - } - return Browser.UNKNOWN; - } - - /** - * Returns the enum constant of this type with the specified id. - * Throws IllegalArgumentException if the value does not exist. - * @param id - * @return - */ - public static Browser valueOf(short id) - { - for (Browser browser : Browser.values()) - { - if (browser.getId() == id) - return browser; - } - - // same behavior as standard valueOf(string) method - throw new IllegalArgumentException( - "No enum const for id " + id); - } - - - } diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java index f413dffe..94264b8a 100644 --- a/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java +++ b/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java @@ -151,19 +151,18 @@ public class MindmapController { final Locale locale = LocaleContextHolder.getLocale(); // Is the mindmap locked ?. + boolean isLocked = false; boolean readOnlyMode = !requiresLock || !mindmap.hasPermissions(collaborator, CollaborationRole.EDITOR); if (!readOnlyMode) { final LockManager lockManager = this.mindmapService.getLockManager(); if (lockManager.isLocked(mindmap) && !lockManager.isLockedBy(mindmap, collaborator)) { readOnlyMode = true; - model.addAttribute("mindmapLocked", true); } else { model.addAttribute("lockTimestamp", mindmap.getLastModificationTime().getTimeInMillis()); model.addAttribute(LOCK_SESSION_ATTRIBUTE, lockManager.generateSession()); } model.addAttribute("lockInfo", lockManager.getLockInfo(mindmap)); } - // Set render attributes ... model.addAttribute("mindmap", mindmapBean); @@ -171,6 +170,9 @@ public class MindmapController { model.addAttribute("locale", locale.toString().toLowerCase()); model.addAttribute("principal", collaborator); model.addAttribute("readOnlyMode", readOnlyMode); + model.addAttribute("memoryPersistence", false); + model.addAttribute("mindmapLocked", isLocked); + return "mindmapEditor"; } diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties index 93c009de..ecc251ea 100644 --- a/wise-webapp/src/main/resources/messages_en.properties +++ b/wise-webapp/src/main/resources/messages_en.properties @@ -248,7 +248,8 @@ TUTORIAL.FONT_STYLE=Styles TUTORIAL.FONT_TYPE=Type TUTORIAL.SAMPLE_NOTE=This is a simple note !. SUPPORT=Support -FEEDBACK=Feedback +FEEDBACK=Got Feedback ? +REPORT_BUG=Raise An Issue CONTACT_US=Contact Us #Pending for translation ... diff --git a/wise-webapp/src/main/resources/messages_es.properties b/wise-webapp/src/main/resources/messages_es.properties index 8a1f5c49..9ac487bb 100644 --- a/wise-webapp/src/main/resources/messages_es.properties +++ b/wise-webapp/src/main/resources/messages_es.properties @@ -235,7 +235,9 @@ TUTORIAL.FONT_STYLE=Estilos TUTORIAL.FONT_TYPE=Tipos de Fuente TUTORIAL.SAMPLE_NOTE=Esto es una Nota ! SUPPORT=Ayuda -FEEDBACK=Feedback +FEEDBACK=Tenes Feedback ? +REPORT_BUG=Reportar Problema + CONTACT_US=Contáctenos diff --git a/wise-webapp/src/main/webapp/jsp/footer.jsp b/wise-webapp/src/main/webapp/jsp/footer.jsp index f5dd91da..847f74f8 100644 --- a/wise-webapp/src/main/webapp/jsp/footer.jsp +++ b/wise-webapp/src/main/webapp/jsp/footer.jsp @@ -1,19 +1,35 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +
+ + -
-
- - + } + }); + + +
+ +
@@ -35,10 +51,10 @@

- | - | - | -
+ | + | + | +

@@ -62,4 +78,4 @@
-<%@ include file="/jsp/googleAnalytics.jsf" %> +<%@ include file="/jsp/googleAnalytics.jsf" %> \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/init.jsp b/wise-webapp/src/main/webapp/jsp/init.jsp index 376f6a22..4ab7e2a8 100644 --- a/wise-webapp/src/main/webapp/jsp/init.jsp +++ b/wise-webapp/src/main/webapp/jsp/init.jsp @@ -1,7 +1,7 @@ +<%@taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <% request.setAttribute("principal", com.wisemapping.security.Utils.getUser()); %> diff --git a/wise-webapp/src/test/java/com/wisemapping/test/model/UserAgentTest.java b/wise-webapp/src/test/java/com/wisemapping/test/model/UserAgentTest.java index c0f61043..6ae0f326 100644 --- a/wise-webapp/src/test/java/com/wisemapping/test/model/UserAgentTest.java +++ b/wise-webapp/src/test/java/com/wisemapping/test/model/UserAgentTest.java @@ -49,6 +49,9 @@ public class UserAgentTest { final SupportedUserAgent mediapartners = SupportedUserAgent.create("Mediapartners-Google/2.1"); Assert.assertEquals(mediapartners.isBrowserSupported(), true); + final SupportedUserAgent ie11 = SupportedUserAgent.create("Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko"); + Assert.assertEquals(ie11.isBrowserSupported(), true); + final SupportedUserAgent firefox20 = SupportedUserAgent.create("Mozilla/5.0 (Windows NT 6.1; WOW64; rv:20.0) Gecko/20121215 Firefox/20.0 AppEngine-Google; (+http://code.google.com/appengine; appid: slubuntuk)"); Assert.assertEquals(firefox20.isBrowserSupported(), true); }