svn commit: r1176750 - /maven/maven-3/trunk/.gitignore

2011-09-28 Thread olamy
Author: olamy
Date: Wed Sep 28 06:46:02 2011
New Revision: 1176750

URL: http://svn.apache.org/viewvc?rev=1176750view=rev
Log:
add .DS_Store in .gitignore

Modified:
maven/maven-3/trunk/.gitignore

Modified: maven/maven-3/trunk/.gitignore
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/.gitignore?rev=1176750r1=1176749r2=1176750view=diff
==
--- maven/maven-3/trunk/.gitignore (original)
+++ maven/maven-3/trunk/.gitignore Wed Sep 28 06:46:02 2011
@@ -7,3 +7,5 @@ bin/
 # Intellij
 *.ipr
 *.iml
+
+.DS_Store




svn commit: r1176777 - /maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java

2011-09-28 Thread ltheussl
Author: ltheussl
Date: Wed Sep 28 08:15:06 2011
New Revision: 1176777

URL: http://svn.apache.org/viewvc?rev=1176777view=rev
Log:
add some non-intuitive test results

Modified:

maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java

Modified: 
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java?rev=1176777r1=1176776r2=1176777view=diff
==
--- 
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java
 (original)
+++ 
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java
 Wed Sep 28 08:15:06 2011
