Author: jvanzyl Date: Sun May 22 05:36:37 2005 New Revision: 171305 URL: http://svn.apache.org/viewcvs?rev=171305&view=rev Log: o formatting
Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/AbstractPomTransformer.java Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java?rev=171305&r1=171304&r2=171305&view=diff ============================================================================== --- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java (original) +++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java Sun May 22 05:36:37 2005 @@ -325,7 +325,7 @@ transformer.transformNodes(); - transformer.write(); + transformer.write(); } catch ( Exception e ) { @@ -473,7 +473,7 @@ scm.setTag( tag ); } - getLog().info( "Tagging release with the label " + tag + "." ); + getLog().info( "Tagging release with the label " + tag + "." ); scm.tag(); } Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/AbstractPomTransformer.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/AbstractPomTransformer.java?rev=171305&r1=171304&r2=171305&view=diff ============================================================================== --- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/AbstractPomTransformer.java (original) +++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/transformer/AbstractPomTransformer.java Sun May 22 05:36:37 2005 @@ -75,100 +75,56 @@ // Accessors // ------------------------------------------------------------------------- - /** - * - * @param updatedModel - */ public Model getUpdatedModel() { return updatedModel; } - /** - * - * @param updatedModel - */ public void setUpdatedModel( Model updatedModel ) { this.updatedModel = updatedModel; } - /** - * - * @return - */ public Map getVariables() { return variables; } - /** - * - * @param variables - */ public void setVariables( Map variables ) { this.variables = variables; } - /** - * - * @param project - */ public void setProject( File project ) { this.project = project; } - /** - * - * @return - */ public File getProject() { return project; } - /** - * - * @return - */ public Document getDocument() { return document; } - /** - * - * @param document - */ public void setDocument( Document document ) { this.document = document; } - /** - * - * @return - */ public File getOutputFile() { return outputFile; } - /** - * - * @param outputFile - */ public void setOutputFile( File outputFile ) { this.outputFile = outputFile; } - /** - * - * @return - */ public List getSelectedNodes() { if ( selectedNodes == null ) @@ -185,28 +141,16 @@ return selectedNodes; } - /** - * - * @param selectedNodes - */ public void setSelectedNodes( List selectedNodes ) { this.selectedNodes = selectedNodes; } - /** - * - * @return - */ public int getSelectedNodeCount() { return getSelectedNodes().size(); } - /** - * - * @return - */ public List getTransformations() { if ( transformations == null ) @@ -217,9 +161,6 @@ return transformations; } - /** - * - */ public void createTransformations() { transformations = new ArrayList(); @@ -297,19 +238,28 @@ throws Exception { SAXReader reader = new SAXReader(); + setDocument( reader.read( getProject() ) ); // The selecting nodes with the xpath expression will give us a list // of dependencies elements where the version element is equal to 'SNAPSHOT'. // So we can get any information we need, and alter anything we need to before writing // the dom4j document back out. + XPath pomXpath = new Dom4jXPath( selectProjectNodeXPathExpression() ); + XPath dependenciesXpath = new Dom4jXPath( selectDependenciesNodesXPathExpression() ); + XPath pluginsXpath = new Dom4jXPath( selectPluginsNodesXPathExpression() ); + List nodes = new ArrayList(); + nodes.addAll( pomXpath.selectNodes( getDocument() ) ); + nodes.addAll( dependenciesXpath.selectNodes( getDocument() ) ); + nodes.addAll( pluginsXpath.selectNodes( getDocument() ) ); + setSelectedNodes( nodes ); } @@ -336,14 +286,21 @@ } OutputFormat format = new OutputFormat(); + format.setIndentSize( 2 ); + format.setNewlines( true ); + format.setTrimText( true ); XMLWriter writer = new XMLWriter( format ); + writer.setOutputStream( os ); + writer.write( getDocument() ); + writer.flush(); + writer.close(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]