Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 47977 invoked from network); 3 Sep 2006 13:19:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Sep 2006 13:19:15 -0000 Received: (qmail 34273 invoked by uid 500); 3 Sep 2006 13:19:14 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 34227 invoked by uid 500); 3 Sep 2006 13:19:14 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 34216 invoked by uid 99); 3 Sep 2006 13:19:14 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Sep 2006 06:19:14 -0700 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Sep 2006 06:19:13 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 238D61A981A; Sun, 3 Sep 2006 06:18:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r439774 - in /cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer: AbstractDeployMojo.java monolithic/MonolithicCocoonDeployer.java monolithic/XPatchDeployer.java Date: Sun, 03 Sep 2006 13:18:52 -0000 To: cvs@cocoon.apache.org From: lgawron@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060903131853.238D61A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: lgawron Date: Sun Sep 3 06:18:50 2006 New Revision: 439774 URL: http://svn.apache.org/viewvc?rev=439774&view=rev Log: refactoring, stream handling Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/XPatchDeployer.java Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java?rev=439774&r1=439773&r2=439774&view=diff ============================================================================== --- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java (original) +++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java Sun Sep 3 06:18:50 2006 @@ -311,7 +311,6 @@ String webInfSlashWebXml = "WEB-INF" + File.separatorChar + "web.xml"; String webXmlLocation = this.getWebXml(); - // TODO sprawdzic czy byc moze w targecie jest juz taki web.xml if (webXmlLocation == null) { webXmlLocation = getWarSourceDirectory().getAbsolutePath() + File.separatorChar + webInfSlashWebXml; } Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java?rev=439774&r1=439773&r2=439774&view=diff ============================================================================== --- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java (original) +++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java Sun Sep 3 06:18:50 2006 @@ -15,12 +15,14 @@ */ package org.apache.cocoon.maven.deployer.monolithic; +import java.io.BufferedOutputStream; import java.io.File; import java.io.FileFilter; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; @@ -134,8 +136,12 @@ } } - // TODO close streams - xwebPatcher.applyPatches(readResourceFromClassloader("WEB-INF/web.xml"), "WEB-INF/web.xml"); + InputStream sourceWebXmlFile = readResourceFromClassloader("WEB-INF/web.xml"); + try { + xwebPatcher.applyPatches(sourceWebXmlFile, "WEB-INF/web.xml"); + } finally { + IOUtils.closeQuietly(sourceWebXmlFile); + } copyFile(basedir, "WEB-INF/applicationContext.xml"); copyFile(basedir, "WEB-INF/cocoon/properties/core.properties"); } @@ -151,21 +157,24 @@ } private void writeProperties(final File basedir, final String propertiesFile, final Properties properties) { + File outFile = new File(basedir, propertiesFile); + OutputStream os = null; try { - File outFile = new File(basedir, propertiesFile); - //TODO close stream! - properties.store(new FileOutputStream(FileUtils.createPath(outFile)), null); + os = new FileOutputStream(FileUtils.createPath(outFile)); this.logger.info("Deploying dev properties to " + propertiesFile); + properties.store(os, null); } catch (IOException e) { throw new DeploymentException("Can't save properties to " + propertiesFile, e); + } finally { + IOUtils.closeQuietly(os); } } private void copyFile(final File basedir, final String fileName) { try { File outFile = FileUtils.createPath(new File(basedir, fileName)); - CopyUtils.copy(readResourceFromClassloader(fileName), new FileOutputStream(outFile)); this.logger.info("Deploying resource file to " + fileName); + CopyUtils.copy(readResourceFromClassloader(fileName), new FileOutputStream(outFile)); } catch (FileNotFoundException e) { throw new DeploymentException("Can't copy to " + fileName, e); } catch (IOException e) { @@ -174,19 +183,18 @@ } private void writeStringTemplateToFile(final File basedir, final String fileName, final Map templateObjects) { - FileOutputStream fos = null; + OutputStream fos = null; try { File outFile = FileUtils.createPath(new File(basedir, fileName)); - // TODO buffered stream! - fos = new FileOutputStream(outFile); + fos = new BufferedOutputStream(new FileOutputStream(outFile)); InputStream fileIs = readResourceFromClassloader(fileName); StringTemplate stringTemplate = new StringTemplate(IOUtils.toString(fileIs)); for (Iterator templateObjectsIt = templateObjects.keySet().iterator(); templateObjectsIt.hasNext();) { Object key = templateObjectsIt.next(); stringTemplate.setAttribute((String) key, templateObjects.get(key)); } - IOUtils.write(stringTemplate.toString(), fos); this.logger.info("Deploying string-template to " + fileName); + IOUtils.write(stringTemplate.toString(), fos); } catch (FileNotFoundException e) { throw new DeploymentException(fileName + " not found.", e); } catch (IOException e) { Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/XPatchDeployer.java URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/XPatchDeployer.java?rev=439774&r1=439773&r2=439774&view=diff ============================================================================== --- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/XPatchDeployer.java (original) +++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/XPatchDeployer.java Sun Sep 3 06:18:50 2006 @@ -15,15 +15,7 @@ */ package org.apache.cocoon.maven.deployer.monolithic; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.*; import java.util.Iterator; import java.util.List; import java.util.Vector; @@ -39,6 +31,7 @@ import org.apache.cocoon.maven.deployer.utils.CopyUtils; import org.apache.cocoon.maven.deployer.utils.FileUtils; import org.apache.cocoon.maven.deployer.utils.XMLUtils; +import org.apache.commons.io.IOUtils; import org.apache.xpath.XPathAPI; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -195,8 +188,13 @@ TransformerFactory tFactory = TransformerFactory.newInstance(); Transformer transformer = tFactory.newTransformer(); - transformer.transform(new DOMSource(original), new StreamResult(new FileOutputStream(outFile))); - getLogger().debug("Deploying resource file to " + fileName); + OutputStream os = new BufferedOutputStream(new FileOutputStream(outFile)); + try { + getLogger().debug("Deploying resource file to " + fileName); + transformer.transform(new DOMSource(original), new StreamResult(os)); + } finally { + IOUtils.closeQuietly(os); + } } catch (FileNotFoundException e) { throw new DeploymentException("Can't write to nonexistant file " + fileName, e); } catch (IOException e) {