diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index c9f2bad44f..4c890580bc 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/core/src/main/java/hudson/model/AbstractItem.java @@ -35,8 +35,11 @@ import hudson.model.listeners.SaveableListener; import hudson.security.AccessControlled; import hudson.security.Permission; import hudson.security.ACL; +import hudson.util.AtomicFileWriter; +import hudson.util.IOException2; import org.apache.tools.ant.taskdefs.Copy; import org.apache.tools.ant.types.FileSet; +import org.kohsuke.stapler.WebMethod; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; @@ -52,6 +55,13 @@ import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.CmdLineException; import javax.servlet.ServletException; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + +import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; /** * Partial default implementation of {@link Item}. @@ -412,6 +422,54 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet Util.deleteRecursive(getRootDir()); } + /** + * Accepts config.xml submission, as well as serve it. + */ + @WebMethod(name = "config.xml") + public void doConfigDotXml(StaplerRequest req, StaplerResponse rsp) + throws IOException { + if (req.getMethod().equals("GET")) { + // read + checkPermission(EXTENDED_READ); + rsp.setContentType("application/xml;charset=UTF-8"); + getConfigFile().writeRawTo(rsp.getWriter()); + return; + } + if (req.getMethod().equals("POST")) { + // submission + checkPermission(CONFIGURE); + XmlFile configXmlFile = getConfigFile(); + AtomicFileWriter out = new AtomicFileWriter(configXmlFile.getFile()); + try { + try { + // this allows us to use UTF-8 for storing data, + // plus it checks any well-formedness issue in the submitted + // data + Transformer t = TransformerFactory.newInstance() + .newTransformer(); + t.transform(new StreamSource(req.getReader()), + new StreamResult(out)); + out.close(); + } catch (TransformerException e) { + throw new IOException2("Failed to persist configuration.xml", e); + } + + // try to reflect the changes by reloading + new XmlFile(Items.XSTREAM, out.getTemporaryFile()).unmarshal(this); + onLoad(getParent(), getRootDir().getName()); + + // if everything went well, commit this new version + out.commit(); + } finally { + out.abort(); // don't leave anything behind + } + return; + } + + // huh? + rsp.sendError(SC_BAD_REQUEST); + } + public String toString() { return super.toString()+'['+getFullName()+']'; } diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index 969fe8d090..5b733d5aa3 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -990,54 +990,6 @@ public abstract class Job, RunT extends Runconfig.xml submission, as well as serve it. - */ - @WebMethod(name = "config.xml") - public void doConfigDotXml(StaplerRequest req, StaplerResponse rsp) - throws IOException { - if (req.getMethod().equals("GET")) { - // read - checkPermission(EXTENDED_READ); - rsp.setContentType("application/xml;charset=UTF-8"); - getConfigFile().writeRawTo(rsp.getWriter()); - return; - } - if (req.getMethod().equals("POST")) { - // submission - checkPermission(CONFIGURE); - XmlFile configXmlFile = getConfigFile(); - AtomicFileWriter out = new AtomicFileWriter(configXmlFile.getFile()); - try { - try { - // this allows us to use UTF-8 for storing data, - // plus it checks any well-formedness issue in the submitted - // data - Transformer t = TransformerFactory.newInstance() - .newTransformer(); - t.transform(new StreamSource(req.getReader()), - new StreamResult(out)); - out.close(); - } catch (TransformerException e) { - throw new IOException2("Failed to persist configuration.xml", e); - } - - // try to reflect the changes by reloading - new XmlFile(Items.XSTREAM, out.getTemporaryFile()).unmarshal(this); - onLoad(getParent(), getRootDir().getName()); - - // if everything went well, commit this new version - out.commit(); - } finally { - out.abort(); // don't leave anything behind - } - return; - } - - // huh? - rsp.sendError(SC_BAD_REQUEST); - } - /** * Derived class can override this to perform additional config submission * work.