Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java?rev=691404&r1=691403&r2=691404&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java Tue Sep 2 14:57:19 2008 @@ -157,8 +157,8 @@ String archiveName; // ejb's and wars must always be toplevel - if ( Constants.PROJECT_PACKAGING_WAR.equals( dep.getType() ) || - Constants.PROJECT_PACKAGING_EJB.equals( dep.getType() ) ) + if ( Constants.PROJECT_PACKAGING_WAR.equals( dep.getType() ) + || Constants.PROJECT_PACKAGING_EJB.equals( dep.getType() ) ) { deployPath = "/"; } @@ -202,8 +202,7 @@ if ( dep.isSystemScoped() ) { handle = "module:/classpath/lib/" //$NON-NLS-1$ - + - IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(), repoFile, false ); + + IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(), repoFile, false ); } else { @@ -213,14 +212,12 @@ if ( !new File( relativePath ).isAbsolute() ) { handle = "module:/classpath/var/M2_REPO/" //$NON-NLS-1$ - + - relativePath; + + relativePath; } else { handle = "module:/classpath/lib/" //$NON-NLS-1$ - + - IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(), repoFile, false ); + + IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(), repoFile, false ); } } if ( Constants.PROJECT_PACKAGING_EAR.equals( this.config.getPackaging() ) && !"/".equals( deployPath ) ) @@ -277,9 +274,9 @@ // NB war is needed for ear projects, we suppose nobody adds a war dependency to a war/jar project // exclude test and provided and system dependencies outside the project - if ( ( !dep.isTestDependency() && !dep.isProvided() && !dep.isSystemScopedOutsideProject( project ) ) && - ( Constants.PROJECT_PACKAGING_JAR.equals( type ) || Constants.PROJECT_PACKAGING_EJB.equals( type ) || - "ejb-client".equals( type ) || Constants.PROJECT_PACKAGING_WAR.equals( type ) ) ) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + if ( ( !dep.isTestDependency() && !dep.isProvided() && !dep.isSystemScopedOutsideProject( project ) ) + && ( Constants.PROJECT_PACKAGING_JAR.equals( type ) || Constants.PROJECT_PACKAGING_EJB.equals( type ) + || "ejb-client".equals( type ) || Constants.PROJECT_PACKAGING_WAR.equals( type ) ) ) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ { addDependency( writer, dep, localRepository, config.getProject().getBasedir(), deployDir ); }
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java?rev=691404&r1=691403&r2=691404&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java Tue Sep 2 14:57:19 2008 @@ -113,9 +113,9 @@ if ( Constants.PROJECT_PACKAGING_EAR.equalsIgnoreCase( packaging ) ) { File applicationXmlFile = - new File( this.config.getEclipseProjectDirectory(), "target" + File.separator + "eclipseEar" + - File.separator + "META-INF" + File.separator + - EclipseWtpApplicationXMLWriter.APPLICATION_XML_FILENAME ); + new File( this.config.getEclipseProjectDirectory(), "target" + File.separator + "eclipseEar" + + File.separator + "META-INF" + File.separator + + EclipseWtpApplicationXMLWriter.APPLICATION_XML_FILENAME ); // create the directory structiure for eclipse deployment applicationXmlFile.getParentFile().mkdirs(); // copy all deployment files to the eclipse deployment @@ -133,8 +133,8 @@ applicationXmlDom.getChildren( EclipseWtpApplicationXMLWriter.APPLICATION_XML_MODULE ); File modulemapsXmlFile = - new File( this.config.getEclipseProjectDirectory(), "target" + File.separator + "eclipseEar" + - File.separator + "META-INF" + File.separator + EclipseWtpApplicationXMLWriter.MODULEMAPS_FILENAME ); + new File( this.config.getEclipseProjectDirectory(), "target" + File.separator + "eclipseEar" + + File.separator + "META-INF" + File.separator + EclipseWtpApplicationXMLWriter.MODULEMAPS_FILENAME ); Xpp3Dom modulemapsXmlDom = readXMLFile( modulemapsXmlFile ); if ( modulemapsXmlDom == null ) { @@ -170,8 +170,8 @@ try { File applicationDirectory = - new File( this.config.getEclipseProjectDirectory(), "src" + File.separator + "main" + File.separator + - "application" ); + new File( this.config.getEclipseProjectDirectory(), "src" + File.separator + "main" + File.separator + + "application" ); File eclipseApplicationDirectory = new File( this.config.getEclipseProjectDirectory(), "target" + File.separator + "eclipseEar" ); copyDirectoryStructure( applicationDirectory, eclipseApplicationDirectory ); @@ -225,8 +225,8 @@ { if ( !destination.exists() && !destination.mkdirs() ) { - throw new IOException( "Could not create destination directory '" + destination.getAbsolutePath() + - "'." ); + throw new IOException( "Could not create destination directory '" + destination.getAbsolutePath() + + "'." ); } copyDirectoryStructure( file, destination ); @@ -322,24 +322,24 @@ dependency.getEclipseProjectName() ) ) { if ( ( dependency.getType().equals( Constants.PROJECT_PACKAGING_EJB ) || dependency.getType().equals( - "ejb3" ) ) && - children[index].getName().equals( EclipseWtpApplicationXMLWriter.MODULEMAPS_MAPPINGS ) && - children[index].getChild( EclipseWtpApplicationXMLWriter.APPLICATION_XML_MODULE ).getAttribute( - EclipseWtpApplicationXMLWriter.XMI_TYPE ).equals( - EclipseWtpApplicationXMLWriter.MODULEMAPS_APPLICATION_EJB_MODULE ) ) + "ejb3" ) ) + && children[index].getName().equals( EclipseWtpApplicationXMLWriter.MODULEMAPS_MAPPINGS ) + && children[index].getChild( EclipseWtpApplicationXMLWriter.APPLICATION_XML_MODULE ).getAttribute( + EclipseWtpApplicationXMLWriter.XMI_TYPE ).equals( + EclipseWtpApplicationXMLWriter.MODULEMAPS_APPLICATION_EJB_MODULE ) ) { return children[index]; } - else if ( dependency.getType().equals( Constants.PROJECT_PACKAGING_WAR ) && - children[index].getName().equals( EclipseWtpApplicationXMLWriter.MODULEMAPS_MAPPINGS ) && - children[index].getChild( EclipseWtpApplicationXMLWriter.APPLICATION_XML_MODULE ).getAttribute( - EclipseWtpApplicationXMLWriter.XMI_TYPE ).equals( - EclipseWtpApplicationXMLWriter.MODULEMAPS_APPLICATION_WEB_MODULE ) ) + else if ( dependency.getType().equals( Constants.PROJECT_PACKAGING_WAR ) + && children[index].getName().equals( EclipseWtpApplicationXMLWriter.MODULEMAPS_MAPPINGS ) + && children[index].getChild( EclipseWtpApplicationXMLWriter.APPLICATION_XML_MODULE ).getAttribute( + EclipseWtpApplicationXMLWriter.XMI_TYPE ).equals( + EclipseWtpApplicationXMLWriter.MODULEMAPS_APPLICATION_WEB_MODULE ) ) { return children[index]; } - else if ( dependency.getType().equals( Constants.PROJECT_PACKAGING_JAR ) && - children[index].getName().equals( EclipseWtpApplicationXMLWriter.MODULEMAPS_UTILITY_JARMAPPINGS ) ) + else if ( dependency.getType().equals( Constants.PROJECT_PACKAGING_JAR ) + && children[index].getName().equals( EclipseWtpApplicationXMLWriter.MODULEMAPS_UTILITY_JARMAPPINGS ) ) { return children[index]; } @@ -387,8 +387,8 @@ utilityJARMapping.setAttribute( EclipseWtpApplicationXMLWriter.XMI_ID, "UtilityJARMapping_" + id ); utilityJARMapping.setAttribute( EclipseWtpApplicationXMLWriter.MODULEMAPS_PROJECT_NAME, dependency.getEclipseProjectName() ); - utilityJARMapping.setAttribute( EclipseWtpApplicationXMLWriter.URI, dependency.getEclipseProjectName() + - ".jar" ); + utilityJARMapping.setAttribute( EclipseWtpApplicationXMLWriter.URI, dependency.getEclipseProjectName() + + ".jar" ); modulemapXmlDom.addChild( utilityJARMapping ); return utilityJARMapping; } @@ -511,8 +511,8 @@ */ private void updateApplicationXml( Xpp3Dom applicationXmlDom, Xpp3Dom modulemapXmlDom, IdeDependency dependency ) { - if ( dependency.isTestDependency() || dependency.isProvided() || - dependency.isSystemScopedOutsideProject( this.config.getProject() ) ) + if ( dependency.isTestDependency() || dependency.isProvided() + || dependency.isSystemScopedOutsideProject( this.config.getProject() ) ) { return; } @@ -559,8 +559,8 @@ handled( module ); module.getChild( EclipseWtpApplicationXMLWriter.APPLICATION_XML_WEB ).getChild( EclipseWtpApplicationXMLWriter.APPLICATION_XML_WEB_URI ).setValue( - dependency.getEclipseProjectName() + - ".war" ); + dependency.getEclipseProjectName() + + ".war" ); module.getChild( EclipseWtpApplicationXMLWriter.APPLICATION_XML_WEB ).getChild( EclipseWtpApplicationXMLWriter.APPLICATION_XML_CONTEXT_ROOT ).setValue( contextRootInPom ); @@ -584,8 +584,8 @@ Xpp3Dom webArtifactId = this.webModulesFromPoms[index].getChild( "artifactId" ); Xpp3Dom webContextRoot = this.webModulesFromPoms[index].getChild( "contextRoot" ); - if ( webContextRoot != null && webArtifactId != null && webArtifactId.getValue().equals( artifactId ) && - webGroupId != null && webGroupId.getValue().equals( groupId ) ) + if ( webContextRoot != null && webArtifactId != null && webArtifactId.getValue().equals( artifactId ) + && webGroupId != null && webGroupId.getValue().equals( groupId ) ) { return webContextRoot.getValue(); } Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponent15Writer.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponent15Writer.java?rev=691404&r1=691403&r2=691404&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponent15Writer.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponent15Writer.java Tue Sep 2 14:57:19 2008 @@ -21,8 +21,8 @@ import org.codehaus.plexus.util.xml.XMLWriter; /** - * Component writer for WTP 1.5. File name has changed in WTP 1.5rc2 and the <code>project-version</code> attribute - * has been added. These ones are the only differences + * Component writer for WTP 1.5. File name has changed in WTP 1.5rc2 and the <code>project-version</code> attribute has + * been added. These ones are the only differences * * @author Fabrizio Giustina * @version $Id$ Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java?rev=691404&r1=691403&r2=691404&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java Tue Sep 2 14:57:19 2008 @@ -158,8 +158,7 @@ writer.startElement( ELT_PROPERTY ); writer.addAttribute( ATTR_NAME, "java-output-path" ); //$NON-NLS-1$ writer.addAttribute( ATTR_VALUE, "/" //$NON-NLS-1$ - + - IdeUtils.toRelativeAndFixSeparator( config.getProject().getBasedir(), buildOutputDirectory, false ) ); + + IdeUtils.toRelativeAndFixSeparator( config.getProject().getBasedir(), buildOutputDirectory, false ) ); writer.endElement(); // property } @@ -181,8 +180,8 @@ writer.endElement(); } - if ( Constants.PROJECT_PACKAGING_WAR.equalsIgnoreCase( packaging ) || - Constants.PROJECT_PACKAGING_EAR.equalsIgnoreCase( packaging ) ) //$NON-NLS-1$ //$NON-NLS-2$ + if ( Constants.PROJECT_PACKAGING_WAR.equalsIgnoreCase( packaging ) + || Constants.PROJECT_PACKAGING_EAR.equalsIgnoreCase( packaging ) ) //$NON-NLS-1$ //$NON-NLS-2$ { // write out the dependencies. writeWarOrEarResources( writer, config.getProject(), localRepository ); Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java?rev=691404&r1=691403&r2=691404&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java Tue Sep 2 14:57:19 2008 @@ -180,8 +180,8 @@ /** * Writes a facet <code>installed</code> element with attribute <code>facet</code> set to the value of argument - * <code>facetName</code>, and attribute <code>version</code> set to the value of argument - * <code>facetVersion</code>. + * <code>facetName</code>, and attribute <code>version</code> set to the value of argument <code>facetVersion</code> + * . * * @param writer * @param facetName Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.java?rev=691404&r1=691403&r2=691404&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.java Tue Sep 2 14:57:19 2008 @@ -91,9 +91,8 @@ writer.startElement( ELT_WB_RESOURCE ); writer.addAttribute( ATTR_DEPLOY_PATH, "/" ); //$NON-NLS-1$ writer.addAttribute( ATTR_SOURCE_PATH, "/" //$NON-NLS-1$ - + - IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(), - new File( warSourceDirectory ), false ) ); + + IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(), + new File( warSourceDirectory ), false ) ); writer.endElement(); writeWarOrEarResources( writer, config.getProject(), config.getLocalRepository() ); Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java?rev=691404&r1=691403&r2=691404&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java Tue Sep 2 14:57:19 2008 @@ -70,8 +70,8 @@ /** * Abstract base plugin which takes care of the common stuff usually needed by maven IDE plugins. A plugin extending - * AbstractIdeSupportMojo should implement the <code>setup()</code> and <code>writeConfiguration()</code> methods, - * plus the getters needed to get the various configuration flags and required components. The lifecycle: + * AbstractIdeSupportMojo should implement the <code>setup()</code> and <code>writeConfiguration()</code> methods, plus + * the getters needed to get the various configuration flags and required components. The lifecycle: * * <pre> * *** calls setup() where you can configure your specific stuff and stop the mojo from execute if appropriate *** @@ -190,8 +190,8 @@ /** * Enables/disables the downloading of source attachments. Defaults to false. When this flag is <code>true</code> * remote repositories are checked for sources: in order to avoid repeated check for unavailable source archives, a - * status cache is mantained into the target dir of the root project. Run <code>mvn:clean</code> or delete the - * file <code>mvn-eclipse-cache.properties</code> in order to reset this cache. + * status cache is mantained into the target dir of the root project. Run <code>mvn:clean</code> or delete the file + * <code>mvn-eclipse-cache.properties</code> in order to reset this cache. * * @parameter expression="${downloadSources}" */ @@ -614,9 +614,9 @@ } } - if ( includeArtifact && - ( !( getUseProjectReferences() && isAvailableAsAReactorProject( art ) ) || emittedReactorProjectId.add( art.getGroupId() + - '-' + art.getArtifactId() ) ) ) + if ( includeArtifact + && ( !( getUseProjectReferences() && isAvailableAsAReactorProject( art ) ) || emittedReactorProjectId.add( art.getGroupId() + + '-' + art.getArtifactId() ) ) ) { // the following doesn't work: art.getArtifactHandler().getPackaging() always returns "jar" @@ -802,8 +802,8 @@ { MavenProject reactorProject = (MavenProject) iter.next(); - if ( reactorProject.getGroupId().equals( artifact.getGroupId() ) && - reactorProject.getArtifactId().equals( artifact.getArtifactId() ) ) + if ( reactorProject.getGroupId().equals( artifact.getGroupId() ) + && reactorProject.getArtifactId().equals( artifact.getArtifactId() ) ) { if ( reactorProject.getVersion().equals( artifact.getVersion() ) ) { @@ -812,10 +812,10 @@ else { getLog().info( - "Artifact " + - artifact.getId() + - " already available as a reactor project, but with different version. Expected: " + - artifact.getVersion() + ", found: " + reactorProject.getVersion() ); + "Artifact " + + artifact.getId() + + " already available as a reactor project, but with different version. Expected: " + + artifact.getVersion() + ", found: " + reactorProject.getVersion() ); } } } @@ -890,8 +890,8 @@ /** * Resolve source artifacts and download them if <code>downloadSources</code> is <code>true</code>. Source and * javadocs artifacts will be attached to the <code>IdeDependency</code> Resolve source and javadoc artifacts. The - * resolved artifacts will be downloaded based on the <code>downloadSources</code> and - * <code>downloadJavadocs</code> attributes. Source and + * resolved artifacts will be downloaded based on the <code>downloadSources</code> and <code>downloadJavadocs</code> + * attributes. Source and * * @param deps resolved dependencies */ @@ -955,8 +955,8 @@ } /** - * Resolve the required artifacts for each of the dependency. <code>sources</code> or <code>javadoc</code> - * artifacts (depending on the <code>classifier</code>) are attached to the dependency. + * Resolve the required artifacts for each of the dependency. <code>sources</code> or <code>javadoc</code> artifacts + * (depending on the <code>classifier</code>) are attached to the dependency. * * @param deps resolved dependencies * @param inClassifier the classifier we are looking for (either <code>sources</code> or <code>javadoc</code>) @@ -987,13 +987,13 @@ if ( getLog().isDebugEnabled() ) { getLog().debug( - "Searching for sources for " + dependency.getId() + ":" + dependency.getClassifier() + - " at " + dependency.getId() + ":" + inClassifier ); + "Searching for sources for " + dependency.getId() + ":" + dependency.getClassifier() + + " at " + dependency.getId() + ":" + inClassifier ); } String key = - dependency.getClassifier() == null ? dependency.getId() + ":" + inClassifier : dependency.getId() + - ":" + inClassifier + ":" + dependency.getClassifier(); + dependency.getClassifier() == null ? dependency.getId() + ":" + inClassifier : dependency.getId() + ":" + + inClassifier + ":" + dependency.getClassifier(); if ( !unavailableArtifactsCache.containsKey( key ) ) { Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeDependency.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeDependency.java?rev=691404&r1=691403&r2=691404&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeDependency.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeDependency.java Tue Sep 2 14:57:19 2008 @@ -108,12 +108,12 @@ * The ajdt weave dependency */ private boolean ajdtWeaveDependency; - + /** * The ajdt dependency. */ private boolean ajdtDependency; - + /** * Creates an uninitialized instance */ @@ -573,14 +573,14 @@ return isSystemScoped() && !getFile().getAbsolutePath().startsWith( modulesTop.getAbsolutePath() ); } - /** - * @return <tt>true</tt> if this dependency is a Java API - */ - public boolean isJavaApi() - { - return groupId.startsWith( "java." ) || groupId.startsWith( "javax." ); - } - + /** + * @return <tt>true</tt> if this dependency is a Java API + */ + public boolean isJavaApi() + { + return groupId.startsWith( "java." ) || groupId.startsWith( "javax." ); + } + /** * [EMAIL PROTECTED] */ 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=691404&r1=691403&r2=691404&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 Sep 2 14:57:19 2008 @@ -97,7 +97,7 @@ /** * Returns a compiler plugin settings, considering also settings altered in plugin executions . - * + * * @param project maven project * @return option value (may be null) */ @@ -116,7 +116,7 @@ /** * Returns the source version configured for the compiler plugin. Returns the minimum version required to compile * both standard and test sources, if settings are different. - * + * * @param project maven project * @return java source version */ @@ -128,7 +128,7 @@ /** * Returns the target version configured for the compiler plugin. Returns the minimum version required to compile * both standard and test sources, if settings are different. - * + * * @param project maven project * @return java target version */ @@ -164,7 +164,7 @@ /** * Extracts the version of the first matching artifact in the given list. - * + * * @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 @@ -191,7 +191,7 @@ /** * 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 @@ -211,7 +211,7 @@ /** * 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 pluginId the group id and artifact id of the plugin to search for @@ -231,7 +231,7 @@ /** * 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 artifactId the artifact id of the plugin to search for @@ -245,8 +245,8 @@ 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 ( Iterator childElement = configurationDomList.iterator(); childElement.hasNext(); ) @@ -277,7 +277,7 @@ /** * Use the project name template to create an eclipse project. - * + * * @param template Template for the project name * @param artifact the artifact to create the project name for * @return the created ide project name @@ -427,7 +427,7 @@ /** * Returns a compiler plugin settings from a list of plugins . - * + * * @param project maven project * @return option value (may be null) */ Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java?rev=691404&r1=691403&r2=691404&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java Tue Sep 2 14:57:19 2008 @@ -87,8 +87,7 @@ File pom = new File( basedir, "pom.xml" ); project.setFile( pom ); - EclipseSourceDir[] result = - newMojo().buildDirectoryList( project, basedir, new File( "target/classes" ) ); + EclipseSourceDir[] result = newMojo().buildDirectoryList( project, basedir, new File( "target/classes" ) ); assertEquals( "should have added 1 resource.", 1, result.length ); @@ -136,8 +135,8 @@ String prefix = "target/classes/"; - assertTrue( "output directory should end with: " + prefix + resOutput + "\nWas: " + path, - path.endsWith( prefix + resOutput ) ); + assertTrue( "output directory should end with: " + prefix + resOutput + "\nWas: " + path, path.endsWith( prefix + + resOutput ) ); } public void testExtractResourceDirs_ShouldUseSpecifiedOutputDirectory() 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=691404&r1=691403&r2=691404&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 Sep 2 14:57:19 2008 @@ -199,8 +199,8 @@ if ( resource == null ) { - throw new IllegalStateException( "Cannot find test source jar: (m2repo|M2REPO)" + SOURCE_PATH + - " in context classloader!" ); + throw new IllegalStateException( "Cannot find test source jar: (m2repo|M2REPO)" + SOURCE_PATH + + " in context classloader!" ); } sourceFile = new File( resource.getPath() ); 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=691404&r1=691403&r2=691404&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 Sep 2 14:57:19 2008 @@ -139,8 +139,8 @@ 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" ); installed = true; } @@ -320,8 +320,8 @@ projectOutputDir = new File( outputDir, project.getArtifactId() ); } - compareDirectoryContent( basedir, projectOutputDir, EclipseWorkspaceWriter.ECLIPSE_CORE_RUNTIME_SETTINGS_DIR + - "/" ); + compareDirectoryContent( basedir, projectOutputDir, EclipseWorkspaceWriter.ECLIPSE_CORE_RUNTIME_SETTINGS_DIR + + "/" ); } @@ -397,9 +397,9 @@ { } - 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 ); } } @@ -493,8 +493,8 @@ if ( actualLines.size() <= i ) { - fail( "Too few lines in the actual file. Was " + actualLines.size() + ", expected: " + - expectedLines.size() ); + fail( "Too few lines in the actual file. Was " + actualLines.size() + ", expected: " + + expectedLines.size() ); } String actual = actualLines.get( i ).toString(); Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java?rev=691404&r1=691403&r2=691404&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java Tue Sep 2 14:57:19 2008 @@ -597,8 +597,8 @@ testProject( project, properties, "clean", "eclipse" ); Xpp3Dom classpath = - Xpp3DomBuilder.build( new FileReader( getTestFile( "target/test-classes/projects/" + project + - "/.classpath" ) ) ); + Xpp3DomBuilder.build( new FileReader( getTestFile( "target/test-classes/projects/" + project + + "/.classpath" ) ) ); boolean foundDirectCompileAsProject = false; String foundJRE = ""; Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java?rev=691404&r1=691403&r2=691404&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java Tue Sep 2 14:57:19 2008 @@ -55,7 +55,7 @@ * \ | * \ +----------------+ +-----------------+ +-----------------+ * \| module 2 (war) | ----> | direct | ----> | deps-direct | - * +----------------+ +-----------------+ +-----------------+ + * +----------------+ +-----------------+ +-----------------+ * * </pre> * Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java?rev=691404&r1=691403&r2=691404&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java Tue Sep 2 14:57:19 2008 @@ -30,12 +30,12 @@ { private static final String ECLIPSE_JDT_CORE_PREFS_PATH = - EclipseWorkspaceWriter.ECLIPSE_CORE_RUNTIME_SETTINGS_DIR + "/" + - EclipseWorkspaceWriter.ECLIPSE_JDT_CORE_PREFS_FILE; + EclipseWorkspaceWriter.ECLIPSE_CORE_RUNTIME_SETTINGS_DIR + "/" + + EclipseWorkspaceWriter.ECLIPSE_JDT_CORE_PREFS_FILE; private static final String ECLIPSE_JDT_UI_PREFS_PATH = - EclipseWorkspaceWriter.ECLIPSE_CORE_RUNTIME_SETTINGS_DIR + "/" + - EclipseWorkspaceWriter.ECLIPSE_JDT_UI_PREFS_FILE; + EclipseWorkspaceWriter.ECLIPSE_CORE_RUNTIME_SETTINGS_DIR + "/" + + EclipseWorkspaceWriter.ECLIPSE_JDT_UI_PREFS_FILE; protected void setUp() throws Exception Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java?rev=691404&r1=691403&r2=691404&view=diff ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java Tue Sep 2 14:57:19 2008 @@ -54,7 +54,7 @@ /** * Simple project with additionalConfig - * + * * @throws Exception */ public void testMyEclipseProject05()
