提交 be673713 编写于 作者: A alanharder

[JENKINS-9248] Add active configurations in remote API for matrix projects.

上级 dd1e7e2a
......@@ -58,6 +58,9 @@ Upcoming changes</a>
<li class=bug>
Allow blank rootDN in LDAPSecurityRealm.
(<a href="http://jenkins.361315.n4.nabble.com/LDAP-and-empty-root-DN-values-td2216124.html">thread</a>)
<li class=rfe>
Add active configurations in remote API for matrix projects.
(<a href="http://issues.jenkins-ci.org/browse/JENKINS-9248">issue 9248</a>)
</ul>
</div><!--=TRUNK-END=-->
......
/*
* The MIT License
*
* Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Jorg Heymans, Red Hat, Inc., id:cactusman
* Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi,
* Jorg Heymans, Red Hat, Inc., id:cactusman
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
......@@ -40,7 +41,6 @@ import hudson.model.Items;
import hudson.model.JDK;
import hudson.model.Job;
import hudson.model.Label;
import hudson.model.Node;
import hudson.model.Queue.FlyweightTask;
import hudson.model.ResourceController;
import hudson.model.Result;
......@@ -63,6 +63,7 @@ import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.TokenList;
import org.kohsuke.stapler.export.Exported;
import javax.servlet.ServletException;
import java.io.File;
......@@ -403,6 +404,7 @@ public class MatrixProject extends AbstractProject<MatrixProject,MatrixBuild> im
* In contract, inactive configurations are those that are left for archival purpose
* and no longer built when a new {@link MatrixBuild} is executed.
*/
@Exported
public Collection<MatrixConfiguration> getActiveConfigurations() {
return activeConfigurations;
}
......
......@@ -28,6 +28,7 @@ import hudson.security.AuthorizationMatrixProperty;
import hudson.security.ProjectMatrixAuthorizationStrategy;
import java.util.Collections;
import org.acegisecurity.context.SecurityContextHolder;
import com.gargoylesoftware.htmlunit.xml.XmlPage;
import org.jvnet.hudson.test.HudsonTestCase;
import org.jvnet.hudson.test.Bug;
......@@ -65,4 +66,13 @@ public class MatrixTest extends HudsonTestCase {
// Project-level permission should apply to single configuration too:
assertTrue(mc.getACL().hasPermission(Item.READ));
}
public void testApi() throws Exception {
MatrixProject project = createMatrixProject();
project.setAxes(new AxisList(
new Axis("FOO", "abc", "def"),
new Axis("BAR", "uvw", "xyz")));
XmlPage xml = new WebClient().goToXml(project.getUrl() + "api/xml");
assertEquals(4, xml.getByXPath("//matrixProject/activeConfiguration").size());
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册