diff --git a/cli/pom.xml b/cli/pom.xml index 765346e822..0edf9448b8 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.320-SNAPSHOT + 1.321-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 2ce0995ec8..a79e5ed20f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.320-SNAPSHOT + 1.321-SNAPSHOT ../pom.xml diff --git a/core/src/main/java/hudson/util/HyperlinkingOutTag.java b/core/src/main/java/hudson/util/HyperlinkingOutTag.java deleted file mode 100644 index 9630b1d6c7..0000000000 --- a/core/src/main/java/hudson/util/HyperlinkingOutTag.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package hudson.util; - -import org.apache.commons.jelly.JellyTagException; -import org.apache.commons.jelly.MissingAttributeException; -import org.apache.commons.jelly.TagSupport; -import org.apache.commons.jelly.XMLOutput; -import org.apache.commons.jelly.expression.Expression; -import org.kohsuke.stapler.jelly.OutTag; -import org.springframework.beans.factory.annotation.Required; -import org.xml.sax.SAXException; - -/** - * Variant of {@linkplain OutTag } that tries to hyperlink URLs. - */ -public class HyperlinkingOutTag extends TagSupport { - - private Expression value; - - @Required - public void setValue(Expression value) { - this.value = value; - } - - public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException { - String text = value.evaluateAsString(context); - if (text != null) { - try { - output.write(text. - replace("&", "&"). - replace("<", "<"). - replaceAll("\\b(https?://[^\\s)>]+)", "$1")); - } catch (SAXException e) { - throw new JellyTagException("could not write the XMLOutput", e); - } - } - } -} diff --git a/core/src/main/resources/hudson/tasks/junit/CaseResult/index.jelly b/core/src/main/resources/hudson/tasks/junit/CaseResult/index.jelly index a80dbc1558..e3acbb9dd3 100644 --- a/core/src/main/resources/hudson/tasks/junit/CaseResult/index.jelly +++ b/core/src/main/resources/hudson/tasks/junit/CaseResult/index.jelly @@ -23,7 +23,7 @@ THE SOFTWARE. --> + xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"> @@ -70,7 +70,7 @@ THE SOFTWARE.

${%Error Message}

"${it.annotate(it.errorDetails)}

${%Stacktrace}

-
+
${it.annotate(it.errorStackTrace)}

${%Standard Output}

diff --git a/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly b/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly index 861643226e..d70f52078c 100644 --- a/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly +++ b/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly @@ -26,7 +26,7 @@ THE SOFTWARE. Trend of test execution over time. --> + xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"> diff --git a/core/src/main/resources/hudson/tasks/junit/CaseResult/summary.jelly b/core/src/main/resources/hudson/tasks/junit/CaseResult/summary.jelly index aba0cb45fd..fb2863b633 100644 --- a/core/src/main/resources/hudson/tasks/junit/CaseResult/summary.jelly +++ b/core/src/main/resources/hudson/tasks/junit/CaseResult/summary.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. + xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">

${%Error Details}

