You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/27 16:16:57 UTC
svn commit: r1517827 [15/24] - in /maven/plugins/trunk:
maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/
maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/
maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/
maven-antr...
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java Tue Aug 27 14:16:42 2013
@@ -122,9 +122,9 @@ public class IdeUtils
}
catch ( IOException e )
{
- throw new MojoExecutionException( Messages.getString( "EclipseCleanMojo.failedtodelete", //$NON-NLS-1$
- new Object[] { f.getName(),
- f.getAbsolutePath() } ) );
+ throw new MojoExecutionException(
+ Messages.getString( "EclipseCleanMojo.failedtodelete", //$NON-NLS-1$
+ new Object[]{ f.getName(), f.getAbsolutePath() } ) );
}
}
}
@@ -144,7 +144,7 @@ public class IdeUtils
catch ( IOException e )
{
throw new MojoExecutionException( Messages.getString( "EclipsePlugin.cantcanonicalize", file //$NON-NLS-1$
- .getAbsolutePath() ), e );
+ .getAbsolutePath() ), e );
}
}
@@ -188,11 +188,11 @@ public class IdeUtils
public static String getCompilerSourceEncoding( MavenProject project )
{
String value = IdeUtils.getCompilerPluginSetting( project, PROPERTY_ENCODING );
- if ( value == null )
+ if ( value == null )
{
project.getProperties().getProperty( "project.build.sourceEncoding" );
}
- return value;
+ return value;
}
/**
@@ -234,17 +234,17 @@ public class IdeUtils
/**
* Extracts the version of the first matching artifact in the given list.
- * <p>
+ * <p/>
* The {@code len} parameter indicated what to to return:
* <ul>
- * <li><strong>1</strong> indicated <code>major</code> version</li>
- * <li><strong>3</strong> indicated <code>major dot minor</code> version</li>
- * <li><strong>5 and above</strong> indicates <code>major dot minor dot incremental</code> version
+ * <li><strong>1</strong> indicated <code>major</code> version</li>
+ * <li><strong>3</strong> indicated <code>major dot minor</code> version</li>
+ * <li><strong>5 and above</strong> indicates <code>major dot minor dot incremental</code> version
* </ul>
- *
+ *
* @param artifactIds artifact names to compare against for extracting version
- * @param artifacts Set of artifacts for our project
- * @param len expected length of the version sub-string
+ * @param artifacts Set of artifacts for our project
+ * @param len expected length of the version sub-string
* @return
*/
public static String getArtifactVersion( String[] artifactIds, List dependencies, int len )
@@ -254,23 +254,23 @@ public class IdeUtils
if ( artifactVersion != null )
{
StringBuilder versionBuffer = new StringBuilder();
- if( len >= 1 )
+ if ( len >= 1 )
{
versionBuffer.append( artifactVersion.getMajorVersion() );
}
- if( len >= 2 )
+ if ( len >= 2 )
{
versionBuffer.append( '.' );
- }
- if( len >= 3 )
+ }
+ if ( len >= 3 )
{
versionBuffer.append( artifactVersion.getMinorVersion() );
}
- if( len >= 4 )
+ if ( len >= 4 )
{
versionBuffer.append( '.' );
- }
- if( len >= 5 )
+ }
+ if ( len >= 5 )
{
versionBuffer.append( artifactVersion.getIncrementalVersion() );
}
@@ -278,20 +278,22 @@ public class IdeUtils
}
return version;
}
-
+
/**
- *
- * @param artifactIds an array of artifactIds, should not be <code>null</code>
+ * @param artifactIds an array of artifactIds, should not be <code>null</code>
* @param dependencies a list of {@link Dependency}-objects, should not be <code>null</code>
* @return the resolved ArtifactVersion, otherwise <code>null</code>
*/
public static ArtifactVersion getArtifactVersion( String[] artifactIds, List /*<Dependency>*/ dependencies )
{
- for (String id : artifactIds) {
- for (Object dependency : dependencies) {
+ for ( String id : artifactIds )
+ {
+ for ( Object dependency : dependencies )
+ {
Dependency dep = (Dependency) dependency;
- if (id.equals(dep.getArtifactId())) {
- return VersionRange.createFromVersion(dep.getVersion()).getRecommendedVersion();
+ if ( id.equals( dep.getArtifactId() ) )
+ {
+ return VersionRange.createFromVersion( dep.getVersion() ).getRecommendedVersion();
}
}
@@ -302,14 +304,15 @@ public class IdeUtils
/**
* Search for a configuration setting of an other plugin for a configuration setting.
*
- * @todo there should be a better way to do this
- * @param project the current maven project to get the configuration from.
- * @param pluginId the group id and artifact id of the plugin to search for
- * @param optionName the option to get from the configuration
+ * @param project the current maven project to get the configuration from.
+ * @param pluginId the group id and artifact id of the plugin to search for
+ * @param optionName the option to get from the configuration
* @param defaultValue the default value if the configuration was not found
* @return the value of the option configured in the plugin configuration
+ * @todo there should be a better way to do this
*/
- public static String getPluginSetting( MavenProject project, String pluginId, String optionName, String defaultValue )
+ public static String getPluginSetting( MavenProject project, String pluginId, String optionName,
+ String defaultValue )
{
Xpp3Dom dom = getPluginConfigurationDom( project, pluginId );
if ( dom != null && dom.getChild( optionName ) != null )
@@ -322,10 +325,10 @@ public class IdeUtils
/**
* Search for the configuration Xpp3 dom of an other plugin.
*
- * @todo there should be a better way to do this
- * @param project the current maven project to get the configuration from.
+ * @param project the current maven project to get the configuration from.
* @param pluginId the group id and artifact id of the plugin to search for
* @return the value of the option configured in the plugin configuration
+ * @todo there should be a better way to do this
*/
public static Xpp3Dom getPluginConfigurationDom( MavenProject project, String pluginId )
{
@@ -342,10 +345,10 @@ public class IdeUtils
/**
* Search for the configuration Xpp3 dom of an other plugin.
*
- * @todo there should be a better way to do this
- * @param project the current maven project to get the configuration from.
+ * @param project the current maven project to get the configuration from.
* @param artifactId the artifact id of the plugin to search for
* @return the value of the option configured in the plugin configuration
+ * @todo there should be a better way to do this
*/
public static Xpp3Dom[] getPluginConfigurationDom( MavenProject project, String artifactId,
String[] subConfiguration )
@@ -355,16 +358,20 @@ public class IdeUtils
if ( configuration != null )
{
configurationDomList.add( configuration );
- for ( int index = 0; !configurationDomList.isEmpty() && subConfiguration != null
- && index < subConfiguration.length; index++ )
+ for ( int index = 0;
+ !configurationDomList.isEmpty() && subConfiguration != null && index < subConfiguration.length;
+ index++ )
{
ArrayList newConfigurationDomList = new ArrayList();
- for (Object aConfigurationDomList : configurationDomList) {
+ for ( Object aConfigurationDomList : configurationDomList )
+ {
Xpp3Dom child = (Xpp3Dom) aConfigurationDomList;
- Xpp3Dom[] deeperChild = child.getChildren(subConfiguration[index]);
- for (Xpp3Dom aDeeperChild : deeperChild) {
- if (aDeeperChild != null) {
- newConfigurationDomList.add(aDeeperChild);
+ Xpp3Dom[] deeperChild = child.getChildren( subConfiguration[index] );
+ for ( Xpp3Dom aDeeperChild : deeperChild )
+ {
+ if ( aDeeperChild != null )
+ {
+ newConfigurationDomList.add( aDeeperChild );
}
}
}
@@ -377,11 +384,11 @@ public class IdeUtils
/**
* Calculate the project name template from the specified value <code>projectNameTemplate</code>,
* <code>addVersionToProjectName</code> and <code>addGroupIdToProjectName</code>
- * <p>
+ * <p/>
* Note: if projectNameTemplate is not null then that value will be used regardless of the values for
* addVersionToProjectName or addGroupIdToProjectName and a warning will be issued.
*
- * @param projectNameTemplate the current projectNameTemplate, if available
+ * @param projectNameTemplate the current projectNameTemplate, if available
* @param addVersionToProjectName whether to include Version in the project name
* @param addGroupIdToProjectName whether to include GroupId in the project name.
* @return the project name template.
@@ -394,7 +401,7 @@ public class IdeUtils
if ( addVersionToProjectName || addGroupIdToProjectName )
{
log.warn( "projectNameTemplate definition overrides "
- + "addVersionToProjectName or addGroupIdToProjectName" );
+ + "addVersionToProjectName or addGroupIdToProjectName" );
}
return projectNameTemplate;
}
@@ -440,8 +447,8 @@ public class IdeUtils
public static String getProjectName( MavenProject project, boolean addVersionToProjectName )
{
- return getProjectName( addVersionToProjectName ? PROJECT_NAME_WITH_VERSION_TEMPLATE
- : PROJECT_NAME_DEFAULT_TEMPLATE, project );
+ return getProjectName(
+ addVersionToProjectName ? PROJECT_NAME_WITH_VERSION_TEMPLATE : PROJECT_NAME_DEFAULT_TEMPLATE, project );
}
/**
@@ -450,18 +457,18 @@ public class IdeUtils
*/
public static File getNotAvailableMarkerFile( ArtifactRepository localRepository, Artifact artifact )
{
- return new File( localRepository.getBasedir(), localRepository.pathOf( artifact )
- + NOT_AVAILABLE_MARKER_FILE_SUFFIX );
+ return new File( localRepository.getBasedir(),
+ localRepository.pathOf( artifact ) + NOT_AVAILABLE_MARKER_FILE_SUFFIX );
}
/**
* Wrapper around {@link ArtifactResolver#resolve(Artifact, List, ArtifactRepository)}
*
* @param artifactResolver see {@link ArtifactResolver#resolve(Artifact, List, ArtifactRepository)}
- * @param artifact see {@link ArtifactResolver#resolve(Artifact, List, ArtifactRepository)}
- * @param remoteRepos see {@link ArtifactResolver#resolve(Artifact, List, ArtifactRepository)}
- * @param localRepository see {@link ArtifactResolver#resolve(Artifact, List, ArtifactRepository)}
- * @param log Logger
+ * @param artifact see {@link ArtifactResolver#resolve(Artifact, List, ArtifactRepository)}
+ * @param remoteRepos see {@link ArtifactResolver#resolve(Artifact, List, ArtifactRepository)}
+ * @param localRepository see {@link ArtifactResolver#resolve(Artifact, List, ArtifactRepository)}
+ * @param log Logger
* @return the artifact, resolved if possible.
*/
public static Artifact resolveArtifact( ArtifactResolver artifactResolver, Artifact artifact, List remoteRepos,
@@ -489,9 +496,9 @@ public class IdeUtils
}
catch ( ArtifactResolutionException e )
{
- String message =
- Messages.getString( "IdeUtils.errorresolving", new Object[] { artifact.getClassifier(),
- artifact.getId(), e.getMessage() } );
+ String message = Messages.getString( "IdeUtils.errorresolving",
+ new Object[]{ artifact.getClassifier(), artifact.getId(),
+ e.getMessage() } );
log.warn( message );
}
@@ -503,11 +510,11 @@ public class IdeUtils
* Wrap {@link ArtifactFactory#createArtifactWithClassifier} so that the type and classifier are set correctly for
* "sources" and "javadoc".
*
- * @param groupId see {@link ArtifactFactory#createArtifactWithClassifier}
- * @param artifactId see {@link ArtifactFactory#createArtifactWithClassifier}
- * @param version see {@link ArtifactFactory#createArtifactWithClassifier}
- * @param depClassifier see {@link ArtifactFactory#createArtifactWithClassifier}
- * @param inClassifier either "sources" of "javadoc"
+ * @param groupId see {@link ArtifactFactory#createArtifactWithClassifier}
+ * @param artifactId see {@link ArtifactFactory#createArtifactWithClassifier}
+ * @param version see {@link ArtifactFactory#createArtifactWithClassifier}
+ * @param depClassifier see {@link ArtifactFactory#createArtifactWithClassifier}
+ * @param inClassifier either "sources" of "javadoc"
* @param artifactFactory see {@link ArtifactFactory#createArtifactWithClassifier}
* @return see {@link ArtifactFactory#createArtifactWithClassifier}
* @see ArtifactFactory#createArtifactWithClassifier
@@ -654,29 +661,34 @@ public class IdeUtils
{
String value = null;
- for (Object plugin1 : plugins) {
+ for ( Object plugin1 : plugins )
+ {
Plugin plugin = (Plugin) plugin1;
- if (plugin.getArtifactId().equals(ARTIFACT_MAVEN_COMPILER_PLUGIN)) {
+ if ( plugin.getArtifactId().equals( ARTIFACT_MAVEN_COMPILER_PLUGIN ) )
+ {
// TODO: This may cause ClassCastExceptions eventually, if the dom impls differ.
Xpp3Dom o = (Xpp3Dom) plugin.getConfiguration();
// this is the default setting
- if (o != null && o.getChild(optionName) != null) {
- value = o.getChild(optionName).getValue();
+ if ( o != null && o.getChild( optionName ) != null )
+ {
+ value = o.getChild( optionName ).getValue();
}
List executions = plugin.getExecutions();
// a different source/target version can be configured for test sources compilation
- for (Object execution1 : executions) {
+ for ( Object execution1 : executions )
+ {
PluginExecution execution = (PluginExecution) execution1;
// TODO: This may cause ClassCastExceptions eventually, if the dom impls differ.
o = (Xpp3Dom) execution.getConfiguration();
- if (o != null && o.getChild(optionName) != null) {
- value = o.getChild(optionName).getValue();
+ if ( o != null && o.getChild( optionName ) != null )
+ {
+ value = o.getChild( optionName ).getValue();
}
}
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java Tue Aug 27 14:16:42 2013
@@ -42,7 +42,7 @@ public class JeeUtils
// //$NON-NLS-1$
static
{
- addJEE( JeeDescriptor.JEE_6_0, JeeDescriptor.EJB_3_1, JeeDescriptor.SERVLET_3_0, JeeDescriptor.JSP_2_2 );
+ addJEE( JeeDescriptor.JEE_6_0, JeeDescriptor.EJB_3_1, JeeDescriptor.SERVLET_3_0, JeeDescriptor.JSP_2_2 );
addJEE( JeeDescriptor.JEE_5_0, JeeDescriptor.EJB_3_0, JeeDescriptor.SERVLET_2_5, JeeDescriptor.JSP_2_1 );
addJEE( JeeDescriptor.JEE_1_4, JeeDescriptor.EJB_2_1, JeeDescriptor.SERVLET_2_4, JeeDescriptor.JSP_2_0 );
addJEE( JeeDescriptor.JEE_1_3, JeeDescriptor.EJB_2_0, JeeDescriptor.SERVLET_2_3, JeeDescriptor.JSP_1_2 );
@@ -52,63 +52,79 @@ public class JeeUtils
/**
* Returns the JEEDescriptor associated to an EJB specifications version.
- *
+ *
* @param ejbVersion An EJB version as defined by constants JeeDescriptor.EJB_x_x
* @return a JEEDescriptor
*/
public final static JeeDescriptor getJeeDescriptorFromEjbVersion( String ejbVersion )
{
if ( ejbMap.containsKey( ejbVersion ) )
+ {
return (JeeDescriptor) ejbMap.get( ejbVersion );
+ }
else
+ {
return null;
+ }
}
/**
* Returns the JEEDescriptor associated to a JEE specifications version.
- *
+ *
* @param jeeVersion A JEE version as defined by constants JeeDescriptor.JEE_x_x
* @return a JEEDescriptor
*/
public final static JeeDescriptor getJeeDescriptorFromJeeVersion( String jeeVersion )
{
if ( jeeMap.containsKey( jeeVersion ) )
+ {
return (JeeDescriptor) jeeMap.get( jeeVersion );
+ }
else
+ {
return null;
+ }
}
/**
* Returns the JEEDescriptor associated to a JSP specifications version.
- *
+ *
* @param jspVersion A JSP version as defined by constants JeeDescriptor.JSP_x_x
* @return a JEEDescriptor
*/
public final static JeeDescriptor getJeeDescriptorFromJspVersion( String jspVersion )
{
if ( jspMap.containsKey( jspVersion ) )
+ {
return (JeeDescriptor) jspMap.get( jspVersion );
+ }
else
+ {
return null;
+ }
}
/**
* Returns the JEEDescriptor associated to a Servlet specifications version.
- *
+ *
* @param servletVersion A Servlet version as defined by constants JeeDescriptor.SERVLET_x_x
* @return a JEEDescriptor
*/
public final static JeeDescriptor getJeeDescriptorFromServletVersion( String servletVersion )
{
if ( servletMap.containsKey( servletVersion ) )
+ {
return (JeeDescriptor) servletMap.get( servletVersion );
+ }
else
+ {
return null;
+ }
}
/**
* Search in dependencies a version of EJB APIs (or of JEE APIs).
- *
+ *
* @param artifacts The list of dependencies where we search the information
* @return An EJB version as defined by constants JeeDescriptor.EJB_x_x. By default, if nothing is found, returns
* JeeDescriptor.EJB_2_1.
@@ -123,14 +139,16 @@ public class JeeUtils
// version from J2EE/JEE.
JeeDescriptor descriptor = getJeeDescriptorFromJeeVersion( findJeeVersionInDependencies( project ) );
if ( descriptor != null )
+ {
version = descriptor.getEjbVersion();
+ }
}
return version == null ? JeeDescriptor.EJB_2_1 : version; //$NON-NLS-1$
}
/**
* Search in dependencies a version of JEE APIs.
- *
+ *
* @param artifacts The list of dependencies where we search the information
* @return A JEE version as defined by constants JeeDescriptor.JEE_x_x. By default, if nothing is found, returns
* JeeDescriptor.JEE_1_4.
@@ -145,15 +163,20 @@ public class JeeUtils
// version from EJB.
JeeDescriptor descriptor = getJeeDescriptorFromEjbVersion( findEjbVersionInDependencies( project ) );
if ( descriptor != null )
+ {
version = descriptor.getJeeVersion();
+ }
}
if ( version == null )
{
// No JEE dependency detected. Try to resolve the JEE
// version from SERVLET.
- JeeDescriptor descriptor = getJeeDescriptorFromServletVersion( findServletVersionInDependencies( project ) );
+ JeeDescriptor descriptor =
+ getJeeDescriptorFromServletVersion( findServletVersionInDependencies( project ) );
if ( descriptor != null )
+ {
version = descriptor.getJeeVersion();
+ }
}
if ( version == null )
{
@@ -161,14 +184,16 @@ public class JeeUtils
// version from JSP.
JeeDescriptor descriptor = getJeeDescriptorFromJspVersion( findJspVersionInDependencies( project ) );
if ( descriptor != null )
+ {
version = descriptor.getJeeVersion();
+ }
}
return version == null ? JeeDescriptor.JEE_1_4 : version; //$NON-NLS-1$
}
/**
* Search in dependencies a version of JSP APIs (or from JEE APIs, or from Servlet APIs).
- *
+ *
* @param artifacts The list of dependencies where we search the information
* @return A JSP version as defined by constants JeeDescriptor.JSP_x_x. By default, if nothing is found, returns
* JeeDescriptor.JSP_2_0.
@@ -184,22 +209,27 @@ public class JeeUtils
// version from J2EE/JEE.
JeeDescriptor descriptor = getJeeDescriptorFromJeeVersion( findJeeVersionInDependencies( project ) );
if ( descriptor != null )
+ {
version = descriptor.getJspVersion();
+ }
}
if ( version == null )
{
// No jsp dependency detected. Try to resolve the jsp
// version from Servlet.
- JeeDescriptor descriptor = getJeeDescriptorFromServletVersion( findServletVersionInDependencies( project ) );
+ JeeDescriptor descriptor =
+ getJeeDescriptorFromServletVersion( findServletVersionInDependencies( project ) );
if ( descriptor != null )
+ {
version = descriptor.getJspVersion();
+ }
}
return version == null ? JeeDescriptor.JSP_2_0 : version; //$NON-NLS-1$
}
/**
* Search in dependencies a version of Servlet APIs (or of JEE APIs).
- *
+ *
* @param artifacts The list of dependencies where we search the information
* @return A SERVLET version as defined by constants JeeDescriptor.SERLVET_x_x. By default, if nothing is found,
* returns JeeDescriptor.SERVLET_2_4.
@@ -214,7 +244,9 @@ public class JeeUtils
// version from J2EE/JEE.
JeeDescriptor descriptor = getJeeDescriptorFromJeeVersion( findJeeVersionInDependencies( project ) );
if ( descriptor != null )
+ {
version = descriptor.getServletVersion();
+ }
}
return version == null ? JeeDescriptor.SERVLET_2_4 : version; //$NON-NLS-1$
}
@@ -231,28 +263,34 @@ public class JeeUtils
private static String findEjbVersionInDependencies( MavenProject project )
{
- String version =
- IdeUtils.getArtifactVersion( new String[] { "ejb", "ejb-api", "geronimo-spec-ejb" },
- project.getDependencies(), 3 );
+ String version = IdeUtils.getArtifactVersion( new String[]{ "ejb", "ejb-api", "geronimo-spec-ejb" },
+ project.getDependencies(), 3 );
// For new Geronimo APIs, the version of the artifact isn't the one of the spec
if ( version == null )
{
- if ( IdeUtils.getArtifactVersion( new String[] { "geronimo-ejb_2.1_spec" }, project.getDependencies(), 3 ) != null )
+ if ( IdeUtils.getArtifactVersion( new String[]{ "geronimo-ejb_2.1_spec" }, project.getDependencies(), 3 )
+ != null )
+ {
return JeeDescriptor.EJB_2_1;
+ }
}
if ( version == null )
{
- if ( IdeUtils.getArtifactVersion( new String[] { "geronimo-ejb_3.0_spec" }, project.getDependencies(), 3 ) != null )
+ if ( IdeUtils.getArtifactVersion( new String[]{ "geronimo-ejb_3.0_spec" }, project.getDependencies(), 3 )
+ != null )
+ {
return JeeDescriptor.EJB_3_0;
+ }
}
// if no version found try dependencies of referenced projects
if ( version == null )
{
- for (Object key : project.getProjectReferences().keySet()) {
- MavenProject refProject = (MavenProject) project.getProjectReferences().get(key);
- version = findEjbVersionInDependencies(refProject);
- if (version != null) // version found in dependencies
+ for ( Object key : project.getProjectReferences().keySet() )
+ {
+ MavenProject refProject = (MavenProject) project.getProjectReferences().get( key );
+ version = findEjbVersionInDependencies( refProject );
+ if ( version != null ) // version found in dependencies
{
break;
}
@@ -263,24 +301,27 @@ public class JeeUtils
private static String findJeeVersionInDependencies( MavenProject project )
{
- String version =
- IdeUtils.getArtifactVersion( new String[] { "javaee-api", "j2ee", "geronimo-spec-j2ee" },
- project.getDependencies(), 3 );
+ String version = IdeUtils.getArtifactVersion( new String[]{ "javaee-api", "j2ee", "geronimo-spec-j2ee" },
+ project.getDependencies(), 3 );
// For new Geronimo APIs, the version of the artifact isn't the one of the spec
if ( version == null )
{
- if ( IdeUtils.getArtifactVersion( new String[] { "geronimo-j2ee_1.4_spec" }, project.getDependencies(), 3 ) != null )
+ if ( IdeUtils.getArtifactVersion( new String[]{ "geronimo-j2ee_1.4_spec" }, project.getDependencies(), 3 )
+ != null )
+ {
return JeeDescriptor.JEE_1_4;
+ }
}
// if no version found try dependencies of referenced projects
if ( version == null )
{
- for (Object key : project.getProjectReferences().keySet()) {
- MavenProject refProject = (MavenProject) project.getProjectReferences().get(key);
- version = findJeeVersionInDependencies(refProject);
- if (version != null) // version found in dependencies
+ for ( Object key : project.getProjectReferences().keySet() )
+ {
+ MavenProject refProject = (MavenProject) project.getProjectReferences().get( key );
+ version = findJeeVersionInDependencies( refProject );
+ if ( version != null ) // version found in dependencies
{
break;
}
@@ -298,30 +339,37 @@ public class JeeUtils
private static String findServletVersionInDependencies( MavenProject project )
{
String version =
- IdeUtils.getArtifactVersion( new String[] { "servlet-api", "servletapi", "geronimo-spec-servlet" },
+ IdeUtils.getArtifactVersion( new String[]{ "servlet-api", "servletapi", "geronimo-spec-servlet" },
project.getDependencies(), 3 );
// For new Geronimo APIs, the version of the artifact isn't the one of the spec
if ( version == null )
{
- if ( IdeUtils.getArtifactVersion( new String[] { "geronimo-servlet_2.4_spec" }, project.getDependencies(),
- 3 ) != null )
+ if (
+ IdeUtils.getArtifactVersion( new String[]{ "geronimo-servlet_2.4_spec" }, project.getDependencies(), 3 )
+ != null )
+ {
return JeeDescriptor.SERVLET_2_4;
+ }
}
if ( version == null )
{
- if ( IdeUtils.getArtifactVersion( new String[] { "geronimo-servlet_2.5_spec" }, project.getDependencies(),
- 3 ) != null )
+ if (
+ IdeUtils.getArtifactVersion( new String[]{ "geronimo-servlet_2.5_spec" }, project.getDependencies(), 3 )
+ != null )
+ {
return JeeDescriptor.SERVLET_2_5;
+ }
}
// if no version found try dependencies of referenced projects
if ( version == null )
{
- for (Object key : project.getProjectReferences().keySet()) {
- MavenProject refProject = (MavenProject) project.getProjectReferences().get(key);
- version = findServletVersionInDependencies(refProject);
- if (version != null) // version found in dependencies
+ for ( Object key : project.getProjectReferences().keySet() )
+ {
+ MavenProject refProject = (MavenProject) project.getProjectReferences().get( key );
+ version = findServletVersionInDependencies( refProject );
+ if ( version != null ) // version found in dependencies
{
break;
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/InstallPluginsMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/InstallPluginsMojoTest.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/InstallPluginsMojoTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/InstallPluginsMojoTest.java Tue Aug 27 14:16:42 2013
@@ -69,7 +69,7 @@ public class InstallPluginsMojoTest
/**
* Has both Bundle-Name and Bundle-SymbolicName and should be installed.
- *
+ *
* @throws MojoExecutionException
* @throws MojoFailureException
*/
@@ -88,7 +88,7 @@ public class InstallPluginsMojoTest
/**
* Has Bundle-SymbolicName but no Bundle-Name and should be installed.
- *
+ *
* @throws MojoExecutionException
* @throws MojoFailureException
*/
@@ -107,7 +107,7 @@ public class InstallPluginsMojoTest
/**
* Has Bundle-Name but no Bundle-SymbolicName and should be installed.
- *
+ *
* @throws MojoExecutionException
* @throws MojoFailureException
*/
@@ -126,7 +126,7 @@ public class InstallPluginsMojoTest
/**
* Has neither Bundle-Name or Bundle-SymbolicName and should NOT be installed.
- *
+ *
* @throws MojoExecutionException
* @throws MojoFailureException
*/
@@ -145,7 +145,7 @@ public class InstallPluginsMojoTest
/**
* if a jar has no manifest, do not install plugin.
- *
+ *
* @throws MojoExecutionException
* @throws MojoFailureException
*/
@@ -298,8 +298,8 @@ public class InstallPluginsMojoTest
if ( resource == null )
{
- throw new IllegalStateException( "Cannot find test source jar: " + TEST_M2_REPO + sourcepath
- + " in context classloader!" );
+ throw new IllegalStateException(
+ "Cannot find test source jar: " + TEST_M2_REPO + sourcepath + " in context classloader!" );
}
return new File( resource.getPath() );
}
@@ -318,8 +318,8 @@ public class InstallPluginsMojoTest
String type = artifact.getType();
ArtifactRepository localRepo = createLocalRepository();
- MavenProjectBuilder projectBuilder = createProjectBuilder(typeList.contains(type), installAsJar );
- ArchiverManager archiverManager = createArchiverManager(typeList.contains(type), installAsJar );
+ MavenProjectBuilder projectBuilder = createProjectBuilder( typeList.contains( type ), installAsJar );
+ ArchiverManager archiverManager = createArchiverManager( typeList.contains( type ), installAsJar );
InputHandler inputHandler = createInputHandler();
Log log = new SystemStreamLog();
@@ -386,8 +386,8 @@ public class InstallPluginsMojoTest
manager.getUnArchiver( (File) null );
control.setMatcher( MockControl.ALWAYS_MATCHER );
ZipUnArchiver zipUnArchiver = new ZipUnArchiver();
- zipUnArchiver.enableLogging( new ConsoleLogger( org.codehaus.plexus.logging.Logger.LEVEL_INFO,
- "console" ) );
+ zipUnArchiver.enableLogging(
+ new ConsoleLogger( org.codehaus.plexus.logging.Logger.LEVEL_INFO, "console" ) );
control.setReturnValue( zipUnArchiver, MockControl.ONE_OR_MORE );
}
catch ( NoSuchArchiverException e )
@@ -415,7 +415,7 @@ public class InstallPluginsMojoTest
if ( installAsJar != null )
{
- model.addProperty( InstallPluginsMojo.PROP_UNPACK_PLUGIN, "" + ( !installAsJar) );
+ model.addProperty( InstallPluginsMojo.PROP_UNPACK_PLUGIN, "" + ( !installAsJar ) );
}
MavenProject project = new MavenProject( model );
@@ -465,8 +465,8 @@ public class InstallPluginsMojoTest
*/
private String formatEclipsePluginName( Artifact artifact )
{
- return maven2OsgiConverter.getBundleSymbolicName( artifact ) + "_"
- + maven2OsgiConverter.getVersion( artifact.getVersion() );
+ return maven2OsgiConverter.getBundleSymbolicName( artifact ) + "_" + maven2OsgiConverter.getVersion(
+ artifact.getVersion() );
}
/**
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java Tue Aug 27 14:16:42 2013
@@ -32,7 +32,7 @@ public class TempEclipseWorkspace
{
if ( rad7WithDefault14 == null )
{
- rad7WithDefault14 = new TempEclipseWorkspace( "rad7WithDefault14", new String[] { "direct-compile" } );
+ rad7WithDefault14 = new TempEclipseWorkspace( "rad7WithDefault14", new String[]{ "direct-compile" } );
}
return rad7WithDefault14;
}
@@ -46,7 +46,7 @@ public class TempEclipseWorkspace
{
if ( eclipseWithDefault15 == null )
{
- eclipseWithDefault15 = new TempEclipseWorkspace( "eclipseWithDefault15", new String[] { "direct-compile" } );
+ eclipseWithDefault15 = new TempEclipseWorkspace( "eclipseWithDefault15", new String[]{ "direct-compile" } );
}
return eclipseWithDefault15;
}
@@ -60,7 +60,7 @@ public class TempEclipseWorkspace
{
if ( eclipseWithDefault13 == null )
{
- eclipseWithDefault13 = new TempEclipseWorkspace( "eclipseWithDefault13", new String[] { "direct-compile" } );
+ eclipseWithDefault13 = new TempEclipseWorkspace( "eclipseWithDefault13", new String[]{ "direct-compile" } );
}
return eclipseWithDefault13;
}
@@ -75,7 +75,7 @@ public class TempEclipseWorkspace
if ( dynamicWorkspace == null )
{
dynamicWorkspace =
- new TempEclipseWorkspace( "dynamicWorkspace", new String[] { "project-A/module-A1", "../project-O" } );
+ new TempEclipseWorkspace( "dynamicWorkspace", new String[]{ "project-A/module-A1", "../project-O" } );
}
return dynamicWorkspace;
}
@@ -92,16 +92,16 @@ public class TempEclipseWorkspace
workspaceLocation = new File( eclipseLocation, testWorkspaceName + "/workspace" ).getCanonicalFile();
- File propertyfile =
- new File( workspaceLocation,
- ".metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs" );
+ File propertyfile = new File( workspaceLocation,
+ ".metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs" );
preparePropertyFile( jdkLocation, propertyfile );
if ( projectsToLink != null && projectsToLink.length != 0 )
{
- for (String projectToLink : projectsToLink) {
- writeLocationFile(projectToLink);
+ for ( String projectToLink : projectsToLink )
+ {
+ writeLocationFile( projectToLink );
}
}
@@ -110,7 +110,7 @@ public class TempEclipseWorkspace
/**
* Given the relative path from the workspace to the project to link use the basename as the project name and link
* this project to the fully qualified path anchored at workspaceLocation.
- *
+ *
* @param projectToLink The project to link
* @throws MalformedURLException
* @throws FileNotFoundException
@@ -139,16 +139,14 @@ public class TempEclipseWorkspace
}
private static void preparePropertyFile( File jdkLocation, File propertyfile )
- throws IOException {
+ throws IOException
+ {
Properties properties = new Properties();
properties.load( new FileInputStream( propertyfile ) );
- properties.setProperty(
- "org.eclipse.jdt.launching.PREF_VM_XML",
+ properties.setProperty( "org.eclipse.jdt.launching.PREF_VM_XML",
properties.getProperty( "org.eclipse.jdt.launching.PREF_VM_XML" ).replaceAll(
- "__replace_with_test_dir__",
- jdkLocation.getCanonicalPath().replace(
- '\\',
- '/' ) ) );
+ "__replace_with_test_dir__",
+ jdkLocation.getCanonicalPath().replace( '\\', '/' ) ) );
properties.store( new FileOutputStream( propertyfile ), "" );
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java Tue Aug 27 14:16:42 2013
@@ -132,7 +132,8 @@ public abstract class AbstractEclipsePlu
{
if ( !installed )
{
- System.out.println( "*** Running test builds; output will be directed to: " + BUILD_OUTPUT_DIRECTORY + "\n" );
+ System.out.println(
+ "*** Running test builds; output will be directed to: " + BUILD_OUTPUT_DIRECTORY + "\n" );
}
super.setUp();
@@ -149,9 +150,11 @@ public abstract class AbstractEclipsePlu
{
String path = System.getProperty( "java.library.path" );
String[] paths = StringUtils.split( path, System.getProperty( "path.separator" ) );
- for (String pt : paths) {
- if (new File(pt, "mvn").exists()) {
- System.setProperty("maven.home", new File(pt).getAbsoluteFile().getParent());
+ for ( String pt : paths )
+ {
+ if ( new File( pt, "mvn" ).exists() )
+ {
+ System.setProperty( "maven.home", new File( pt ).getAbsoluteFile().getParent() );
break;
}
@@ -166,12 +169,11 @@ public abstract class AbstractEclipsePlu
{
PluginTestTool pluginTestTool = (PluginTestTool) lookup( PluginTestTool.ROLE, "default" );
- localRepositoryDirectory =
- pluginTestTool.preparePluginForUnitTestingWithMavenBuilds( PomFile, "test",
- localRepositoryDirectory );
+ localRepositoryDirectory = pluginTestTool.preparePluginForUnitTestingWithMavenBuilds( PomFile, "test",
+ localRepositoryDirectory );
- System.out.println( "*** Installed test-version of the Eclipse plugin to: " + localRepositoryDirectory
- + "\n" );
+ System.out.println(
+ "*** Installed test-version of the Eclipse plugin to: " + localRepositoryDirectory + "\n" );
// Hack: to work around proxys and DTDs retrievals.
EntityResolver ignoreDtds = new EntityResolver()
@@ -205,16 +207,19 @@ public abstract class AbstractEclipsePlu
containers.add( getContainer() );
- for (Object container1 : containers) {
+ for ( Object container1 : containers )
+ {
PlexusContainer container = (PlexusContainer) container1;
- if (container != null) {
+ if ( container != null )
+ {
container.dispose();
ClassRealm realm = container.getContainerRealm();
- if (realm != null) {
- realm.getWorld().disposeRealm(realm.getId());
+ if ( realm != null )
+ {
+ realm.getWorld().disposeRealm( realm.getId() );
}
}
}
@@ -248,9 +253,9 @@ public abstract class AbstractEclipsePlu
* Execute the eclipse:eclipse goal on a test project and verify generated files.
*
* @param projectName project directory
- * @param properties additional properties
- * @param cleanGoal TODO
- * @param genGoal TODO
+ * @param properties additional properties
+ * @param cleanGoal TODO
+ * @param genGoal TODO
* @throws Exception any exception generated during test
*/
protected void testProject( String projectName, Properties properties, String cleanGoal, String genGoal )
@@ -263,9 +268,9 @@ public abstract class AbstractEclipsePlu
* Execute the eclipse:eclipse goal on a test project and verify generated files.
*
* @param projectName project directory
- * @param properties additional properties
- * @param cleanGoal TODO
- * @param genGoal TODO
+ * @param properties additional properties
+ * @param cleanGoal TODO
+ * @param genGoal TODO
* @param withInstall true to include the install goal, false to exclude it.
* @throws Exception any exception generated during test
*/
@@ -278,10 +283,10 @@ public abstract class AbstractEclipsePlu
}
/**
- * @param basedir Execute the eclipse:eclipse goal on a test project and verify generated files.
+ * @param basedir Execute the eclipse:eclipse goal on a test project and verify generated files.
* @param properties additional properties
- * @param cleanGoal TODO
- * @param genGoal TODO
+ * @param cleanGoal TODO
+ * @param genGoal TODO
* @throws Exception any exception generated during test
*/
protected void testProject( File basedir, Properties properties, String cleanGoal, String genGoal )
@@ -293,10 +298,10 @@ public abstract class AbstractEclipsePlu
/**
* Execute the eclipse:eclipse goal on a test project and verify generated files.
*
- * @param basedir basedir of mvn execution
- * @param properties additional properties
- * @param cleanGoal TODO
- * @param genGoal TODO
+ * @param basedir basedir of mvn execution
+ * @param properties additional properties
+ * @param cleanGoal TODO
+ * @param genGoal TODO
* @param withInstall true to include the install goal, false to exclude it.
* @throws Exception any exception generated during test
*/
@@ -363,9 +368,9 @@ public abstract class AbstractEclipsePlu
* Execute the eclipse:configure-workspace goal on a test project and verify generated files.
*
* @param projectName project directory
- * @param properties additional properties
- * @param cleanGoal TODO
- * @param genGoal TODO
+ * @param properties additional properties
+ * @param cleanGoal TODO
+ * @param genGoal TODO
* @throws Exception any exception generated during test
*/
protected void testWorkspace( String projectName, Properties properties, String genGoal )
@@ -433,13 +438,15 @@ public abstract class AbstractEclipsePlu
File buildLog = null;
- for (StackTraceElement element : trace) {
+ for ( StackTraceElement element : trace )
+ {
String methodName = element.getMethodName();
- if (methodName.startsWith("test") && !methodName.equals("testProject")) {
+ if ( methodName.startsWith( "test" ) && !methodName.equals( "testProject" ) )
+ {
String classname = element.getClassName();
- buildLog = new File(BUILD_OUTPUT_DIRECTORY, classname + "_" + element.getMethodName() + ".build.log");
+ buildLog = new File( BUILD_OUTPUT_DIRECTORY, classname + "_" + element.getMethodName() + ".build.log" );
break;
}
@@ -450,7 +457,10 @@ public abstract class AbstractEclipsePlu
buildLog = new File( BUILD_OUTPUT_DIRECTORY, "unknown.build.log" );
}
- if (properties == null) properties = new Properties();
+ if ( properties == null )
+ {
+ properties = new Properties();
+ }
InvocationRequest request = buildTool.createBasicInvocationRequest( pom, properties, goals, buildLog );
request.setUpdateSnapshots( false );
request.setShowErrors( true );
@@ -478,9 +488,10 @@ public abstract class AbstractEclipsePlu
{
}
- throw new ExecutionFailedException( "Failed to execute build.\nPOM: " + pom + "\nGoals: "
- + StringUtils.join( goals.iterator(), ", " ) + "\nExit Code: " + result.getExitCode() + "\nError: "
- + result.getExecutionException() + "\nBuild Log: " + buildLogUrl + "\n", result );
+ throw new ExecutionFailedException(
+ "Failed to execute build.\nPOM: " + pom + "\nGoals: " + StringUtils.join( goals.iterator(), ", " )
+ + "\nExit Code: " + result.getExitCode() + "\nError: " + result.getExecutionException()
+ + "\nBuild Log: " + buildLogUrl + "\n", result );
}
}
@@ -510,7 +521,7 @@ public abstract class AbstractEclipsePlu
}
/**
- * @param basedir the base directory of the project
+ * @param basedir the base directory of the project
* @param projectOutputDir the directory where the eclipse plugin will write the output files.
* @throws MojoExecutionException
*/
@@ -519,13 +530,15 @@ public abstract class AbstractEclipsePlu
{
File[] expectedDirectories = getExpectedDirectories( basedir );
- for (File expectedDirectory : expectedDirectories) {
- File[] expectedFilesToCompare = getExpectedFilesToCompare(expectedDirectory);
+ for ( File expectedDirectory : expectedDirectories )
+ {
+ File[] expectedFilesToCompare = getExpectedFilesToCompare( expectedDirectory );
- for (File expectedFile : expectedFilesToCompare) {
- File actualFile = getActualFile(projectOutputDir, basedir, expectedFile);
+ for ( File expectedFile : expectedFilesToCompare )
+ {
+ File actualFile = getActualFile( projectOutputDir, basedir, expectedFile );
- assertFileEquals(expectedFile, actualFile);
+ assertFileEquals( expectedFile, actualFile );
}
}
}
@@ -560,10 +573,10 @@ public abstract class AbstractEclipsePlu
/**
* Assert that two XML files are equal.
*
- * @param expectedFile the expected file - only used for path information
+ * @param expectedFile the expected file - only used for path information
* @param expectedFileContents the contents of the expected file
- * @param actualFile the actual file - only used for path information
- * @param actualFileContents the contents of the actual file
+ * @param actualFile the actual file - only used for path information
+ * @param actualFileContents the contents of the actual file
* @throws MojoExecutionException failures.
*/
private void assertXmlFileEquals( File expectedFile, String expectedFileContents, File actualFile,
@@ -573,20 +586,22 @@ public abstract class AbstractEclipsePlu
try
{
String message =
- "Comparing '" + IdeUtils.getCanonicalPath(actualFile) + "' against '"
- + IdeUtils.getCanonicalPath(expectedFile) + "'";
- if (CLASSPATH_FILENAME.equals(actualFile.getName())) {
- Diff diff = new Diff(expectedFileContents, actualFileContents);
+ "Comparing '" + IdeUtils.getCanonicalPath( actualFile ) + "' against '" + IdeUtils.getCanonicalPath(
+ expectedFile ) + "'";
+ if ( CLASSPATH_FILENAME.equals( actualFile.getName() ) )
+ {
+ Diff diff = new Diff( expectedFileContents, actualFileContents );
XMLAssert.assertXMLIdentical( message, diff, true );
}
- else {
+ else
+ {
XMLAssert.assertXMLEqual( message, expectedFileContents, actualFileContents );
}
}
catch ( IOException e )
{
- throw new MojoExecutionException( IdeUtils.getCanonicalPath( expectedFile )
- + "assertXmlFileEquals failure: IO " + e.getMessage(), e );
+ throw new MojoExecutionException(
+ IdeUtils.getCanonicalPath( expectedFile ) + "assertXmlFileEquals failure: IO " + e.getMessage(), e );
}
catch ( SAXException e )
{
@@ -597,10 +612,10 @@ public abstract class AbstractEclipsePlu
/**
* Assert that two text files are equals. Lines that start with # are comments and ignored.
*
- * @param expectedFile the expected file - only used for path information
+ * @param expectedFile the expected file - only used for path information
* @param expectedFileContents the contents of the expected file
- * @param actualFile the actual file - only used for path information
- * @param actualFileContents the contents of the actual fiel
+ * @param actualFile the actual file - only used for path information
+ * @param actualFileContents the contents of the actual fiel
* @throws MojoExecutionException failures.
*/
private void assertTextFileEquals( File expectedFile, String expectedFileContents, File actualFile,
@@ -615,7 +630,7 @@ public abstract class AbstractEclipsePlu
if ( actualLines.size() <= i )
{
fail( "Too few lines in the actual file. Was " + actualLines.size() + ", expected: "
- + expectedLines.size() );
+ + expectedLines.size() );
}
String actual = actualLines.get( i ).toString();
if ( expected.startsWith( "#" ) && actual.startsWith( "#" ) )
@@ -623,8 +638,9 @@ public abstract class AbstractEclipsePlu
// ignore comments, for settings file
continue;
}
- assertEquals( "Comparing '" + IdeUtils.getCanonicalPath( actualFile ) + "' against '"
- + IdeUtils.getCanonicalPath( expectedFile ) + "' at line #" + ( i + 1 ), expected, actual );
+ assertEquals(
+ "Comparing '" + IdeUtils.getCanonicalPath( actualFile ) + "' against '" + IdeUtils.getCanonicalPath(
+ expectedFile ) + "' at line #" + ( i + 1 ), expected, actual );
}
assertTrue( "Unequal number of lines.", expectedLines.size() == actualLines.size() );
}
@@ -632,7 +648,7 @@ public abstract class AbstractEclipsePlu
/**
* Preprocess the file so that equals comparison can be done. Preprocessing may vary based on filename.
*
- * @param file the file being processed
+ * @param file the file being processed
* @param variables if not null, then replace all keys with the corresponding values in the expected string.
* @return processed input
*/
@@ -685,7 +701,7 @@ public abstract class AbstractEclipsePlu
}
/**
- * @param str input string
+ * @param str input string
* @param variables map of variables (keys) and replacement value (values)
* @return the string with all variable values replaced.
*/
@@ -694,11 +710,12 @@ public abstract class AbstractEclipsePlu
String result = str;
if ( variables != null && !variables.isEmpty() )
{
- for (Object o : variables.entrySet()) {
+ for ( Object o : variables.entrySet() )
+ {
Entry entry = (Entry) o;
String variable = (String) entry.getKey();
String replacement = (String) entry.getValue();
- result = StringUtils.replace(result, variable, replacement);
+ result = StringUtils.replace( result, variable, replacement );
}
}
@@ -707,7 +724,7 @@ public abstract class AbstractEclipsePlu
protected void assertContains( String message, String full, String substring )
{
- if ( full == null || !full.contains(substring))
+ if ( full == null || !full.contains( substring ) )
{
StringBuilder buf = new StringBuilder();
if ( message != null )
@@ -724,7 +741,7 @@ public abstract class AbstractEclipsePlu
protected void assertDoesNotContain( String message, String full, String substring )
{
- if ( full == null || full.contains(substring))
+ if ( full == null || full.contains( substring ) )
{
StringBuilder buf = new StringBuilder();
if ( message != null )
@@ -778,22 +795,28 @@ public abstract class AbstractEclipsePlu
File[] allFiles = basedir.listFiles();
if ( allFiles != null )
{
- for (File currentFile : allFiles) {
- if (currentFile.isDirectory()) {
- if (currentFile.getName().equals(EXPECTED_DIRECTORY_NAME)) {
- expectedDirectories.add(currentFile);
- } else {
- subdirectories.add(currentFile);
+ for ( File currentFile : allFiles )
+ {
+ if ( currentFile.isDirectory() )
+ {
+ if ( currentFile.getName().equals( EXPECTED_DIRECTORY_NAME ) )
+ {
+ expectedDirectories.add( currentFile );
+ }
+ else
+ {
+ subdirectories.add( currentFile );
}
}
}
}
if ( !subdirectories.isEmpty() )
{
- for (Object subdirectory1 : subdirectories) {
+ for ( Object subdirectory1 : subdirectories )
+ {
File subdirectory = (File) subdirectory1;
- File[] subdirectoryFiles = getExpectedDirectories(subdirectory);
- expectedDirectories.addAll(Arrays.asList(subdirectoryFiles));
+ File[] subdirectoryFiles = getExpectedDirectories( subdirectory );
+ expectedDirectories.addAll( Arrays.asList( subdirectoryFiles ) );
}
}
return (File[]) expectedDirectories.toArray( new File[expectedDirectories.size()] );
@@ -811,20 +834,25 @@ public abstract class AbstractEclipsePlu
File[] allFiles = expectedDirectory.listFiles();
if ( allFiles != null )
{
- for (File currentFile : allFiles) {
- if (currentFile.isDirectory()) {
- subdirectories.add(currentFile);
- } else {
- expectedFiles.add(currentFile);
+ for ( File currentFile : allFiles )
+ {
+ if ( currentFile.isDirectory() )
+ {
+ subdirectories.add( currentFile );
+ }
+ else
+ {
+ expectedFiles.add( currentFile );
}
}
}
if ( !subdirectories.isEmpty() )
{
- for (Object subdirectory1 : subdirectories) {
+ for ( Object subdirectory1 : subdirectories )
+ {
File subdirectory = (File) subdirectory1;
- File[] subdirectoryFiles = getExpectedFilesToCompare(subdirectory);
- expectedFiles.addAll(Arrays.asList(subdirectoryFiles));
+ File[] subdirectoryFiles = getExpectedFilesToCompare( subdirectory );
+ expectedFiles.addAll( Arrays.asList( subdirectoryFiles ) );
}
}
@@ -836,8 +864,8 @@ public abstract class AbstractEclipsePlu
* relative path used to locate the file within the projectOutputDir.
*
* @param projectOutputDir the directory where the eclipse plugin writes files to
- * @param basedir the base dir of the project being tested
- * @param expectedFile the expected file used to compare to the actual file
+ * @param basedir the base dir of the project being tested
+ * @param expectedFile the expected file used to compare to the actual file
* @return the actual file needed for comparison against the expectedFile
* @throws MojoExecutionException failures for obtaining actual file.
*/
@@ -854,8 +882,7 @@ public abstract class AbstractEclipsePlu
catch ( IOException e )
{
throw new MojoExecutionException(
- Messages.getString(
- "EclipsePlugin.cantcanonicalize", actualFile.getAbsolutePath() ), e ); //$NON-NLS-1$
+ Messages.getString( "EclipsePlugin.cantcanonicalize", actualFile.getAbsolutePath() ), e ); //$NON-NLS-1$
}
}
@@ -888,10 +915,10 @@ public abstract class AbstractEclipsePlu
/**
* Return the not available marker file for the specified artifact details.
*
- * @param groupId group id of artifact
- * @param artifactId artifact id of artifact
- * @param version version of artifact
- * @param classifier the classifier of the artifact
+ * @param groupId group id of artifact
+ * @param artifactId artifact id of artifact
+ * @param version version of artifact
+ * @param classifier the classifier of the artifact
* @param inClassifier the sources/javadocs to be attached
* @return the not available marker file
* @throws Exception failures.
@@ -933,10 +960,10 @@ public abstract class AbstractEclipsePlu
/**
* Assert that the not available marker file exists for the specified artifact details.
*
- * @param groupId group id of artifact
- * @param artifactId artifact id of artifact
- * @param version version of artifact
- * @param classifier the classifier of the artifact
+ * @param groupId group id of artifact
+ * @param artifactId artifact id of artifact
+ * @param version version of artifact
+ * @param classifier the classifier of the artifact
* @param inClassifier the sources/javadocs to be attached
* @throws Exception failures
*/
@@ -951,10 +978,10 @@ public abstract class AbstractEclipsePlu
/**
* Assert that the not available marker file does not exist for the specified artifact details.
*
- * @param groupId group id of artifact
- * @param artifactId artifact id of artifact
- * @param version version of artifact
- * @param classifier the classifier of the artifact
+ * @param groupId group id of artifact
+ * @param artifactId artifact id of artifact
+ * @param version version of artifact
+ * @param classifier the classifier of the artifact
* @param inClassifier the sources/javadocs to be attached
* @throws Exception failures
*/
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java Tue Aug 27 14:16:42 2013
@@ -140,7 +140,7 @@ public class EclipseClasspathWriterUnitT
dependency.setAddedToClasspath( true );
dependency.setJavadocAttachment( new File( System.getProperty( "user.home" ), ".m2/some.jar" ) );
- config.setDeps( new IdeDependency[] { dependency } );
+ config.setDeps( new IdeDependency[]{ dependency } );
TestLog log = new TestLog();
@@ -153,12 +153,13 @@ public class EclipseClasspathWriterUnitT
Document doc = builder.build( new File( basedir, ".classpath" ) );
XPath javadocUrls = XPath.newInstance( "//attribute/@value" );
- for (Object o : javadocUrls.selectNodes(doc)) {
+ for ( Object o : javadocUrls.selectNodes( doc ) )
+ {
Attribute attribute = (Attribute) o;
- URL jarUrl = new URL(attribute.getValue());
- URL fileUrl = ((JarURLConnection) jarUrl.openConnection()).getJarFileURL();
+ URL jarUrl = new URL( attribute.getValue() );
+ URL fileUrl = ( (JarURLConnection) jarUrl.openConnection() ).getJarFileURL();
String host = fileUrl.getHost();
- assertTrue("Unexpected host: \"" + host + "\"", "".equals(host) || "localhost".equals(host));
+ assertTrue( "Unexpected host: \"" + host + "\"", "".equals( host ) || "localhost".equals( host ) );
}
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15WriterTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15WriterTest.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15WriterTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15WriterTest.java Tue Aug 27 14:16:42 2013
@@ -40,7 +40,7 @@ import org.jdom.xpath.XPath;
/**
* Component writer test for WTP 1.5.
- *
+ *
* @author Steffen Grunwald
*/
public class EclipseWtpComponent15WriterTest
@@ -63,10 +63,10 @@ public class EclipseWtpComponent15Writer
* <li>dep is referenced project
* </ul>
* The archivename is expected to be jar - independent from the packaging (ejb).
- *
+ *
* @throws MojoExecutionException Exception
- * @throws IOException Exception
- * @throws JDOMException Exception
+ * @throws IOException Exception
+ * @throws JDOMException Exception
*/
public void testWriteEjbComponentMECLIPSE455()
throws MojoExecutionException, IOException, JDOMException
@@ -91,7 +91,7 @@ public class EclipseWtpComponent15Writer
config.setPackaging( "ear" );
// add an ejb3 and ejb packaged dependency
- config.setDeps( new IdeDependency[] { createDep( "ejb" ), createDep( "jar" ) } );
+ config.setDeps( new IdeDependency[]{ createDep( "ejb" ), createDep( "jar" ) } );
EclipseWtpComponentWriter lWriter = new EclipseWtpComponent15Writer();
@@ -109,13 +109,14 @@ public class EclipseWtpComponent15Writer
XPath archiveNames = XPath.newInstance( "//dependent-module/@archiveName" );
assertEquals( "Must be 2 modules", 2, archiveNames.selectNodes( doc ).size() );
- for (Object o : archiveNames.selectNodes(doc)) {
+ for ( Object o : archiveNames.selectNodes( doc ) )
+ {
Attribute attribute = (Attribute) o;
String archiveName = attribute.getValue();
- String extension = archiveName.substring(archiveName.lastIndexOf(".") + 1).toLowerCase();
+ String extension = archiveName.substring( archiveName.lastIndexOf( "." ) + 1 ).toLowerCase();
- assertEquals("Must be of type jar", "jar", extension);
+ assertEquals( "Must be of type jar", "jar", extension );
}
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/pom.xml Tue Aug 27 14:16:42 2013
@@ -1,12 +1,13 @@
<?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">
+<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>
<parent>
<groupId>eclipse</groupId>
<artifactId>project-A</artifactId>
<version>1</version>
</parent>
- <artifactId>module-A1</artifactId>
+ <artifactId>module-A1</artifactId>
<version>1</version>
<name>Module A1</name>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/pom.xml Tue Aug 27 14:16:42 2013
@@ -1,12 +1,13 @@
<?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">
+<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>
<parent>
<groupId>eclipse</groupId>
<artifactId>project-A</artifactId>
<version>1</version>
</parent>
- <artifactId>module-A2</artifactId>
+ <artifactId>module-A2</artifactId>
<version>1</version>
<name>Module A2</name>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom Tue Aug 27 14:16:42 2013
@@ -1,6 +1,6 @@
<?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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipsetest</groupId>
@@ -8,7 +8,7 @@
<version>1.0</version>
</parent>
<packaging>jar</packaging>
- <artifactId>multymodule-1</artifactId>
+ <artifactId>multymodule-1</artifactId>
<version>1.0</version>
<name>multymodule-1</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom Tue Aug 27 14:16:42 2013
@@ -1,6 +1,6 @@
<?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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipsetest</groupId>
@@ -8,7 +8,7 @@
<version>1.0</version>
</parent>
<packaging>war</packaging>
- <artifactId>module-2</artifactId>
+ <artifactId>module-2</artifactId>
<version>1.0</version>
<name>module-2</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom Tue Aug 27 14:16:42 2013
@@ -1,6 +1,6 @@
<?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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipsetest</groupId>
@@ -8,7 +8,7 @@
<version>1.0</version>
</parent>
<packaging>jar</packaging>
- <artifactId>multymodule-4</artifactId>
+ <artifactId>multymodule-4</artifactId>
<version>1.0</version>
<name>multymodule-4</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.pom?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.pom (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.pom Tue Aug 27 14:16:42 2013
@@ -1,21 +1,21 @@
<?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>
- <parent>
- <groupId>eclipsetest</groupId>
- <artifactId>master-test</artifactId>
- <version>1.0</version>
- </parent>
- <packaging>war</packaging>
- <artifactId>multymodule-war</artifactId>
- <version>1.0</version>
- <name>multymodule-war</name>
- <dependencies>
- <dependency>
- <groupId>eclipsetest</groupId>
- <artifactId>direct-compile</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>eclipsetest</groupId>
+ <artifactId>master-test</artifactId>
+ <version>1.0</version>
+ </parent>
+ <packaging>war</packaging>
+ <artifactId>multymodule-war</artifactId>
+ <version>1.0</version>
+ <name>multymodule-war</name>
+ <dependencies>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-compile</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml Tue Aug 27 14:16:42 2013
@@ -1,5 +1,5 @@
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipse.project28</groupId>
@@ -7,7 +7,7 @@
<version>1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>war-test</artifactId>
+ <artifactId>war-test</artifactId>
<version>28</version>
<packaging>war</packaging>
<name>War Project</name>
@@ -18,7 +18,7 @@
<artifactId>maven-eclipse-plugin</artifactId>
<version>test</version>
<configuration>
- <workspace>${basedir}/../../eclipse/workspaceDoesNotExist</workspace>
+ <workspace>${basedir}/../../eclipse/workspaceDoesNotExist</workspace>
<wtpversion>1.5</wtpversion>
<wtpContextName>contextName</wtpContextName>
</configuration>
@@ -31,6 +31,6 @@
<warSourceDirectory>src/main/webapp</warSourceDirectory>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml Tue Aug 27 14:16:42 2013
@@ -1,6 +1,6 @@
<?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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipsetest</groupId>
@@ -8,7 +8,7 @@
<version>1.0</version>
</parent>
<packaging>jar</packaging>
- <artifactId>multymodule-1</artifactId>
+ <artifactId>multymodule-1</artifactId>
<version>1.0</version>
<name>multymodule-1</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml Tue Aug 27 14:16:42 2013
@@ -1,6 +1,6 @@
<?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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipsetest</groupId>
@@ -8,7 +8,7 @@
<version>1.0</version>
</parent>
<packaging>war</packaging>
- <artifactId>multymodule-2</artifactId>
+ <artifactId>multymodule-2</artifactId>
<version>1.0</version>
<name>multymodule-2</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml Tue Aug 27 14:16:42 2013
@@ -1,6 +1,6 @@
<?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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipsetest</groupId>
@@ -8,7 +8,7 @@
<version>1.0</version>
</parent>
<packaging>ear</packaging>
- <artifactId>multymodule-3</artifactId>
+ <artifactId>multymodule-3</artifactId>
<version>1.0</version>
<name>multymodule-3</name>
<build>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml Tue Aug 27 14:16:42 2013
@@ -1,6 +1,6 @@
<?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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipsetest</groupId>
@@ -8,7 +8,7 @@
<version>1.0</version>
</parent>
<packaging>jar</packaging>
- <artifactId>multymodule-4</artifactId>
+ <artifactId>multymodule-4</artifactId>
<version>1.0</version>
<name>multymodule-4</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml Tue Aug 27 14:16:42 2013
@@ -1,6 +1,6 @@
<?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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipsetest</groupId>
@@ -8,7 +8,7 @@
<version>1.0</version>
</parent>
<packaging>jar</packaging>
- <artifactId>multymodule-1</artifactId>
+ <artifactId>multymodule-1</artifactId>
<version>1.0</version>
<name>multymodule-1</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/pom.xml Tue Aug 27 14:16:42 2013
@@ -1,6 +1,6 @@
<?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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipsetest</groupId>
@@ -8,7 +8,7 @@
<version>1.0</version>
</parent>
<packaging>war</packaging>
- <artifactId>multymodule-2</artifactId>
+ <artifactId>multymodule-2</artifactId>
<version>1.0</version>
<name>multymodule-2</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/pom.xml Tue Aug 27 14:16:42 2013
@@ -1,6 +1,6 @@
<?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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eclipsetest</groupId>
@@ -8,7 +8,7 @@
<version>1.0</version>
</parent>
<packaging>ear</packaging>
- <artifactId>multymodule-3</artifactId>
+ <artifactId>multymodule-3</artifactId>
<version>1.0</version>
<name>multymodule-3</name>
<build>