Author: chris.laprun(a)jboss.com Date: 2009-06-17 17:22:49 -0400 (Wed, 17 Jun 2009) New Revision: 13468 Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/net/URLTools.java modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/net/URLToolsTestCase.java Log: JBPORTAL-2426: added archive to LINK URL detection pattern Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/net/URLTools.java =================================================================== --- modules/common/trunk/common/src/main/java/org/jboss/portal/common/net/URLTools.java 2009-06-17 15:04:30 UTC (rev 13467) +++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/net/URLTools.java 2009-06-17 21:22:49 UTC (rev 13468) @@ -50,7 +50,7 @@ public class URLTools { public static final String RE_EMAIL_VALIDATION = &quot;^([a-zA-Z0-9]+(([\\.\\-\\_]?[a-zA-Z0-9]+)+)?)\\(a)(([a-zA-Z0-9]+[\\.\\-\\_])+[a-zA-Z]{2,4})$&quot;; - private static final Pattern LINK = Pattern.compile("(?:href|action|src|location)\\s*=\\s*('|\")\\s*([^'\"]*)\\s*('|\")", + private static final Pattern LINK = Pattern.compile("(?:href|action|src|location|archive)\\s*=\\s*('|\")\\s*([^'\"]*)\\s*('|\")", Pattern.CASE_INSENSITIVE); public static final String HTTP_PREFIX = "http://"; Modified: modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/net/URLToolsTestCase.java =================================================================== --- modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/net/URLToolsTestCase.java 2009-06-17 15:04:30 UTC (rev 13467) +++ modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/net/URLToolsTestCase.java 2009-06-17 21:22:49 UTC (rev 13468) @@ -83,6 +83,12 @@ assertEquals(url.length() + startIndex, link.getEnd()); assertEquals(url, markup.substring(link.getStart(), link.getEnd())); assertEquals(url, link.getURLAsString()); + + markup = "<applet code=\"org.jboss.applet.hello.HelloApplet\" archive=\"wsrp_rewrite?wsrp-urlType=resource&amp;" + + "wsrp-url=http%3A%2F%2Flocalhost%3A8080%2Fhelloworld&amp;wsrp-requiresRewrite=true/wsrp_rewrite/helloapplet.jar" + + "\" width=\"1000\" height=\"50\">\n</applet>"; + links = URLTools.extractURLsFrom(markup); + assertEquals("wsrp_rewrite?wsrp-urlType=resource&amp;wsrp-url=http%3A%2F%2Flocalhost%3A8080%2Fhelloworld&amp;wsrp-requiresRewrite=true/wsrp_rewrite/helloapplet.jar", links[0].getURLAsString()); } public void testReplaceURLs()