maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aherit...@apache.org
Subject svn commit: r617639 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ test/java/org/apache/maven/plugin/eclipse/ test/resources/m2repo/eclipsetest/checkstyle-config/ test/resources/m2repo/eclipsetest/checkst...
Date Fri, 01 Feb 2008 20:50:55 GMT
Author: aheritier
Date: Fri Feb  1 12:50:51 2008
New Revision: 617639

URL: http://svn.apache.org/viewvc?rev=617639&view=rev
Log:
MECLIPSE-219 : Allow file contents to be obtained from url
Add testcase and documentation

Added:
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/checkstyle-config/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/checkstyle-config/1.0/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/checkstyle-config/1.0/checkstyle-config-1.0.jar
  (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/checkstyle-config/maven-metadata-local.xml
  (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/   (with
props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/eclipse-settings/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/eclipse-settings/checkstyle-config.xml
  (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.checkstyle
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.checkstyle2
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.classpath
  (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.project
  (with props)
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/pom.xml
  (with props)
Modified:
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
    maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=617639&r1=617638&r2=617639&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Fri Feb  1 12:50:51 2008
@@ -73,7 +73,7 @@
  * </ul>
  * If this goal is run on a multiproject root, dependencies between modules will be configured
as direct project
  * dependencies in Eclipse (unless <code>useProjectReferences</code> is set to
<code>false</code>).
- *
+ * 
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @author <a href="mailto:fgiust@apache.org">Fabrizio Giustina</a>
  * @version $Id$
@@ -130,49 +130,49 @@
     /**
      * List of eclipse project natures. By default the <code>org.eclipse.jdt.core.javanature</code>
nature plus the
      * needed WTP natures are added. Natures added using this property <strong>replace</strong>
the default list.
-     *
+     * 
      * <pre>
      * &lt;projectnatures&gt;
      *    &lt;projectnature&gt;org.eclipse.jdt.core.javanature&lt;/projectnature&gt;
      *    &lt;projectnature&gt;org.eclipse.wst.common.modulecore.ModuleCoreNature&lt;/projectnature&gt;
      * &lt;/projectnatures&gt;
      * </pre>
-     *
+     * 
      * @parameter
      */
     private List projectnatures;
 
     /**
-     * List of artifact to exclude from eclipse classpath, beeing provided by some
-     * eclipse classPathContainer [MECLIPSE-79]
-     *
-	 * @since 2.5
+     * List of artifact to exclude from eclipse classpath, beeing provided by some eclipse
classPathContainer
+     * [MECLIPSE-79]
+     * 
+     * @since 2.5
      * @parameter
      */
     private List excludes;
 
     /**
      * List of eclipse project natures to be added to the default ones.
-     *
+     * 
      * <pre>
      * &lt;additionalProjectnatures&gt;
      *    &lt;projectnature&gt;org.springframework.ide.eclipse.core.springnature&lt;/projectnature&gt;
      * &lt;/additionalProjectnatures&gt;
      * </pre>
-     *
+     * 
      * @parameter
      */
     private List additionalProjectnatures;
 
     /**
      * List of eclipse project facets to be added to the default ones.
-     *
+     * 
      * <pre>
      * &lt;additionalProjectFacets&gt;
      *    &lt;jst.jsf&gt;1.1&lt;jst.jsf/&gt;
      * &lt;/additionalProjectFacets&gt;
      * </pre>
-     *
+     * 
      * @parameter
      */
     private Map additionalProjectFacets;
@@ -182,7 +182,7 @@
      * needed WTP builders are added. If you specify any configuration for this parameter,
only those buildcommands
      * specified will be used; the defaults won't be added. Use the <code>additionalBuildCommands</code>
parameter for
      * that. Configuration example: Old style:
-     *
+     * 
      * <pre>
      * &lt;buildcommands&gt;
      *    &lt;buildcommand&gt;org.eclipse.wst.common.modulecore.ComponentStructuralBuilder&lt;/buildcommand&gt;
@@ -190,24 +190,24 @@
      *    &lt;buildcommand&gt;org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver&lt;/buildcommand&gt;
      * &lt;/buildcommands&gt;
      * </pre>
-     *
+     * 
      * For new style, see <code>additionalBuildCommands</code>.
-     *
+     * 
      * @parameter
      */
     private List buildcommands;
 
     /**
      * List of eclipse build commands to be added to the default ones. Old style:
-     *
+     * 
      * <pre>
      * &lt;additionalBuildcommands&gt;
      *    &lt;buildcommand&gt;org.springframework.ide.eclipse.core.springbuilder&lt;/buildcommand&gt;
      * &lt;/additionalBuildcommands&gt;
      * </pre>
-     *
+     * 
      * New style:
-     *
+     * 
      * <pre>
      * &lt;additionalBuildcommands&gt;
      *    &lt;buildCommand&gt;
@@ -219,10 +219,10 @@
      *    &lt;/buildCommand&gt;
      * &lt;/additionalBuildcommands&gt;
      * </pre>
-     *
+     * 
      * Note the difference between <code>build<strong>c</strong>ommand</code>
and
      * <code>build<strong>C</strong>ommand</code>. You can mix and
match old and new-style configuration entries.
-     *
+     * 
      * @parameter
      */
     private List additionalBuildcommands;
@@ -230,7 +230,7 @@
     /**
      * List of container classpath entries. By default the <code>org.eclipse.jdt.launching.JRE_CONTAINER</code>
      * classpath container is added. Configuration example:
-     *
+     * 
      * <pre>
      * &lt;classpathContainers&gt;
      *    &lt;classpathContainer&gt;org.eclipse.jdt.launching.JRE_CONTAINER&lt;/classpathContainer&gt;
@@ -238,14 +238,14 @@
      *    &lt;classpathContainer&gt;org.eclipse.jst.j2ee.internal.web.container/artifact&lt;/classpathContainer&gt;
      * &lt;/classpathContainers&gt;
      * </pre>
-     *
+     * 
      * @parameter
      */
     private List classpathContainers;
 
     /**
      * Enables/disables the downloading of source attachments. Defaults to false. DEPRECATED
- use downloadSources
-     *
+     * 
      * @parameter expression="${eclipse.downloadSources}"
      * @deprecated use downloadSources
      */
@@ -253,7 +253,7 @@
 
     /**
      * Eclipse workspace directory.
-     *
+     * 
      * @parameter expression="${eclipse.projectDir}" alias="outputDir"
      */
     private File eclipseProjectDir;
@@ -261,7 +261,7 @@
     /**
      * When set to false, the plugin will not create sub-projects and instead reference those
sub-projects using the
      * installed package in the local repository
-     *
+     * 
      * @parameter expression="${eclipse.useProjectReferences}" default-value="true"
      * @required
      */
@@ -269,7 +269,7 @@
 
     /**
      * The default output directory
-     *
+     * 
      * @parameter expression="${outputDirectory}" alias="outputDirectory"
      *            default-value="${project.build.outputDirectory}"
      * @required
@@ -279,14 +279,14 @@
     /**
      * The version of WTP for which configuration files will be generated. The default value
is "none" (don't generate
      * WTP configuration), supported versions are "R7", "1.0", and "1.5"
-     *
+     * 
      * @parameter expression="${wtpversion}" default-value="none"
      */
     private String wtpversion;
 
     /**
      * JEE context name of the WTP module. ( ex. WEB context name ).
-     *
+     * 
      * @parameter expression="${wtpContextName}"
      */
     private String wtpContextName;
@@ -296,14 +296,14 @@
      * Additionally it copies all libraries to a project local directory and references them
instead of referencing the
      * files in the local Maven repository. It also ensured that the "Bundle-Classpath" in
META-INF/MANIFEST.MF is
      * synchronized.
-     *
+     * 
      * @parameter expression="${eclipse.pde}" default-value="false"
      */
     private boolean pde;
 
     /**
      * The relative path of the manifest file
-     *
+     * 
      * @parameter expression="${eclipse.manifest}" default-value="${basedir}/META-INF/MANIFEST.MF"
      */
     private File manifest;
@@ -311,9 +311,13 @@
     /**
      * Allow to configure additional generic configuration files for eclipse that will be
written out to disk when
      * running eclipse:eclipse. FOr each file you can specify the name and the text content.
-     *
+     * 
      * <pre>
-     * &lt;additionalConfig&gt;
+     * &lt;plugin&gt;
+     *  &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
+     *  &lt;artifactId&gt;maven-eclipse-plugin&lt;/artifactId&gt;
+     *  &lt;configuration&gt;
+     *   &lt;additionalConfig&gt;
      *    &lt;file&gt;
      *      &lt;name&gt;.checkstyle&lt;/name&gt;
      *      &lt;content&gt;
@@ -325,9 +329,52 @@
      *        &lt;/fileset-config&gt;]]&gt;
      *      &lt;/content&gt;
      *    &lt;/file&gt;
-     * &lt;/additionalConfig&gt;
+     *   &lt;/additionalConfig&gt;
+     *  &lt;/configuration&gt;
+     * &lt;/plugin&gt;
      * </pre>
-     *
+     * 
+     * Instead of the content you can also define (from version 2.5) an url to download the
file :
+     * 
+     * <pre>
+     * &lt;plugin&gt;
+     *  &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
+     *  &lt;artifactId&gt;maven-eclipse-plugin&lt;/artifactId&gt;
+     *  &lt;configuration&gt;
+     *   &lt;additionalConfig&gt;
+     *    &lt;file&gt;
+     *      &lt;name&gt;.checkstyle&lt;/name&gt;
+     *      &lt;url&gt;http://some.place.org/path/to/file&lt;/url&gt;
+     *    &lt;/file&gt;
+     *   &lt;/additionalConfig&gt;
+     *  &lt;/configuration&gt;
+     * </pre>
+     * 
+     * or a location :
+     * 
+     * <pre>
+     * &lt;plugin&gt;
+     *  &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;
+     *  &lt;artifactId&gt;maven-eclipse-plugin&lt;/artifactId&gt;
+     *  &lt;configuration&gt;
+     *   &lt;additionalConfig&gt;
+     *    &lt;file&gt;
+     *     &lt;name&gt;.checkstyle&lt;/name&gt;
+     *     &lt;location&gt;/checkstyle-config.xml&lt;/location&gt;
+     *    &lt;/file&gt;
+     *   &lt;/additionalConfig&gt;
+     *  &lt;/configuration&gt;
+     *  &lt;dependencies&gt;
+     *   &lt;!-- The file defined in the location is stored in this dependency --&gt;
+     *   &lt;dependency&gt;
+     *    &lt;groupId&gt;eclipsetest&lt;/groupId&gt;
+     *    &lt;artifactId&gt;checkstyle-config&lt;/artifactId&gt;
+     *    &lt;version&gt;1.0&lt;/version&gt;
+     *   &lt;/dependency&gt;
+     *  &lt;/dependencies&gt;
+     * &lt;/plugin&gt;
+     * </pre>
+     * 
      * @parameter
      */
     private EclipseConfigFile[] additionalConfig;
@@ -335,7 +382,7 @@
     /**
      * If set to <code>true</code>, the version number of the artifact is appended
to the name of the generated
      * Eclipse project. See projectNameTemplate for other options.
-     *
+     * 
      * @parameter expression="${eclipse.addVersionToProjectName}" default-value="false"
      */
     private boolean addVersionToProjectName;
@@ -343,7 +390,7 @@
     /**
      * If set to <code>true</code>, the groupId of the artifact is appended to
the name of the generated Eclipse
      * project. See projectNameTemplate for other options.
-     *
+     * 
      * @parameter expression="${eclipse.addGroupIdToProjectName}" default-value="false"
      */
     private boolean addGroupIdToProjectName;
@@ -352,7 +399,7 @@
      * Allows configuring the name of the eclipse projects. This property if set wins over
addVersionToProjectName and
      * addGroupIdToProjectName You can use <code>[groupId]</code>, <code>[artifactId]</code>
and
      * <code>[version]</code> variables. eg. <code>[groupId].[artifactId]-[version]</code>
-     *
+     * 
      * @parameter expression="${eclipse.projectNameTemplate}"
      */
     private String projectNameTemplate;
@@ -369,21 +416,21 @@
 
     /**
      * Must the manifest files be written for java projects so that that the jee classpath
for wtp is correct.
-     *
+     * 
      * @parameter expression="${eclipse.wtpmanifest}" default-value="false"
      */
     private boolean wtpmanifest;
 
     /**
      * Must the application files be written for ear projects in a separate directory.
-     *
+     * 
      * @parameter expression="${eclipse.wtpapplicationxml}" default-value="false"
      */
     private boolean wtpapplicationxml;
 
     /**
      * What WTP defined server to use for deployment informations.
-     *
+     * 
      * @parameter expression="${eclipse.wtpdefaultserver}"
      */
     private String wtpdefaultserver;
@@ -411,7 +458,7 @@
 
     /**
      * Getter for <code>buildcommands</code>.
-     *
+     * 
      * @return Returns the buildcommands.
      */
     public List getBuildcommands()
@@ -421,7 +468,7 @@
 
     /**
      * Setter for <code>buildcommands</code>.
-     *
+     * 
      * @param buildcommands The buildcommands to set.
      */
     public void setBuildcommands( List buildcommands )
@@ -431,7 +478,7 @@
 
     /**
      * Getter for <code>buildOutputDirectory</code>.
-     *
+     * 
      * @return Returns the buildOutputDirectory.
      */
     public File getBuildOutputDirectory()
@@ -441,7 +488,7 @@
 
     /**
      * Setter for <code>buildOutputDirectory</code>.
-     *
+     * 
      * @param buildOutputDirectory The buildOutputDirectory to set.
      */
     public void setBuildOutputDirectory( File buildOutputDirectory )
@@ -451,7 +498,7 @@
 
     /**
      * Getter for <code>classpathContainers</code>.
-     *
+     * 
      * @return Returns the classpathContainers.
      */
     public List getClasspathContainers()
@@ -461,7 +508,7 @@
 
     /**
      * Setter for <code>classpathContainers</code>.
-     *
+     * 
      * @param classpathContainers The classpathContainers to set.
      */
     public void setClasspathContainers( List classpathContainers )
@@ -471,7 +518,7 @@
 
     /**
      * Getter for <code>eclipseProjectDir</code>.
-     *
+     * 
      * @return Returns the eclipseProjectDir.
      */
     public File getEclipseProjectDir()
@@ -481,7 +528,7 @@
 
     /**
      * Setter for <code>eclipseProjectDir</code>.
-     *
+     * 
      * @param eclipseProjectDir The eclipseProjectDir to set.
      */
     public void setEclipseProjectDir( File eclipseProjectDir )
@@ -491,7 +538,7 @@
 
     /**
      * Getter for <code>projectnatures</code>.
-     *
+     * 
      * @return Returns the projectnatures.
      */
     public List getProjectnatures()
@@ -501,7 +548,7 @@
 
     /**
      * Setter for <code>projectnatures</code>.
-     *
+     * 
      * @param projectnatures The projectnatures to set.
      */
     public void setProjectnatures( List projectnatures )
@@ -511,7 +558,7 @@
 
     /**
      * Getter for <code>useProjectReferences</code>.
-     *
+     * 
      * @return Returns the useProjectReferences.
      */
     public boolean getUseProjectReferences()
@@ -521,7 +568,7 @@
 
     /**
      * Setter for <code>useProjectReferences</code>.
-     *
+     * 
      * @param useProjectReferences The useProjectReferences to set.
      */
     public void setUseProjectReferences( boolean useProjectReferences )
@@ -531,7 +578,7 @@
 
     /**
      * Getter for <code>wtpversion</code>.
-     *
+     * 
      * @return Returns the wtpversion.
      */
     public String getWtpversion()
@@ -541,7 +588,7 @@
 
     /**
      * Setter for <code>wtpversion</code>.
-     *
+     * 
      * @param wtpversion The wtpversion to set.
      */
     public void setWtpversion( String wtpversion )
@@ -551,7 +598,7 @@
 
     /**
      * Getter for <code>additionalBuildcommands</code>.
-     *
+     * 
      * @return Returns the additionalBuildcommands.
      */
     public List getAdditionalBuildcommands()
@@ -561,7 +608,7 @@
 
     /**
      * Setter for <code>additionalBuildcommands</code>.
-     *
+     * 
      * @param additionalBuildcommands The additionalBuildcommands to set.
      */
     public void setAdditionalBuildcommands( List additionalBuildcommands )
@@ -571,7 +618,7 @@
 
     /**
      * Getter for <code>additionalProjectnatures</code>.
-     *
+     * 
      * @return Returns the additionalProjectnatures.
      */
     public List getAdditionalProjectnatures()
@@ -581,7 +628,7 @@
 
     /**
      * Setter for <code>additionalProjectnatures</code>.
-     *
+     * 
      * @param additionalProjectnatures The additionalProjectnatures to set.
      */
     public void setAdditionalProjectnatures( List additionalProjectnatures )
@@ -1031,7 +1078,7 @@
     /**
      * If this is a war module peek into the reactor an search for an ear module that defines
the context root of this
      * module.
-     *
+     * 
      * @param config config to save the context root.
      */
     private void collectWarContextRootsFromReactorEarConfiguration( EclipseWriterConfig config
)
@@ -1093,7 +1140,7 @@
     /**
      * Write any extra configuration information for the Eclipse project. This is an extension
point, called before the
      * main configurations are written. <br/> <b> NOTE: This could change the
config! </b>
-     *
+     * 
      * @param config
      * @throws MojoExecutionException
      */
@@ -1329,7 +1376,7 @@
     /**
      * Calculate the project name template from the fields {@link #projectNameTemplate},
      * {@link #addVersionToProjectName} and {@link #addGroupIdToProjectName}
-     *
+     * 
      * @return the project name template that should be used after considering the plugin
configuration
      */
     private String calculateProjectNameTemplate()

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?rev=617639&r1=617638&r2=617639&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Fri Feb  1 12:50:51 2008
@@ -99,7 +99,7 @@
 
     /**
      * Tests with <code>outputDirectory</code> and <code>outputDir</code>
-     *
+     * 
      * @throws Exception
      */
     public void testProject09()
@@ -122,7 +122,7 @@
 
     /**
      * Ear packaging
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject12()
@@ -133,7 +133,7 @@
 
     /**
      * Dependency range - MECLIPSE-96
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject13()
@@ -144,7 +144,7 @@
 
     /**
      * Additional natures and builders - MECLIPSE-64
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject14()
@@ -155,7 +155,7 @@
 
     /**
      * <code>outputDirectory</code> parameter - MECLIPSE-11
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject15()
@@ -168,7 +168,7 @@
 
     /**
      * UTF8 encoding - MECLIPSE-56
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject16()
@@ -180,7 +180,7 @@
 
     /**
      * ISO-8859-15 encoding - MECLIPSE-56
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject17()
@@ -192,7 +192,7 @@
 
     /**
      * relative location of system dependencies - MECLIPSE-89
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject18()
@@ -203,7 +203,7 @@
 
     /**
      * Resource targetPath is relative to the project's output directory - MECLIPSE-77
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject19()
@@ -214,7 +214,7 @@
 
     /**
      * WTP 1.5 changes in wtpmodules.
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject20()
@@ -225,7 +225,7 @@
 
     /**
      * PDE support.
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject21()
@@ -236,7 +236,7 @@
 
     /**
      * PDE support using eclipse-plugin packaging.
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject22()
@@ -247,7 +247,7 @@
 
     /**
      * Additional config files using "additionalConfig" property.
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject23()
@@ -258,7 +258,7 @@
 
     /**
      * Test rewriting of OSGI manifest files.
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject24()
@@ -269,7 +269,7 @@
 
     /**
      * Test source exclude/include.
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject25()
@@ -280,7 +280,7 @@
 
     /**
      * Test different compiler settings for test sources.
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject26()
@@ -291,7 +291,7 @@
 
     /**
      * Test additional project facets specified.
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject27()
@@ -302,7 +302,7 @@
 
     /**
      * MECLIPSE-241 : Compiler settings from parent project aren't used in wtp facet.
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject28()
@@ -313,7 +313,7 @@
 
     /**
      * MECLIPSE-198 : EJB version is not resloved
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject29()
@@ -324,7 +324,7 @@
 
     /**
      * MECLIPSE-108 : .wtpmodules with version 2.4 for javax.servlet:servlet-api:2.3
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject30()
@@ -335,7 +335,7 @@
 
     /**
      * MECLIPSE-185 : plugin doesn't fail when dependencies are missing
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject31()
@@ -356,7 +356,7 @@
 
     /**
      * MECLIPSE-109 : .component wb-resource source path incorrect for ear packaging
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject32()
@@ -368,7 +368,7 @@
     /**
      * MECLIPSE-287 : dependencies with and without classifiers. MECLIPSE-151 : test jar
source attachments.
      * MECLIPSE-367 : Dependency to artifact with classifier tests not distinguished from
the regular artifact
-     *
+     * 
      * @throws Exception any exception thrown during test
      */
     public void testProject33()
@@ -500,13 +500,26 @@
 
     /**
      * [MECLIPSE-79]
-	 * @since 2.5
+     * 
+     * @since 2.5
      * @throws Exception
      */
     public void testProject43()
-    throws Exception
+        throws Exception
     {
         testProject( "project-43" );
+    }
+
+    /**
+     * [MECLIPSE-219]
+     * 
+     * @since 2.5
+     * @throws Exception
+     */
+    public void testProject44()
+        throws Exception
+    {
+        testProject( "project-44" );
     }
 
     public void testJeeSimple()

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/checkstyle-config/1.0/checkstyle-config-1.0.jar
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/checkstyle-config/1.0/checkstyle-config-1.0.jar?rev=617639&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/checkstyle-config/1.0/checkstyle-config-1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/checkstyle-config/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/checkstyle-config/maven-metadata-local.xml?rev=617639&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/checkstyle-config/maven-metadata-local.xml
(added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/checkstyle-config/maven-metadata-local.xml
Fri Feb  1 12:50:51 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>eclipsetest</groupId>
+  <artifactId>checkstyle-config</artifactId>
+  <version>1.0</version>
+  <versioning>
+    <versions>
+      <version>1.0</version>
+    </versions>
+    <lastUpdated>20080201202012</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/checkstyle-config/maven-metadata-local.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/checkstyle-config/maven-metadata-local.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb  1 12:50:51 2008
@@ -0,0 +1 @@
+target

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/eclipse-settings/checkstyle-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/eclipse-settings/checkstyle-config.xml?rev=617639&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/eclipse-settings/checkstyle-config.xml
(added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/eclipse-settings/checkstyle-config.xml
Fri Feb  1 12:50:51 2008
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle-configurations file-format-version="5.0.0"/>

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/eclipse-settings/checkstyle-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/eclipse-settings/checkstyle-config.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.checkstyle
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.checkstyle?rev=617639&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.checkstyle
(added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.checkstyle
Fri Feb  1 12:50:51 2008
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle-configurations file-format-version="5.0.0"/>

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.checkstyle2
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.checkstyle2?rev=617639&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.checkstyle2
(added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.checkstyle2
Fri Feb  1 12:50:51 2008
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle-configurations file-format-version="5.0.0"/>

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.classpath?rev=617639&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.classpath
(added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.classpath
Fri Feb  1 12:50:51 2008
@@ -0,0 +1,4 @@
+<classpath>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.classpath
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.classpath
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.project
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.project?rev=617639&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.project
(added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.project
Fri Feb  1 12:50:51 2008
@@ -0,0 +1,13 @@
+<projectDescription>
+  <name>maven-eclipse-plugin-test-project-44</name>
+  <comment/>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.project
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/expected/.project
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/pom.xml?rev=617639&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/pom.xml
(added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/pom.xml
Fri Feb  1 12:50:51 2008
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>eclipse</groupId>
+  <artifactId>maven-eclipse-plugin-test-project-44</artifactId>
+  <version>88.0</version>
+  <name>Maven</name>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <!--        <version>test</version>-->
+        <configuration>
+          <additionalConfig>
+            <file>
+              <name>.checkstyle</name>
+              <location>/checkstyle-config.xml</location>
+            </file>
+            <file>
+              <name>.checkstyle2</name>
+              <url>
+                https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/eclipse-settings/checkstyle-config.xml
+              </url>
+            </file>
+          </additionalConfig>
+        </configuration>
+        <dependencies>
+          <!-- Used to find the file from a location -->
+          <dependency>
+            <groupId>eclipsetest</groupId>
+            <artifactId>checkstyle-config</artifactId>
+            <version>1.0</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-44/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"



Mime
View raw message