maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject svn commit: r689994 - in /maven/components/branches/maven-2.1.x: ./ maven-project/src/main/java/org/apache/maven/project/ maven-project/src/main/java/org/apache/maven/project/interpolation/ maven-project/src/main/java/org/apache/maven/project/path/ mav...
Date Thu, 28 Aug 2008 21:22:19 GMT
Author: jdcasey
Date: Thu Aug 28 14:22:19 2008
New Revision: 689994

URL: http://svn.apache.org/viewvc?rev=689994&view=rev
Log:
merge MNG-3731 and MNG-3729 to 2.1.x branch.

Modified:
    maven/components/branches/maven-2.1.x/   (props changed)
    maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
    maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
    maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
    maven/components/branches/maven-2.1.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
    maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
    maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
  (props changed)

Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 28 14:22:19 2008
@@ -1,3 +1,3 @@
 /maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882
 /maven/components/branches/maven-2.0.x:679552-679867
-/maven/components/branches/maven-2.1.0-RC:688883
+/maven/components/branches/maven-2.1.0-RC:688883,689695

Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=689994&r1=689993&r2=689994&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Thu Aug 28 14:22:19 2008
@@ -1888,8 +1888,11 @@
                                                                               getLogger().isDebugEnabled()
);
 
             project.preserveScriptSourceRoots( originalInterpolatedScriptSourceRoots );
-            project.setScriptSourceRoots( originalInterpolatedScriptSourceRoots == null ?
null
-                            : translateListOfPaths( originalInterpolatedScriptSourceRoots,
basedir ) );
+            
+            // TODO: MNG-3731
+            project.setScriptSourceRoots( originalInterpolatedScriptSourceRoots );
+//            project.setScriptSourceRoots( originalInterpolatedScriptSourceRoots == null
? null
+//                            : translateListOfPaths( originalInterpolatedScriptSourceRoots,
basedir ) );
 
             if ( basedir != null )
             {

Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java?rev=689994&r1=689993&r2=689994&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
(original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
Thu Aug 28 14:22:19 2008
@@ -20,8 +20,6 @@
 import org.codehaus.plexus.interpolation.StringSearchInterpolator;
 import org.codehaus.plexus.logging.Logger;
 
-import sun.security.action.GetIntegerAction;
-
 public class StringSearchModelInterpolator
     extends AbstractStringBasedModelInterpolator
 {

Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java?rev=689994&r1=689993&r2=689994&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
(original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
Thu Aug 28 14:22:19 2008
@@ -60,7 +60,8 @@
 
             build.setTestSourceDirectory( alignToBaseDirectory( build.getTestSourceDirectory(),
basedir ) );
 
-            build.setScriptSourceDirectory( alignToBaseDirectory( build.getScriptSourceDirectory(),
basedir ) );
+            // TODO: MNG-3731
+//            build.setScriptSourceDirectory( alignToBaseDirectory( build.getScriptSourceDirectory(),
basedir ) );
 
             for ( Iterator i = build.getResources().iterator(); i.hasNext(); )
             {

Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml?rev=689994&r1=689993&r2=689994&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
(original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
Thu Aug 28 14:22:19 2008
@@ -55,7 +55,8 @@
     <finalName>${project.artifactId}-${project.version}</finalName>
     <testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
     <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
-    <scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
+    <!-- TODO: MNG-3731 maven-plugin-tools-api < 2.4.4 expect this to be relative...
-->
+    <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
     <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
     <resources>
       <resource>

Modified: maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java?rev=689994&r1=689993&r2=689994&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
(original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
Thu Aug 28 14:22:19 2008
@@ -68,8 +68,10 @@
                     build.getSourceDirectory().startsWith( basepath ) );
         assertTrue( build.getTestSourceDirectory() + " doesn't start with base-path: " +
basepath,
                     build.getTestSourceDirectory().startsWith( basepath ) );
-        assertTrue( build.getScriptSourceDirectory() + " doesn't start with base-path: "
+ basepath,
-                    build.getScriptSourceDirectory().startsWith( basepath ) );
+        
+        // TODO: MNG-3731
+//        assertTrue( build.getScriptSourceDirectory() + " doesn't start with base-path:
" + basepath,
+//                    build.getScriptSourceDirectory().startsWith( basepath ) );
 
         List plugins = build.getPlugins();
         assertNotNull( plugins );
@@ -561,7 +563,8 @@
         assertEquals( "First test source root should be absolute ref to src/test/java", new
File( basedir, "src/test/java" ).getAbsolutePath(), project.getTestCompileSourceRoots().get(
0 ) );
         
         assertEquals( "Before adding source roots, project should contain one script source
root", 1, project.getScriptSourceRoots().size() );
-        assertEquals( "First script source root should be absolute ref to src/main/scripts",
new File( basedir, "src/main/scripts" ).getAbsolutePath(), project.getScriptSourceRoots().get(
0 ) );
+        // TODO: MNG-3731
+//        assertEquals( "First script source root should be absolute ref to src/main/scripts",
new File( basedir, "src/main/scripts" ).getAbsolutePath(), project.getScriptSourceRoots().get(
0 ) );
 
         project.addCompileSourceRoot( new File( basedir, "target/generated/src/main/java"
).getAbsolutePath() );
         project.addTestCompileSourceRoot( new File( basedir, "target/generated/src/test/java"
).getAbsolutePath() );
@@ -583,8 +586,10 @@
         assertEquals( "Second test source root should be absolute ref to target/generated/src/test/java",
new File( basedir, "target/generated/src/test/java" ).getAbsolutePath(), project.getTestCompileSourceRoots().get(
1 ) );
         
         assertEquals( "After adding source roots and transitioning, project should contain
two script source roots", 2, project.getScriptSourceRoots().size() );
-        assertEquals( "First script source root should be absolute ref to src/main/scripts",
new File( basedir, "src/main/scripts" ).getAbsolutePath(), project.getScriptSourceRoots().get(
0 ) );
-        assertEquals( "Second script source root should be absolute ref to target/generated/src/main/scripts",
new File( basedir, "target/generated/src/main/scripts" ).getAbsolutePath(), project.getScriptSourceRoots().get(
1 ) );
+        
+        // TODO: MNG-3731
+//        assertEquals( "First script source root should be absolute ref to src/main/scripts",
new File( basedir, "src/main/scripts" ).getAbsolutePath(), project.getScriptSourceRoots().get(
0 ) );
+//        assertEquals( "Second script source root should be absolute ref to target/generated/src/main/scripts",
new File( basedir, "target/generated/src/main/scripts" ).getAbsolutePath(), project.getScriptSourceRoots().get(
1 ) );
     }
 
     public void testShouldInterpolatePluginLevelDependency()

Propchange: maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 28 14:22:19 2008
@@ -1 +1 @@
-/maven/components/branches/maven-2.1.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688883
+/maven/components/branches/maven-2.1.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688883,689695



Mime
View raw message