@@ -35,14 +35,22 @@ public class DefaultSiteToolTest
 {
 assertEquals( null, DefaultSiteTool.getNormalizedPath( null ) );
 assertEquals( , DefaultSiteTool.getNormalizedPath(  ) );
+assertEquals( , DefaultSiteTool.getNormalizedPath( . ) );
+assertEquals( , DefaultSiteTool.getNormalizedPath( ./ ) );
 assertEquals( foo, DefaultSiteTool.getNormalizedPath( foo ) );
 assertEquals( foo/bar, DefaultSiteTool.getNormalizedPath( foo/bar 
) );
 assertEquals( foo/bar, DefaultSiteTool.getNormalizedPath( foo\\bar 
) );
 assertEquals( foo/bar, DefaultSiteTool.getNormalizedPath( 
foo/./bar ) );
+assertEquals( foo/bar, DefaultSiteTool.getNormalizedPath( foo//bar 
) );
+assertEquals( , DefaultSiteTool.getNormalizedPath( foo/../ ) );
+assertEquals( , DefaultSiteTool.getNormalizedPath( foo/.. ) );
 assertEquals( bar, DefaultSiteTool.getNormalizedPath( foo/../bar ) 
);
 assertEquals( foo, DefaultSiteTool.getNormalizedPath( ./foo ) );
 assertEquals( ../foo, DefaultSiteTool.getNormalizedPath( ../foo ) 
);
 assertEquals( ../../foo, DefaultSiteTool.getNormalizedPath( 
../../foo ) );
 assertEquals( index.html, DefaultSiteTool.getNormalizedPath( 
./foo/../index.html ) );
+
+// note: space is preserved and double slash is removed!
+assertEquals( file:/Documents and Settings/, 
DefaultSiteTool.getNormalizedPath( file://Documents and Settings/ ) );
 }
 }




svn commit: r1176886 - in /maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins: org.apache.maven.doxia.ide.eclipse.apt.ui/ org.apache.maven.doxia.ide.eclipse.confluence.ui/ org.apache.maven.do

2011-09-28 Thread hboutemy
Author: hboutemy
Date: Wed Sep 28 13:56:45 2011
New Revision: 1176886

URL: http://svn.apache.org/viewvc?rev=1176886view=rev
Log:
.xxx.vm extensions are not recognized: reduced to vm

Modified:

maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/plugin.xml

maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/plugin.xml

maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/plugin.xml

maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.fml.ui/plugin.xml

maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.twiki.ui/plugin.xml

maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xdoc.ui/plugin.xml

maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.xhtml.ui/plugin.xml

Modified: 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/plugin.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/plugin.xml?rev=1176886r1=1176885r2=1176886view=diff
==
--- 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/plugin.xml
 (original)
+++ 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.apt.ui/plugin.xml
 Wed Sep 28 13:56:45 2011
@@ -26,7 +26,7 @@ under the License.
  point=org.eclipse.ui.editors
   editor
 name=%editor.name
-extensions=apt,apt.vm
+extensions=apt,vm
 icon=icons/doxia.gif
 
contributorClass=org.apache.maven.doxia.ide.eclipse.apt.ui.editor.AptEditorContributor
 class=org.apache.maven.doxia.ide.eclipse.apt.ui.editor.AptEditor

Modified: 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/plugin.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/plugin.xml?rev=1176886r1=1176885r2=1176886view=diff
==
--- 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/plugin.xml
 (original)
+++ 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.confluence.ui/plugin.xml
 Wed Sep 28 13:56:45 2011
@@ -27,7 +27,7 @@ under the License.
  point=org.eclipse.ui.editors
   editor
 name=%editor.name
-extensions=confluence,confluence.vm
+extensions=confluence,vm
 icon=icons/doxia.gif
 
contributorClass=org.apache.maven.doxia.ide.eclipse.confluence.ui.editor.ConfluenceEditorContributor
 
class=org.apache.maven.doxia.ide.eclipse.confluence.ui.editor.ConfluenceEditor

Modified: 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/plugin.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/plugin.xml?rev=1176886r1=1176885r2=1176886view=diff
==
--- 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/plugin.xml
 (original)
+++ 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.docbook.ui/plugin.xml
 Wed Sep 28 13:56:45 2011
@@ -26,7 +26,7 @@ under the License.
  point=org.eclipse.ui.editors
   editor
 name=%editor.name
-extensions=docbook,xml,docbook.vm,xml.vm
+extensions=docbook,xml,vm
 icon=icons/doxia.gif
 
contributorClass=org.apache.maven.doxia.ide.eclipse.docbook.ui.editor.DocbookEditorContributor
 
class=org.apache.maven.doxia.ide.eclipse.docbook.ui.editor.DocbookEditor

Modified: 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.fml.ui/plugin.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.fml.ui/plugin.xml?rev=1176886r1=1176885r2=1176886view=diff
==
--- 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.fml.ui/plugin.xml
 (original)
+++ 

svn commit: r1177032 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt

2011-09-28 Thread dennisl
Author: dennisl
Date: Wed Sep 28 19:55:13 2011
New Revision: 1177032

URL: http://svn.apache.org/viewvc?rev=1177032view=rev
Log:
Fix garbage characters.

Modified:

maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt

Modified: 
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt?rev=1177032r1=1177031r2=1177032view=diff
==
--- 
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt 
(original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt 
Wed Sep 28 19:55:13 2011
@@ -233,7 +233,7 @@ Configuring the Site Descriptor
 * Inject xhtml into \head\
 
   You can inject some xhtml into the generated \head\ element of each page 
by adding a head element
-  to the body element of your project’s site descriptor. The following 
example adds some javascript:
+  to the body element of your project's site descriptor. The following example 
adds some javascript:
 
 +-+
 project
@@ -252,7 +252,7 @@ Configuring the Site Descriptor
 * Links
 
   To add links below your site logo, just add a links element to the body 
element of the site descriptor.
-  Each item in the links element will be rendered as a link in a bar directly 
below your project’s logo.
+  Each item in the links element will be rendered as a link in a bar directly 
below your project's logo.
 
 +-+
 project
@@ -316,7 +316,7 @@ Configuring the Site Descriptor
 
   There is also a dummy \custom\ element then can be used to specify some 
arbitrary content.
   Note that you need to write your own velocity template to make use of this 
element,
-  it is ignored by the default velocity template used by the site plugin.
+  it is ignored by the default Velocity template used by the Site Plugin.
 
 +-+
 project




svn commit: r1177047 - /maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper

2011-09-28 Thread hboutemy
Author: hboutemy
Date: Wed Sep 28 20:30:16 2011
New Revision: 1177047

URL: http://svn.apache.org/viewvc?rev=1177047view=rev
Log:
code formatting

Modified:

maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java

Modified: 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java?rev=1177047r1=1177046r2=1177047view=diff
==
--- 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java
 (original)
+++ 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java
 Wed Sep 28 20:30:16 2011
@@ -134,7 +134,9 @@ public class DoxiaWrapper
 }
 catch ( UnsupportedFormatException e )
 {
-String msg = Doxia Unsupported Format Exception:  + ( 
StringUtils.isEmpty( e.getMessage() ) ? e.getClass().getName() : e.getMessage() 
);
+String msg =
+Doxia Unsupported Format Exception: 
++ ( StringUtils.isEmpty( e.getMessage() ) ? 
e.getClass().getName() : e.getMessage() );
 CommonPlugin.logError( msg, e, true );
 
 return addGenericMarker( file, msg );
@@ -145,7 +147,9 @@ public class DoxiaWrapper
 }
 catch ( Throwable t )
 {
-String msg = Doxia Converter Throwable:  + ( 
StringUtils.isEmpty( t.getMessage() ) ? t.getClass().getName() : t.getMessage() 
);
+String msg =
+Doxia Converter Throwable: 
++ ( StringUtils.isEmpty( t.getMessage() ) ? 
t.getClass().getName() : t.getMessage() );
 CommonPlugin.logError( msg, t, true );
 
 return addGenericMarker( file, msg );
@@ -162,7 +166,9 @@ public class DoxiaWrapper
 }
 catch ( CoreException ce )
 {
-String msgCe = CoreException:  + ( StringUtils.isEmpty( 
ce.getMessage() ) ? ce.getClass().getName() : ce.getMessage() );
+String msgCe =
+CoreException: 
++ ( StringUtils.isEmpty( ce.getMessage() ) ? 
ce.getClass().getName() : ce.getMessage() );
 CommonPlugin.logError( msgCe, ce, true );
 
 return msgCe;
@@ -229,17 +235,21 @@ public class DoxiaWrapper
 
 private static String addConverterMarker( IFile file, ConverterException e 
)
 {
-String msg = Doxia Converter Exception:  + ( StringUtils.isEmpty( 
e.getMessage() ) ? e.getClass().getName() : e.getMessage() );
+String msg =
+Doxia Converter Exception: 
++ ( StringUtils.isEmpty( e.getMessage() ) ? 
e.getClass().getName() : e.getMessage() );
 
 boolean isFileNotFoundException = false;
 Throwable cause = e.getCause();
-while ( cause != null)
+while ( cause != null )
 {
 // from MacroExecutionException
-if ( cause.getClass().equals( FileNotFoundException.class ))
+if ( cause.getClass().equals( FileNotFoundException.class ) )
 {
 isFileNotFoundException = true;
-msg = Doxia Converter Exception:  + ( StringUtils.isEmpty( 
cause.getMessage() ) ? cause.getClass().getName() : cause.getMessage() );
+msg =
+Doxia Converter Exception: 
++ ( StringUtils.isEmpty( cause.getMessage() ) ? 
cause.getClass().getName() : cause.getMessage() );
 break;
 }
 cause = cause.getCause();
@@ -291,7 +301,7 @@ public class DoxiaWrapper
 }
 }
 
-private static String interpolateBasedir(IFile file, String content )
+private static String interpolateBasedir( IFile file, String content )
 {
 final MapString, String m = new HashMapString, String();
 m.put( basedir, 
file.getProject().getLocation().toFile().getAbsolutePath() );




svn commit: r1177052 - /maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper

2011-09-28 Thread hboutemy
Author: hboutemy
Date: Wed Sep 28 20:38:14 2011
New Revision: 1177052

URL: http://svn.apache.org/viewvc?rev=1177052view=rev
Log:
code simplification

Modified:

maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java

Modified: 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java?rev=1177052r1=1177051r2=1177052view=diff
==
--- 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java
 (original)
+++ 
maven/doxia/doxia-ide/trunk/eclipse/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/java/org/apache/maven/doxia/ide/eclipse/common/ui/DoxiaWrapper.java
 Wed Sep 28 20:38:14 2011
@@ -90,15 +90,16 @@ public class DoxiaWrapper
 }
 catch ( IOException e )
 {
-String msg = IOException:  + e.getMessage();
+String msg = getMessage( IOException: , e );
 CommonPlugin.logError( msg, e, true );
 return addGenericMarker( file, msg );
 }
 catch ( CoreException ce )
 {
-CommonPlugin.logError( CoreException:  + ce.getMessage(), ce, 
true );
+String msgCe = getMessage( CoreException: , ce );
+CommonPlugin.logError( msgCe, ce, true );
 
-return CoreException:  + ce.getMessage();
+return msgCe;
 }
 finally
 {
@@ -134,9 +135,7 @@ public class DoxiaWrapper
 }
 catch ( UnsupportedFormatException e )
 {
-String msg =
-Doxia Unsupported Format Exception: 
-+ ( StringUtils.isEmpty( e.getMessage() ) ? 
e.getClass().getName() : e.getMessage() );
+String msg = getMessage( Doxia Unsupported Format Exception: , e 
);
 CommonPlugin.logError( msg, e, true );
 
 return addGenericMarker( file, msg );
@@ -147,9 +146,7 @@ public class DoxiaWrapper
 }
 catch ( Throwable t )
 {
-String msg =
-Doxia Converter Throwable: 
-+ ( StringUtils.isEmpty( t.getMessage() ) ? 
t.getClass().getName() : t.getMessage() );
+String msg = getMessage( Doxia Converter Throwable: , t );
 CommonPlugin.logError( msg, t, true );
 
 return addGenericMarker( file, msg );
@@ -166,9 +163,7 @@ public class DoxiaWrapper
 }
 catch ( CoreException ce )
 {
-String msgCe =
-CoreException: 
-+ ( StringUtils.isEmpty( ce.getMessage() ) ? 
ce.getClass().getName() : ce.getMessage() );
+String msgCe = getMessage( CoreException: , ce );
 CommonPlugin.logError( msgCe, ce, true );
 
 return msgCe;
@@ -226,18 +221,16 @@ public class DoxiaWrapper
 }
 catch ( CoreException ce )
 {
-String msgCe = ( StringUtils.isEmpty( ce.getMessage() ) ? 
ce.getClass().getName() : ce.getMessage() );
-CommonPlugin.logError( CoreException:  + msgCe, ce, true );
+String msgCe = getMessage( CoreException: , ce );
+CommonPlugin.logError( msgCe, ce, true );
 
-return CoreException:  + msgCe;
+return msgCe;
 }
 }
 
 private static String addConverterMarker( IFile file, ConverterException e 
)
 {
-String msg =
-Doxia Converter Exception: 
-+ ( StringUtils.isEmpty( e.getMessage() ) ? 
e.getClass().getName() : e.getMessage() );
+String msg = getMessage( Doxia Converter Exception: , e );
 
 boolean isFileNotFoundException = false;
 Throwable cause = e.getCause();
@@ -247,9 +240,7 @@ public class DoxiaWrapper
 if ( cause.getClass().equals( FileNotFoundException.class ) )
 {
 isFileNotFoundException = true;
-msg =
-Doxia Converter Exception: 
-+ ( StringUtils.isEmpty( cause.getMessage() ) ? 
cause.getClass().getName() : cause.getMessage() );
+msg = getMessage( Doxia Converter Exception: , cause );
 break;
 }
 cause = cause.getCause();
@@ -270,13 +261,13 @@ public class DoxiaWrapper
 }
 catch ( CoreException ce )
 {
-String msgCe = ( StringUtils.isEmpty( ce.getMessage() 

svn commit: r1177063 - /maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java

2011-09-28 Thread hboutemy
Author: hboutemy
Date: Wed Sep 28 21:08:36 2011
New Revision: 1177063

URL: http://svn.apache.org/viewvc?rev=1177063view=rev
Log:
[MSHARED-47] added unit test to show wrong xml-apis dependency analysis

Modified:

maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java

Modified: 
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java?rev=1177063r1=1177062r2=1177063view=diff
==
--- 
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
 (original)
+++ 
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
 Wed Sep 28 21:08:36 2011
@@ -163,6 +163,25 @@ public class DefaultProjectDependencyAna
 assertEquals( expectedAnalysis, actualAnalysis );
 }
 
+public void testJarWithXxmlTransitiveDependency()
+throws TestToolsException, ProjectDependencyAnalyzerException
+{
+compileProject( jarWithXercesDependency/pom.xml );
+
+MavenProject project = getProject( jarWithXercesDependency/pom.xml );
+
+ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project );
+
+Artifact jdom = createArtifact( dom4j, dom4j, jar, 1.6.1, 
compile );
+SetArtifact usedDeclaredArtifacts = Collections.singleton( jdom );
+
+ProjectDependencyAnalysis expectedAnalysis =
+new ProjectDependencyAnalysis( usedDeclaredArtifacts, null, null );
+
+// MSHARED-47: 
usedUndeclaredArtifacts=[xml-apis:xml-apis:jar:1.0.b2:compile]
+//assertEquals( expectedAnalysis, actualAnalysis );
+}
+
 // private methods 
 
 private void compileProject( String pomPath )




svn commit: r1177064 - /maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java

2011-09-28 Thread hboutemy
Author: hboutemy
Date: Wed Sep 28 21:12:41 2011
New Revision: 1177064

URL: http://svn.apache.org/viewvc?rev=1177064view=rev
Log:
fixed typo

Modified:

maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java

Modified: 
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java?rev=1177064r1=1177063r2=1177064view=diff
==
--- 
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
 (original)
+++ 
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
 Wed Sep 28 21:12:41 2011
@@ -166,9 +166,9 @@ public class DefaultProjectDependencyAna
 public void testJarWithXxmlTransitiveDependency()
 throws TestToolsException, ProjectDependencyAnalyzerException
 {
-compileProject( jarWithXercesDependency/pom.xml );
+compileProject( jarWithXmlTransitiveDependency/pom.xml );
 
-MavenProject project = getProject( jarWithXercesDependency/pom.xml );
+MavenProject project = getProject( 
jarWithXmlTransitiveDependency/pom.xml );
 
 ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project );
 




svn commit: r1177071 - /maven/plugins/trunk/maven-javadoc-plugin/pom.xml

2011-09-28 Thread rfscholte
Author: rfscholte
Date: Wed Sep 28 21:37:12 2011
New Revision: 1177071

URL: http://svn.apache.org/viewvc?rev=1177071view=rev
Log:
Add 'nl' (dutch) to l10n-maven-plugin

Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml

Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1177071r1=1177070r2=1177071view=diff
==
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Wed Sep 28 21:37:12 2011
@@ -403,6 +403,7 @@ under the License.
   locales
 localede/locale
 localefr/locale
+localenl/locale
 localesv/locale
   /locales
 /configuration