Author: aheritier
Date: Mon Nov 26 10:27:42 2007
New Revision: 598374
URL: http://svn.apache.org/viewvc?rev=598374&view=rev
Log:
[MECLIPSE-356] RadLibCopier does not respect warSourceDirectory setting of
maven-war-plugin when copying dependencies
Submitted by: Siarhei Dudzin
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/WebContent/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/WebContent/WEB-INF/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/WebContent/WEB-INF/lib/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/WebContent/WEB-INF/lib/deps-direct-compile-1.0.jar
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadLibCopier.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/META-INF/application.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/pom.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadLibCopier.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadLibCopier.java?rev=598374&r1=598373&r2=598374&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadLibCopier.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadLibCopier.java
Mon Nov 26 10:27:42 2007
@@ -27,6 +27,8 @@
import org.apache.maven.plugin.eclipse.Messages;
import org.apache.maven.plugin.eclipse.writers.AbstractEclipseWriter;
import org.apache.maven.plugin.ide.IdeDependency;
+import org.apache.maven.plugin.ide.IdeUtils;
+import org.apache.maven.plugin.ide.JeeUtils;
import org.apache.maven.plugin.logging.Log;
import org.codehaus.plexus.util.FileUtils;
@@ -140,9 +142,17 @@
{
File basedir = config.getProject().getBasedir();
+ // Generating web content settings based on war plug-in
warSourceDirectory property
+ File warSourceDirectory =
+ new File( IdeUtils.getPluginSetting( config.getProject(),
JeeUtils.ARTIFACT_MAVEN_WAR_PLUGIN,
+ "warSourceDirectory",
//$NON-NLS-1$
+ "src/main/webapp" ) );
//$NON-NLS-1$
+ String webContentDir = IdeUtils.toRelativeAndFixSeparator(
config.getEclipseProjectDirectory(),
+ warSourceDirectory, false );
+
String srcMainWebappWebInfLibDirName =
- basedir.getAbsolutePath() + File.separatorChar + "src" +
File.separatorChar + "main" + File.separatorChar +
- "webapp" + File.separatorChar + "WEB-INF" + File.separatorChar
+ "lib";
+ basedir.getAbsolutePath() + File.separatorChar +
+ webContentDir + File.separatorChar + "WEB-INF" +
File.separatorChar + "lib";
File srcMainWebappWebInfLibDir = new File(
srcMainWebappWebInfLibDirName );
srcMainWebappWebInfLibDir.mkdirs();
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java?rev=598374&r1=598373&r2=598374&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
Mon Nov 26 10:27:42 2007
@@ -270,6 +270,31 @@
throws Exception
{
testProject( "project-rad-7", new Properties(), "rad-clean", "rad"
);
+
+ /*
+ * testing libs in web content directory
+ */
+ File basedir = getTestFile(
"target/test-classes/projects/project-rad-7" );
+ File pom = new File( basedir, "pom.xml" );
+ MavenProject project = readProject( pom );
+ File outputDir;
+ File projectOutputDir = basedir;
+
+ String outputDirPath =
+ IdeUtils.getPluginSetting( project,
"org.apache.maven.plugins:maven-eclipse-plugin", "outputDir", null );
+ if ( outputDirPath == null )
+ {
+ outputDir = basedir;
+ }
+ else
+ {
+ outputDir = new File( basedir, outputDirPath );
+ outputDir.mkdirs();
+ projectOutputDir = new File( outputDir, project.getArtifactId() );
+ }
+
+ compareDirectoryContent( basedir, projectOutputDir,
"WebContent/WEB-INF/lib/" );
+
}
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/META-INF/application.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/META-INF/application.xml?rev=598374&r1=598373&r2=598374&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/META-INF/application.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/META-INF/application.xml
Mon Nov 26 10:27:42 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/application_1_4.xsd";
xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; id="Application_ID"
version="1.4">
+<application id="Application_ID"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://java.sun.com/xml/ns/j2ee";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"; version="1.4">
<description/>
<display-name>project-rad-6</display-name>
-</application>
\ No newline at end of file
+</application>
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/WebContent/WEB-INF/lib/deps-direct-compile-1.0.jar
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/WebContent/WEB-INF/lib/deps-direct-compile-1.0.jar?rev=598374&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/WebContent/WEB-INF/lib/deps-direct-compile-1.0.jar
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/WebContent/WEB-INF/lib/deps-direct-compile-1.0.jar
Mon Nov 26 10:27:42 2007
@@ -0,0 +1 @@
+-testfile-not a valid jar-
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/pom.xml?rev=598374&r1=598373&r2=598374&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/pom.xml
Mon Nov 26 10:27:42 2007
@@ -7,6 +7,13 @@
<artifactId>project-rad-7</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>deps-direct-compile</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