diff --git a/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly b/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly index 1cd7e7fd64..5c161fd595 100644 --- a/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly +++ b/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly @@ -23,7 +23,7 @@ THE SOFTWARE. --> + xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
${%Build}
diff --git a/core/src/main/resources/hudson/tasks/junit/MetaTabulatedResult/list.jelly b/core/src/main/resources/hudson/tasks/junit/MetaTabulatedResult/list.jelly index 1cd7e7fd64..5c161fd595 100644 --- a/core/src/main/resources/hudson/tasks/junit/MetaTabulatedResult/list.jelly +++ b/core/src/main/resources/hudson/tasks/junit/MetaTabulatedResult/list.jelly @@ -23,7 +23,7 @@ THE SOFTWARE. --> + xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
${%Build}
diff --git a/core/src/test/java/hudson/util/HyperlinkingOutTagTest.java b/core/src/test/java/hudson/util/HyperlinkingOutTagTest.java deleted file mode 100644 index f0aa258f33..0000000000 --- a/core/src/test/java/hudson/util/HyperlinkingOutTagTest.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package hudson.util; - -import java.io.StringWriter; -import junit.framework.TestCase; -import org.apache.commons.jelly.XMLOutput; -import org.apache.commons.jelly.expression.ConstantExpression; - -public class HyperlinkingOutTagTest extends TestCase { - - public HyperlinkingOutTagTest(String name) { - super(name); - } - - public void testPlain() throws Exception { - assertOutput("plain text", "plain text"); - } - - public void testOnItsOwnLine() throws Exception { - assertOutput("line #1\nhttp://nowhere.net/\nline #2\n", - "line #1\nhttp://nowhere.net/\nline #2\n"); - } - - public void testInline() throws Exception { - assertOutput("failed; see http://nowhere.net/", - "failed; see http://nowhere.net/"); - assertOutput("failed (see http://nowhere.net/)", - "failed (see http://nowhere.net/)"); - } - - public void testMultipleLinks() throws Exception { - assertOutput("http://nowhere.net/ - failed: http://elsewhere.net/", - "http://nowhere.net/ - failed: " + - "http://elsewhere.net/"); - } - - public void testHttps() throws Exception { - assertOutput("https://nowhere.net/", - "https://nowhere.net/"); - } - - public void testMushedUp() throws Exception { - assertOutput("stuffhttp://nowhere.net/", "stuffhttp://nowhere.net/"); - } - - public void testEscapedMetaChars() throws Exception { - assertOutput("a < b && c < d", "a < b && c < d"); - } - - public void testEscapedMetaCharsWithLinks() throws Exception { - assertOutput("see ", - "see <http://nowhere.net/>"); - assertOutput("http://google.com/?q=stuff&lang=en", - "http://google.com/?q=stuff&lang=en"); - } - - public void testPortNumber() throws Exception { - assertOutput("http://localhost:8080/stuff/", - "http://localhost:8080/stuff/"); - } - - private void assertOutput(String in, String out) throws Exception { - StringWriter w = new StringWriter(); - XMLOutput xmlo = XMLOutput.createXMLOutput(w); - HyperlinkingOutTag tag = new HyperlinkingOutTag(); - tag.setValue(new ConstantExpression(in)); - tag.doTag(xmlo); - assertEquals(out, w.toString()); - } - -} diff --git a/debian/changelog b/debian/changelog index 7aa8c0f6e4..b3695a8983 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.320) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 14 Aug 2009 22:36:35 -0700 + hudson (1.319) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index c82c6daa6c..6dbceffc50 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.320-SNAPSHOT + 1.321-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index 483b36769b..fe03bb29f5 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.320-SNAPSHOT + 1.321-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 4d6da5f738..91dffe5abf 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.320-SNAPSHOT + 1.321-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 7695ff0f2d..ce0d2f245d 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.320-SNAPSHOT + 1.321-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index b652a0ab4b..4b3ab9f996 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.320-SNAPSHOT + 1.321-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index d35977f421..f6a81325bd 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.320-SNAPSHOT + 1.321-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index 4c8be52b57..1af3067d48 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -217,7 +217,7 @@ public abstract class HudsonTestCase extends TestCase { hudson = newHudson(); hudson.setNoUsageStatistics(true); // collecting usage stats from tests are pointless. - hudson.setCrumbIssuer(((CrumbIssuerDescriptor)hudson.getDescriptor(TestCrumbIssuer.class)).newInstance(null,null)); + hudson.setCrumbIssuer(new TestCrumbIssuer()); hudson.servletContext.setAttribute("app",hudson); hudson.servletContext.setAttribute("version","?"); diff --git a/test/src/test/java/hudson/tasks/junit/CaseResultTest.java b/test/src/test/java/hudson/tasks/junit/CaseResultTest.java index 80270d0725..eba7427e5e 100644 --- a/test/src/test/java/hudson/tasks/junit/CaseResultTest.java +++ b/test/src/test/java/hudson/tasks/junit/CaseResultTest.java @@ -23,15 +23,11 @@ */ package hudson.tasks.junit; -import hudson.maven.MavenModuleSet; -import hudson.maven.MavenModuleSetBuild; -import static hudson.model.Result.UNSTABLE; import hudson.model.FreeStyleProject; import hudson.model.AbstractBuild; import hudson.model.BuildListener; import hudson.model.Result; import hudson.model.FreeStyleBuild; -import hudson.tasks.test.AbstractTestResultAction; import hudson.Launcher; import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.Email; @@ -78,5 +74,31 @@ public class CaseResultTest extends HudsonTestCase { assertEquals("org.twia.vendor.VendorManagerTest",cr.getClassName()); assertEquals("testGetVendorFirmKeyForVendorRep",cr.getName()); + + // piggy back tests for annotate methods + assertOutput(cr,"plain text", "plain text"); + assertOutput(cr,"line #1\nhttp://nowhere.net/\nline #2\n", + "line #1\nhttp://nowhere.net/\nline #2\n"); + assertOutput(cr,"failed; see http://nowhere.net/", + "failed; see http://nowhere.net/"); + assertOutput(cr,"failed (see http://nowhere.net/)", + "failed (see http://nowhere.net/)"); + assertOutput(cr,"http://nowhere.net/ - failed: http://elsewhere.net/", + "http://nowhere.net/ - failed: " + + "http://elsewhere.net/"); + assertOutput(cr,"https://nowhere.net/", + "https://nowhere.net/"); + assertOutput(cr,"stuffhttp://nowhere.net/", "stuffhttp://nowhere.net/"); + assertOutput(cr,"a < b && c < d", "a < b && c < d"); + assertOutput(cr,"see ", + "see <http://nowhere.net/>"); + assertOutput(cr,"http://google.com/?q=stuff&lang=en", + "http://google.com/?q=stuff&lang=en"); + assertOutput(cr,"http://localhost:8080/stuff/", + "http://localhost:8080/stuff/"); + } + + private void assertOutput(CaseResult cr, String in, String out) throws Exception { + assertEquals(out, cr.annotate(in)); } } diff --git a/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java b/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java index 014ec18c27..70b476e8f2 100644 --- a/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java +++ b/test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java @@ -122,8 +122,7 @@ public class JUnitResultArchiverTest extends HudsonTestCase { } - private void testSetDescription(String url, TestObject object) - throws IOException, SAXException, Exception { + private void testSetDescription(String url, TestObject object) throws Exception { HtmlPage page = new WebClient().goTo(url); page.getAnchorByHref("editDescription").click(); diff --git a/war/pom.xml b/war/pom.xml index 3486290763..0a635bb2ab 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.320-SNAPSHOT + 1.321-SNAPSHOT ../pom.xml @@ -113,6 +113,7 @@ THE SOFTWARE. +
${%Build}