Author: brett Date: Wed Jan 12 12:05:27 2005 New Revision: 124986 URL: http://svn.apache.org/viewcvs?view=rev&rev=124986 Log: get diff working Modified: maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties maven/maven-1/plugins/branches/scm-1.5-branch/project.xml maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml?view=diff&rev=124986&p1=maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml&r1=124985&p2=maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml&r2=124986 ============================================================================== --- maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml (original) +++ maven/maven-1/plugins/branches/scm-1.5-branch/maven.xml Wed Jan 12 12:05:27 2005 @@ -7,7 +7,6 @@ <j:set var="libdir" value="${maven.build.dest}/plugin-resources/lib" /> <ant:mkdir dir="${libdir}" /> <ant:copy tofile="${libdir}/plexus-utils.jar" file="${pom.getDependencyPath('plexus:plexus-utils')}" /> - <ant:copy tofile="${libdir}/plexus-container-api.jar" file="${pom.getDependencyPath('plexus:plexus-container-api')}" /> <ant:copy tofile="${libdir}/plexus-container-default.jar" file="${pom.getDependencyPath('plexus:plexus-container-default')}" /> <ant:copy tofile="${libdir}/maven-scm-api.jar" file="${pom.getDependencyPath('maven:maven-scm-api')}" /> <ant:copy tofile="${libdir}/maven-scm-provider-cvs.jar" file="${pom.getDependencyPath('maven:maven-scm-provider-cvs')}" /> @@ -19,7 +18,6 @@ <j:file name="${maven.build.dest}/project.properties"><j:whitespace> maven.jar.override=on maven.jar.plexus-utils=$${basedir}/plugin-resources/lib/plexus-utils.jar -maven.jar.plexus-container-api=$${basedir}/plugin-resources/lib/plexus-container-api.jar maven.jar.plexus-container-default=$${basedir}/plugin-resources/lib/plexus-container-default.jar maven.jar.maven-scm-api=$${basedir}/plugin-resources/lib/maven-scm-api.jar maven.jar.maven-scm-provider-cvs=$${basedir}/plugin-resources/lib/maven-scm-provider-cvs.jar Modified: maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly?view=diff&rev=124986&p1=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly&r1=124985&p2=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly&r2=124986 ============================================================================== --- maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly (original) +++ maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly Wed Jan 12 12:05:27 2005 @@ -238,7 +238,7 @@ <goal name="scm:create-patch" description="Create a patch file for changes single last SCM update" prereqs="scm:find-connection"> <ant:mkdir dir="${maven.scm.patch.dir}"/> - <scm:diff url="${scmConnection}" workingDirectory="${basedir}" outputFile="${maven.scm.patch.dir}/${maven.scm.patch.file}" /> + <scm:diff url="${scmConnection}" workingDirectory="${basedir}" patchFile="${maven.scm.patch.dir}/${maven.scm.patch.file}" /> <ant:echo>Patch created in ${maven.scm.patch.dir}/${maven.scm.patch.file}</ant:echo> </goal> Modified: maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties?view=diff&rev=124986&p1=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties&r1=124985&p2=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties&r2=124986 ============================================================================== --- maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties (original) +++ maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties Wed Jan 12 12:05:27 2005 @@ -40,6 +40,6 @@ #=============== # The file name for the patch -maven.scm.cvs.patch.file=patch.txt +maven.scm.patch.file=patch.txt # The working directory for patching -maven.scm.cvs.patch.dir=${maven.build.dir}/scm/patch +maven.scm.patch.dir=${maven.build.dir}/scm/patch Modified: maven/maven-1/plugins/branches/scm-1.5-branch/project.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/project.xml?view=diff&rev=124986&p1=maven/maven-1/plugins/branches/scm-1.5-branch/project.xml&r1=124985&p2=maven/maven-1/plugins/branches/scm-1.5-branch/project.xml&r2=124986 ============================================================================== --- maven/maven-1/plugins/branches/scm-1.5-branch/project.xml (original) +++ maven/maven-1/plugins/branches/scm-1.5-branch/project.xml Wed Jan 12 12:05:27 2005 @@ -111,17 +111,10 @@ <artifactId>commons-jelly-tags-interaction</artifactId> <version>1.0</version> </dependency> - <!-- TODO: use merged container default --> - - <dependency> - <groupId>plexus</groupId> - <artifactId>plexus-container-api</artifactId> - <version>1.0-alpha-1-SNAPSHOT</version> - </dependency> <dependency> <groupId>plexus</groupId> <artifactId>plexus-container-default</artifactId> - <version>1.0-alpha-1-SNAPSHOT</version> + <version>1.0-alpha-2-SNAPSHOT</version> </dependency> <dependency> <groupId>plexus</groupId> Modified: maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java?view=diff&rev=124986&p1=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java&r1=124985&p2=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java&r2=124986 ============================================================================== --- maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java (original) +++ maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java Wed Jan 12 12:05:27 2005 @@ -22,6 +22,7 @@ import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.repository.ScmRepository; import org.codehaus.plexus.embed.Embedder; +import org.codehaus.plexus.util.FileUtils; import java.io.File; @@ -45,7 +46,7 @@ DiffScmResult result = scmManager.diff( repository, fileSet, null, null ); checkResult( result ); - // TODO: create patch file + FileUtils.fileWrite( patchFile, result.getPatch() ); } public void setPatchFile( String patchFile ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
