[pkg-java] r7689 - trunk/maven-doxia-tools/debian/patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-17 15:03:07 +0000 (Wed, 17 Dec 2008)
New Revision: 7689

Modified:
   trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff
Log:
fix the patch plexus-interpolation.diff


Modified: trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff
===================================================================
--- trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff	2008-12-17 14:44:19 UTC (rev 7688)
+++ trunk/maven-doxia-tools/debian/patches/plexus-interpolation.diff	2008-12-17 15:03:07 UTC (rev 7689)
@@ -1,17 +1,25 @@
-diff --git a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-index 841918e..4bdbb8a 100644
---- a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-+++ b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-@@ -45,6 +45,7 @@ import org.codehaus.plexus.logging.AbstractLogEnabled;
+Index: maven-doxia-tools-1.0.1/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+===================================================================
+--- maven-doxia-tools-1.0.1.orig/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java	2008-06-07 12:18:58.000000000 +0200
++++ maven-doxia-tools-1.0.1/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java	2008-12-17 15:54:28.000000000 +0100
+@@ -45,10 +45,11 @@
  import org.codehaus.plexus.util.IOUtil;
  import org.codehaus.plexus.util.ReaderFactory;
  import org.codehaus.plexus.util.StringUtils;
+-import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource;
+-import org.codehaus.plexus.util.interpolation.MapBasedValueSource;
+-import org.codehaus.plexus.util.interpolation.ObjectBasedValueSource;
+-import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator;
 +import org.codehaus.plexus.interpolation.InterpolationException;
- import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource;
- import org.codehaus.plexus.util.interpolation.MapBasedValueSource;
- import org.codehaus.plexus.util.interpolation.ObjectBasedValueSource;
-@@ -664,7 +665,15 @@ public class DefaultSiteTool
++import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
++import org.codehaus.plexus.interpolation.MapBasedValueSource;
++import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
++import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
+ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
  
+ import java.io.File;
+@@ -664,7 +665,15 @@
+ 
          interpolator.addValueSource( new MapBasedValueSource( project.getProperties() ) );
  
 -        siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );