Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 31857 invoked from network); 19 May 2010 10:38:54 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 19 May 2010 10:38:54 -0000 Received: (qmail 17765 invoked by uid 500); 19 May 2010 10:38:54 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 17715 invoked by uid 500); 19 May 2010 10:38:53 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 17708 invoked by uid 99); 19 May 2010 10:38:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 May 2010 10:38:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 May 2010 10:38:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BD4F6238899C; Wed, 19 May 2010 10:38:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r946111 - in /continuum/branches/continuum-flat-multi-module-updated: continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ Date: Wed, 19 May 2010 10:38:27 -0000 To: commits@continuum.apache.org From: oching@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100519103827.BD4F6238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: oching Date: Wed May 19 10:38:27 2010 New Revision: 946111 URL: http://svn.apache.org/viewvc?rev=946111&view=rev Log: merge -r946052 from trunk Modified: continuum/branches/continuum-flat-multi-module-updated/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java Modified: continuum/branches/continuum-flat-multi-module-updated/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module-updated/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java?rev=946111&r1=946110&r2=946111&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module-updated/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java (original) +++ continuum/branches/continuum-flat-multi-module-updated/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java Wed May 19 10:38:27 2010 @@ -20,7 +20,6 @@ package org.apache.continuum.buildagent; */ import java.io.File; -import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; @@ -59,6 +58,7 @@ import org.apache.maven.shared.release.v import org.apache.maven.shared.release.versions.VersionInfo; import org.codehaus.plexus.taskqueue.TaskQueueException; import org.codehaus.plexus.util.FileUtils; +import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.slf4j.Logger; @@ -319,7 +319,7 @@ public class ContinuumBuildAgentServiceI MavenXpp3Reader pomReader = new MavenXpp3Reader(); try { - Model model = pomReader.read( new FileReader( new File( workingDirectory, pomFilename ) ) ); + Model model = pomReader.read( ReaderFactory.newXmlReader( new File( workingDirectory, pomFilename ) ) ); if ( model.getBuild() != null && model.getBuild().getPlugins() != null ) { @@ -980,7 +980,7 @@ public class ContinuumBuildAgentServiceI throws Exception { MavenXpp3Reader pomReader = new MavenXpp3Reader(); - Model model = pomReader.read( new FileReader( new File( workingDirectory, pomFilename ) ) ); + Model model = pomReader.read( ReaderFactory.newXmlReader( new File( workingDirectory, pomFilename ) ) ); if ( model.getGroupId() == null ) { Modified: continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java?rev=946111&r1=946110&r2=946111&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (original) +++ continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Wed May 19 10:38:27 2010 @@ -21,7 +21,6 @@ package org.apache.maven.continuum.web.a import java.io.File; import java.io.FileNotFoundException; -import java.io.FileReader; import java.io.IOException; import java.util.List; @@ -31,6 +30,7 @@ import org.apache.maven.continuum.Contin import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult; import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; +import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -80,7 +80,7 @@ public class AddMavenTwoProjectAction filePath = filePath.substring( FILE_SCHEME.length() ); } - Model model = m2pomReader.read( new FileReader( filePath ) ); + Model model = m2pomReader.read( ReaderFactory.newXmlReader( new File( filePath ) ) ); List modules = model.getModules(); Modified: continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java?rev=946111&r1=946110&r2=946111&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java (original) +++ continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java Wed May 19 10:38:27 2010 @@ -39,10 +39,10 @@ import org.apache.maven.model.Plugin; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository; import org.apache.maven.shared.release.ReleaseResult; +import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.Xpp3Dom; import java.io.File; -import java.io.FileReader; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -177,7 +177,7 @@ public class ReleasePerformAction { //TODO: Use the model reader so we'll can get the plugin configuration from parent too MavenXpp3Reader pomReader = new MavenXpp3Reader(); - Model model = pomReader.read( new FileReader( new File( workingDirectory, pomFilename ) ) ); + Model model = pomReader.read( ReaderFactory.newXmlReader( new File( workingDirectory, pomFilename ) ) ); if ( model.getBuild() != null && model.getBuild().getPlugins() != null ) { Modified: continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java?rev=946111&r1=946110&r2=946111&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java (original) +++ continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java Wed May 19 10:38:27 2010 @@ -41,11 +41,11 @@ import org.apache.maven.scm.provider.svn import org.apache.maven.shared.release.ReleaseResult; import org.apache.maven.shared.release.versions.DefaultVersionInfo; import org.apache.maven.shared.release.versions.VersionInfo; +import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.Xpp3Dom; import java.io.File; -import java.io.FileReader; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -212,7 +212,7 @@ public class ReleasePrepareAction { //TODO: Use the model reader so we'll can get the plugin configuration from parent too MavenXpp3Reader pomReader = new MavenXpp3Reader(); - Model model = pomReader.read( new FileReader( new File( workingDirectory, pomFilename ) ) ); + Model model = pomReader.read( ReaderFactory.newXmlReader( new File( workingDirectory, pomFilename ) ) ); if ( model.getBuild() != null && model.getBuild().getPlugins() != null ) { @@ -502,7 +502,7 @@ public class ReleasePrepareAction throws Exception { MavenXpp3Reader pomReader = new MavenXpp3Reader(); - Model model = pomReader.read( new FileReader( new File( workingDirectory, pomFilename ) ) ); + Model model = pomReader.read( ReaderFactory.newXmlReader( new File( workingDirectory, pomFilename ) ) ); if ( model.getGroupId() == null ) {