You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2009/07/28 02:17:01 UTC
svn commit: r798342 [1/2] - in /maven/plugins/trunk/maven-eclipse-plugin/src:
main/java/org/apache/maven/plugin/eclipse/
main/java/org/apache/maven/plugin/eclipse/reader/
main/java/org/apache/maven/plugin/eclipse/writers/
main/java/org/apache/maven/plu...
Author: aheritier
Date: Tue Jul 28 00:17:00 2009
New Revision: 798342
URL: http://svn.apache.org/viewvc?rev=798342&view=rev
Log:
Apply eclipse formatting rules
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/InstallPluginsMojoTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseAjdtPluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocationsTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriterTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15WriterTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=798342&r1=798341&r2=798342&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Tue Jul 28 00:17:00 2009
@@ -83,7 +83,7 @@
* @execute phase="generate-resources"
*/
public class EclipsePlugin
-extends AbstractIdeSupportMojo
+ extends AbstractIdeSupportMojo
{
private static final String WEAVE_DEPENDENCY = "weaveDependency";
@@ -143,10 +143,10 @@
// warning, order is important for binary search
public static final String[] WTP_SUPPORTED_VERSIONS = new String[] { "1.0", "1.5", "2.0", "R7", "none" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
+
public static final String ASPECTJ_FILE_PATTERN = "**/*.aj";
-
- public static final String JAVA_FILE_PATTERN = "**/*.java";
+
+ public static final String JAVA_FILE_PATTERN = "**/*.java";
/**
* Constant for 'artifactId' element in POM.xml.
@@ -486,9 +486,8 @@
* This eclipse workspace is read and all artifacts detected there will be connected as eclipse projects and will
* not be linked to the jars in the local repository. Requirement is that it was created with the similar wtp
* settings as the reactor projects, but the project name template my differ. The pom's in the workspace projects
- * may not contain variables in the artefactId, groupId and version tags.
- *
- * If workspace is not defined, then an attempt to locate it by checking up the directory hierarchy will be made.
+ * may not contain variables in the artefactId, groupId and version tags. If workspace is not defined, then an
+ * attempt to locate it by checking up the directory hierarchy will be made.
*
* @since 2.5
* @parameter expression="${eclipse.workspace}"
@@ -510,20 +509,19 @@
* @parameter expression="${eclipse.ajdtVersion}" default-value="1.5"
*/
private String ajdtVersion;
-
+
/**
- * List of exclusions to add to the source directories on the classpath.
- * Adds excluding="" to the classpathentry of the eclipse .classpath file.
- * [MECLIPSE-104]
+ * List of exclusions to add to the source directories on the classpath. Adds excluding="" to the classpathentry of
+ * the eclipse .classpath file. [MECLIPSE-104]
*
* @since 2.6.1
- * @parameter
+ * @parameter
*/
private List sourceExcludes;
-
+
/**
- * List of inclusions to add to the source directories on the classpath.
- * Adds including="" to the classpathentry of the eclipse .classpath file.
+ * List of inclusions to add to the source directories on the classpath. Adds including="" to the classpathentry of
+ * the eclipse .classpath file.
* <p>
* Java projects will always include "**/*.java"
* <p>
@@ -535,35 +533,18 @@
* @parameter
*/
private List sourceIncludes;
-
+
/**
- * A list of links to local files in the system.
- * A configuration like this one in the pom :
- *
- * <plugin>
- * <groupId>org.apache.maven.plugins</groupId>
- * <artifactId>maven-eclipse-plugin</artifactId>
- * <configuration>
- * <linkedResources>
- * <linkedResource>
- * <name>src/test/resources/oracle-ds.xml</name>
- * <type>1</type>
- * <location>C://jboss/server/default/deploy/oracle-ds.xml</location>
- * </linkedResource>
- * </linkedResources>
- * </configuration>
- * </plugin>
+ * A list of links to local files in the system. A configuration like this one in the pom : <plugin>
+ * <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId>
+ * <configuration> <linkedResources> <linkedResource>
+ * <name>src/test/resources/oracle-ds.xml</name> <type>1</type>
+ * <location>C://jboss/server/default/deploy/oracle-ds.xml</location> </linkedResource>
+ * </linkedResources> </configuration> </plugin> will produce in the .project :
+ * <linkedResources> <link> <name>src/test/resources/oracle-ds.xml</name>
+ * <type>1</type> <location>C://jboss/server/default/deploy/oracle-ds.xml</location>
+ * </link> </linkedResources>
*
- * will produce in the .project :
- *
- * <linkedResources>
- * <link>
- * <name>src/test/resources/oracle-ds.xml</name>
- * <type>1</type>
- * <location>C://jboss/server/default/deploy/oracle-ds.xml</location>
- * </link>
- * </linkedResources>
- *
* @since 2.8
* @parameter
*/
@@ -810,7 +791,7 @@
{
this.projectNameTemplate = projectNameTemplate;
}
-
+
/**
* @return the linkedResources
*/
@@ -836,8 +817,9 @@
boolean ready = true;
checkDeprecations();
- setProjectNameTemplate( IdeUtils.calculateProjectNameTemplate( getProjectNameTemplate(), isAddVersionToProjectName(),
- isAddGroupIdToProjectName(), getLog() ) );
+ setProjectNameTemplate( IdeUtils.calculateProjectNameTemplate( getProjectNameTemplate(),
+ isAddVersionToProjectName(),
+ isAddGroupIdToProjectName(), getLog() ) );
ajdt = enableAjdt( executedProject ) && !ajdtVersion.equals( "none" );
ready = validate();
@@ -850,20 +832,24 @@
pde
|| ( Constants.LANGUAGE_JAVA.equals( artifactHandler.getLanguage() ) && !Constants.PROJECT_PACKAGING_EAR.equals( packaging ) );
- if ( sourceIncludes == null ) {
+ if ( sourceIncludes == null )
+ {
sourceIncludes = new ArrayList();
}
- if ( isJavaProject ) {
+ if ( isJavaProject )
+ {
sourceIncludes.add( JAVA_FILE_PATTERN );
}
- if ( ajdt ) {
+ if ( ajdt )
+ {
sourceIncludes.add( ASPECTJ_FILE_PATTERN );
}
- if ( sourceExcludes == null ) {
+ if ( sourceExcludes == null )
+ {
sourceExcludes = new ArrayList();
}
-
+
setupExtras();
parseConfigurationOptions();
@@ -902,11 +888,12 @@
{
verifyClasspathContainerListIsComplete();
}
-
- if ( linkedResources == null ) {
+
+ if ( linkedResources == null )
+ {
linkedResources = new ArrayList();
}
-
+
locator.addSearchPath( FileResourceLoader.ID, project.getFile().getParentFile().getAbsolutePath() );
locator.setOutputDirectory( new File( project.getBuild().getDirectory() ) );
@@ -915,8 +902,8 @@
}
/**
- * Convert any Strings in the <code>commands</code> List to <code>BuildCommand</code>s. The conversion happens
- * in situ.
+ * Convert any Strings in the <code>commands</code> List to <code>BuildCommand</code>s. The conversion happens in
+ * situ.
*
* @param commands a list of commands to convert into <code>BuildCommand</code>
*/
@@ -1062,7 +1049,8 @@
*
* @throws MojoExecutionException mojo failures.
*/
- protected void validateExtras() throws MojoExecutionException
+ protected void validateExtras()
+ throws MojoExecutionException
{
// provided for extension.
}
@@ -1098,7 +1086,7 @@
if ( wtpmanifest && isJavaProject() )
{
- // NOTE: This could change the config!
+ // NOTE: This could change the config!
EclipseManifestWriter.addManifestResource( getLog(), config );
}
// NOTE: This could change the config!
@@ -1370,7 +1358,8 @@
/**
* Write any extra configuration information for the Eclipse project. This is an extension point, called before the
- * main configurations are written. <br/> <b> NOTE: This could change the config! </b>
+ * main configurations are written. <br/>
+ * <b> NOTE: This could change the config! </b>
*
* @param config
* @throws MojoExecutionException
@@ -1389,7 +1378,7 @@
throw new MojoExecutionException( Messages.getString( "EclipsePlugin.missingelement", elementName ) ); //$NON-NLS-1$
}
}
-
+
/**
* Fill getProjectnatures() with values.
* <p>
@@ -1397,7 +1386,7 @@
* <code>getProjectnatures().addAll()</code>.
*
* @param packaging the pom's packaging
- */
+ */
protected void fillDefaultNatures( String packaging )
{
projectnatures = new ArrayList();
@@ -1590,13 +1579,14 @@
IdeUtils.toRelativeAndFixSeparator( projectBaseDir, sourceRootFile,
!projectBaseDir.equals( basedir ) );
- directories.add( new EclipseSourceDir( sourceRoot, output, false, test, sourceIncludes, sourceExcludes, false ) );
+ directories.add( new EclipseSourceDir( sourceRoot, output, false, test, sourceIncludes, sourceExcludes,
+ false ) );
}
}
}
final void extractResourceDirs( Set directories, List resources, File basedir, File workspaceProjectBaseDir,
- boolean test, final String output )
+ boolean test, final String output )
throws MojoExecutionException
{
for ( Iterator it = resources.iterator(); it.hasNext(); )
@@ -1649,11 +1639,13 @@
thisOutput = IdeUtils.toRelativeAndFixSeparator( workspaceProjectBaseDir, outputFile, false );
}
- EclipseSourceDir resourceDir = new EclipseSourceDir( resourcePath, thisOutput, true, test, resource.getIncludes(), excludes,
- resource.isFiltering() );
+ EclipseSourceDir resourceDir =
+ new EclipseSourceDir( resourcePath, thisOutput, true, test, resource.getIncludes(), excludes,
+ resource.isFiltering() );
- if (!directories.add( resourceDir )) {
- EclipseSourceDir originalDir = (EclipseSourceDir) get(directories, resourceDir);
+ if ( !directories.add( resourceDir ) )
+ {
+ EclipseSourceDir originalDir = (EclipseSourceDir) get( directories, resourceDir );
getLog().info(
"Resource directory's path matches an existing source directory. Resources will be merged with the source directory "
+ originalDir.getPath() );
@@ -1661,21 +1653,23 @@
}
}
}
-
+
/**
- * java.util.Set doesn't have a get() method that returns the matching object.
- * Since we use objects that are different by conceptually "equal" based
- * on the path we need to locate the original object out of the Set.
- *
+ * java.util.Set doesn't have a get() method that returns the matching object. Since we use objects that are
+ * different by conceptually "equal" based on the path we need to locate the original object out of the Set.
+ *
* @param set the set to iterate over looking for the specified object
* @param o the object to locate in the set
* @return the object from the set, or null if not found in the set
*/
- private Object get(Set set, Object o) {
+ private Object get( Set set, Object o )
+ {
Iterator iter = set.iterator();
- while ( iter.hasNext() ) {
+ while ( iter.hasNext() )
+ {
Object item = iter.next();
- if (o.equals( item )) {
+ if ( o.equals( item ) )
+ {
return item;
}
}
@@ -1703,7 +1697,8 @@
IdeUtils.toRelativeAndFixSeparator( projectBaseDir, aspectDirectoryFile,
!projectBaseDir.equals( basedir ) );
- directories.add( new EclipseSourceDir( sourceRoot, null, false, false, sourceIncludes, sourceExcludes, false ) );
+ directories.add( new EclipseSourceDir( sourceRoot, null, false, false, sourceIncludes, sourceExcludes,
+ false ) );
}
String testAspectDirectory = DEFAULT_TEST_ASPECT_DIRECTORY;
@@ -1720,7 +1715,8 @@
IdeUtils.toRelativeAndFixSeparator( projectBaseDir, testAspectDirectoryFile,
!projectBaseDir.equals( basedir ) );
- directories.add( new EclipseSourceDir( sourceRoot, testOutput, false, true, sourceIncludes, sourceExcludes, false ) );
+ directories.add( new EclipseSourceDir( sourceRoot, testOutput, false, true, sourceIncludes,
+ sourceExcludes, false ) );
}
}
}
@@ -1818,7 +1814,7 @@
}
}
}
-
+
/**
* {@inheritDoc}
*/
@@ -1839,15 +1835,16 @@
}
}
MavenProject reactorProject = getReactorProject( artifact );
- if ( reactorProject != null ) {
+ if ( reactorProject != null )
+ {
return IdeUtils.getProjectName( getProjectNameTemplateForMavenProject( reactorProject ), artifact );
}
return IdeUtils.getProjectName( getProjectNameTemplate(), artifact );
}
-
+
/**
* @param mavenProject the project to get the projectNameTemplate configuration from
- * @return the projectNameTemplate configuration from the specified MavenProject
+ * @return the projectNameTemplate configuration from the specified MavenProject
*/
private String getProjectNameTemplateForMavenProject( MavenProject mavenProject )
{
@@ -1876,7 +1873,8 @@
}
}
}
- return IdeUtils.calculateProjectNameTemplate(projectNameTemplate, addVersionToProjectName, addGroupIdToProjectName, getLog());
+ return IdeUtils.calculateProjectNameTemplate( projectNameTemplate, addVersionToProjectName,
+ addGroupIdToProjectName, getLog() );
}
/**
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java?rev=798342&r1=798341&r2=798342&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java Tue Jul 28 00:17:00 2009
@@ -113,7 +113,7 @@
* Getter for <code>include</code>.
*
* @return Returns the include. Never null.
- */
+ */
public List getInclude()
{
return this.include;
@@ -134,7 +134,7 @@
}
/**
- * @return Returns the exclude as a string pattern suitable for eclipse
+ * @return Returns the exclude as a string pattern suitable for eclipse
*/
public String getExcludeAsString()
{
@@ -142,7 +142,7 @@
}
/**
- * @return Returns the include as a string pattern suitable for eclipse
+ * @return Returns the include as a string pattern suitable for eclipse
*/
public String getIncludeAsString()
{
@@ -182,8 +182,7 @@
}
/**
- * Setter for <code>path</code>.
- * Converts \\ to / in path.
+ * Setter for <code>path</code>. Converts \\ to / in path.
*
* @param path The path to set.
*/
@@ -259,8 +258,8 @@
* {@inheritDoc}
*/
public String toString()
- {
- StringBuffer buffer = new StringBuffer();
+ {
+ StringBuffer buffer = new StringBuffer();
buffer.append( ( isResource ? "re" : "" ) + "source " );
buffer.append( path );
buffer.append( ": " );
@@ -269,7 +268,7 @@
buffer.append( "exclude=[" ).append( getExcludeAsString() ).append( "], " );
buffer.append( "test=" ).append( test ).append( ", " );
buffer.append( "filtering=" ).append( filtering );
- return buffer.toString();
+ return buffer.toString();
}
/**
@@ -287,7 +286,8 @@
* No support for cases where the test, or filtering values are not identical.
*
* @param mergeWith the directory to merge with
- * @throws MojoExecutionException test or filtering values are not identical, or isResource true and output are not identical
+ * @throws MojoExecutionException test or filtering values are not identical, or isResource true and output are not
+ * identical
*/
public void merge( EclipseSourceDir mergeWith )
throws MojoExecutionException
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java?rev=798342&r1=798341&r2=798342&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java Tue Jul 28 00:17:00 2009
@@ -184,14 +184,18 @@
if ( !eclipseDir.isDirectory() )
{
- throw new MojoFailureException( Messages.getString( "EclipseToMavenMojo.directoydoesnotexist", eclipseDir.getAbsolutePath() ) ); //$NON-NLS-1$
+ throw new MojoFailureException(
+ Messages.getString(
+ "EclipseToMavenMojo.directoydoesnotexist", eclipseDir.getAbsolutePath() ) ); //$NON-NLS-1$
}
File pluginDir = new File( eclipseDir, "plugins" ); //$NON-NLS-1$
if ( !pluginDir.isDirectory() )
{
- throw new MojoFailureException( Messages.getString( "EclipseToMavenMojo.plugindirectorydoesnotexist", pluginDir.getAbsolutePath() ) ); //$NON-NLS-1$
+ throw new MojoFailureException(
+ Messages.getString(
+ "EclipseToMavenMojo.plugindirectorydoesnotexist", pluginDir.getAbsolutePath() ) ); //$NON-NLS-1$
}
File[] files = pluginDir.listFiles();
@@ -218,7 +222,9 @@
int i = 1;
for ( Iterator it = plugins.keySet().iterator(); it.hasNext(); )
{
- getLog().info( Messages.getString("EclipseToMavenMojo.processingplugin", new Object[] { new Integer( i++ ), new Integer( plugins.keySet().size() ) } ) ); //$NON-NLS-1$
+ getLog().info(
+ Messages.getString(
+ "EclipseToMavenMojo.processingplugin", new Object[] { new Integer( i++ ), new Integer( plugins.keySet().size() ) } ) ); //$NON-NLS-1$
String key = (String) it.next();
EclipseOsgiPlugin plugin = (EclipseOsgiPlugin) plugins.get( key );
Model model = (Model) models.get( key );
@@ -233,7 +239,7 @@
if ( plugin == null )
{
- getLog().warn( Messages.getString("EclipseToMavenMojo.skippingfile", file.getAbsolutePath() ) ); //$NON-NLS-1$
+ getLog().warn( Messages.getString( "EclipseToMavenMojo.skippingfile", file.getAbsolutePath() ) ); //$NON-NLS-1$
return;
}
@@ -288,8 +294,10 @@
}
else
{
- throw new MojoFailureException( Messages.getString( "EclipseToMavenMojo.unabletoresolveversionrange", new Object[] { dep //$NON-NLS-1$
- , key } ) ); //$NON-NLS-1$
+ throw new MojoFailureException(
+ Messages.getString(
+ "EclipseToMavenMojo.unabletoresolveversionrange", new Object[] { dep //$NON-NLS-1$
+ , key } ) ); //$NON-NLS-1$
}
}
}
@@ -316,7 +324,9 @@
}
catch ( IOException e )
{
- throw new MojoExecutionException( Messages.getString( "EclipseToMavenMojo.unabletoaccessjar", file.getAbsolutePath() ), e ); //$NON-NLS-1$
+ throw new MojoExecutionException(
+ Messages.getString(
+ "EclipseToMavenMojo.unabletoaccessjar", file.getAbsolutePath() ), e ); //$NON-NLS-1$
}
}
@@ -352,7 +362,7 @@
if ( bundleName == null || version == null )
{
- getLog().error( Messages.getString( "EclipseToMavenMojo.unabletoreadbundlefrommanifest") ); //$NON-NLS-1$
+ getLog().error( Messages.getString( "EclipseToMavenMojo.unabletoreadbundlefrommanifest" ) ); //$NON-NLS-1$
return null;
}
@@ -365,7 +375,8 @@
}
catch ( IOException e )
{
- throw new MojoExecutionException( Messages.getString( "EclipseToMavenMojo.errorprocessingplugin", plugin ), e ); //$NON-NLS-1$
+ throw new MojoExecutionException(
+ Messages.getString( "EclipseToMavenMojo.errorprocessingplugin", plugin ), e ); //$NON-NLS-1$
}
Dependency[] deps = parseDependencies( requireBundle );
@@ -444,7 +455,9 @@
}
catch ( IOException e )
{
- throw new MojoExecutionException( Messages.getString( "EclipseToMavenMojo.errorwritingtemporarypom", e.getMessage() ), e ); //$NON-NLS-1$
+ throw new MojoExecutionException(
+ Messages.getString(
+ "EclipseToMavenMojo.errorwritingtemporarypom", e.getMessage() ), e ); //$NON-NLS-1$
}
finally
{
@@ -468,15 +481,19 @@
}
catch ( ArtifactDeploymentException e )
{
- throw new MojoExecutionException( Messages.getString( "EclipseToMavenMojo.errordeployartifacttorepository" ), e ); //$NON-NLS-1$
+ throw new MojoExecutionException(
+ Messages.getString( "EclipseToMavenMojo.errordeployartifacttorepository" ), e ); //$NON-NLS-1$
}
catch ( ArtifactInstallationException e )
{
- throw new MojoExecutionException( Messages.getString( "EclipseToMavenMojo.errorinstallartifacttorepository" ), e ); //$NON-NLS-1$
+ throw new MojoExecutionException(
+ Messages.getString( "EclipseToMavenMojo.errorinstallartifacttorepository" ), e ); //$NON-NLS-1$
}
catch ( IOException e )
{
- throw new MojoExecutionException( Messages.getString( "EclipseToMavenMojo.errorgettingjarfileforplugin", plugin ), e ); //$NON-NLS-1$
+ throw new MojoExecutionException(
+ Messages.getString(
+ "EclipseToMavenMojo.errorgettingjarfileforplugin", plugin ), e ); //$NON-NLS-1$
}
finally
{
@@ -514,9 +531,8 @@
}
else
{
- version =
- StringUtils.substring( version, 0, lastDot ) + "-" //$NON-NLS-1$
- + StringUtils.substring( version, lastDot + 1, version.length() );
+ version = StringUtils.substring( version, 0, lastDot ) + "-" //$NON-NLS-1$
+ + StringUtils.substring( version, lastDot + 1, version.length() );
}
}
return version;
@@ -538,7 +554,8 @@
if ( !matcher.matches() )
{
- throw new MojoFailureException( deployTo, Messages.getString( "EclipseToMavenMojo.invalidsyntaxforrepository" ), //$NON-NLS-1$
+ throw new MojoFailureException( deployTo,
+ Messages.getString( "EclipseToMavenMojo.invalidsyntaxforrepository" ), //$NON-NLS-1$
Messages.getString( "EclipseToMavenMojo.invalidremoterepositorysyntax" ) ); //$NON-NLS-1$
}
else
@@ -554,7 +571,9 @@
}
catch ( ComponentLookupException e )
{
- throw new MojoExecutionException( Messages.getString( "EclipseToMavenMojo.cannotfindrepositorylayout", layout ), e ); //$NON-NLS-1$
+ throw new MojoExecutionException(
+ Messages.getString(
+ "EclipseToMavenMojo.cannotfindrepositorylayout", layout ), e ); //$NON-NLS-1$
}
return new DefaultArtifactRepository( id, url, repoLayout );
@@ -683,9 +702,8 @@
{
// build number found, fix it
int lastDot = group.lastIndexOf( "." ); //$NON-NLS-1$
- group =
- StringUtils.substring( group, 0, lastDot ) + "-" //$NON-NLS-1$
- + StringUtils.substring( group, lastDot + 1, group.length() );
+ group = StringUtils.substring( group, 0, lastDot ) + "-" //$NON-NLS-1$
+ + StringUtils.substring( group, lastDot + 1, group.length() );
}
matcher.appendReplacement( newVersionRange, group );
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java?rev=798342&r1=798341&r2=798342&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java Tue Jul 28 00:17:00 2009
@@ -15,7 +15,7 @@
/**
* Generates MyEclipse configuration files
- *
+ *
* @author <a href="mailto:olivier.jacob@gmail.com">Olivier Jacob</a>
* @goal myeclipse
* @since 2.5
@@ -59,8 +59,9 @@
private static final String MYECLIPSE_DEFAULT_HIBERNATE_CFG_XML = "src/main/resources/applicationContext.xml";
/**
- * Spring configuration placeholder <p/>
- *
+ * Spring configuration placeholder
+ * <p/>
+ *
* <pre>
* <spring>
* <version>1.0/2.0</version>
@@ -68,28 +69,30 @@
* <basedir>src/main/resources</basedir>
* </spring>
* </pre>
- *
+ *
* @parameter
*/
private Map spring;
/**
- * Hibernate configuration placeholder <p/>
- *
+ * Hibernate configuration placeholder
+ * <p/>
+ *
* <pre>
* <hibernate>
* <config-file>src/main/resources/applicationContext-persistence.xml</config-file>
* <session-factory-id>mySessionFactory</session-factory-id>
* </hibernate>
* </pre>
- *
+ *
* @parameter
*/
private Map hibernate;
/**
- * Allow declaration of struts properties for MyEclipse <p/>
- *
+ * Allow declaration of struts properties for MyEclipse
+ * <p/>
+ *
* <pre>
* <struts>
* <version>1.2.9</version>
@@ -98,7 +101,7 @@
* <base-package>1.2.9</base-package>
* </struts>
* </pre>
- *
+ *
* @parameter
*/
private Map struts;
@@ -159,7 +162,7 @@
/**
* Override the default builders with the builders used by MyEclipse
- *
+ *
* @param packaging packaging-type (jar,war,ejb,ear)
*/
protected void fillDefaultBuilders( String packaging )
@@ -217,7 +220,7 @@
/**
* Override the default natures with the natures used by MyEclipse
- *
+ *
* @param packaging packaging-type (jar,war,ejb,ear)
*/
protected void fillDefaultNatures( String packaging )
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java?rev=798342&r1=798341&r2=798342&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java Tue Jul 28 00:17:00 2009
@@ -40,7 +40,7 @@
/**
* Generates the rad-6 configuration files.
- *
+ *
* @author Richard van Nieuwenhoven (patch submission)
* @author jdcasey
* @goal rad
@@ -95,7 +95,7 @@
/**
* The context root of the webapplication. This parameter is only used when the current project is a war project,
* else it will be ignored.
- *
+ *
* @parameter
*/
private String warContextRoot;
@@ -103,7 +103,7 @@
/**
* Use this to specify a different generated resources folder than target/generated-resources/rad6. Set to "none" to
* skip this folder generation.
- *
+ *
* @parameter expression="${generatedResourceDirName}" default-value="target/generated-resources/rad6" since="2.4"
*/
private String generatedResourceDirName;
@@ -125,8 +125,9 @@
}
/**
- * write all rad6 configuration files. <br/> <b> NOTE: This could change the config! </b>
- *
+ * write all rad6 configuration files. <br/>
+ * <b> NOTE: This could change the config! </b>
+ *
* @see EclipsePlugin#writeConfiguration()
* @param deps resolved dependencies to handle
* @throws MojoExecutionException if the config files could not be written.
@@ -152,7 +153,7 @@
/**
* make room for a Manifest file. use a generated resource for JARS and for WARS use the manifest in the
* webapp/meta-inf directory.
- *
+ *
* @throws MojoExecutionException
*/
private void addManifestResource( EclipseWriterConfig config )
@@ -196,7 +197,7 @@
/**
* Returns absolute path to the web content directory based on configuration of the war plugin or default one
* otherwise.
- *
+ *
* @param project
* @return absolute directory path as String
* @throws MojoExecutionException
@@ -220,7 +221,7 @@
/**
* overwite the default builders with the builders required by RAD6.
- *
+ *
* @param packaging packaging-type (jar,war,ejb,ear)
*/
protected void fillDefaultBuilders( String packaging )
@@ -264,7 +265,7 @@
/**
* overwite the default natures with the natures required by RAD6.
- *
+ *
* @param packaging packaging-type (jar,war,ejb,ear)
*/
protected void fillDefaultNatures( String packaging )
@@ -297,7 +298,7 @@
/**
* Utility method that locates a project producing the given artifact.
- *
+ *
* @param artifact the artifact a project should produce.
* @return <code>true</code> if the artifact is produced by a reactor projectart.
*/
@@ -351,7 +352,8 @@
/**
* {@inheritDoc}
*/
- public String getProjectNameForArifact( Artifact artifact ) {
+ public String getProjectNameForArifact( Artifact artifact )
+ {
return artifact.getArtifactId();
}
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java?rev=798342&r1=798341&r2=798342&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java Tue Jul 28 00:17:00 2009
@@ -361,7 +361,7 @@
}
}
- /* package */ HashMap readDefinedServers( WorkspaceConfiguration workspaceConfiguration, Log logger )
+ /* package */HashMap readDefinedServers( WorkspaceConfiguration workspaceConfiguration, Log logger )
{
HashMap detectedRuntimes = new HashMap();
if ( workspaceConfiguration.getWorkspaceDirectory() != null )
@@ -376,7 +376,8 @@
{
Properties properties = new Properties();
properties.load( new FileInputStream( prefs ) );
- String runtimes = properties.getProperty( ReadWorkspaceLocations.METADATA_PLUGINS_ORG_ECLIPSE_CORE_RUNTIME_PREFS_RUNTIMES_KEY );
+ String runtimes =
+ properties.getProperty( ReadWorkspaceLocations.METADATA_PLUGINS_ORG_ECLIPSE_CORE_RUNTIME_PREFS_RUNTIMES_KEY );
if ( runtimes != null )
{
runtimesElement = Xpp3DomBuilder.build( new StringReader( runtimes ) );
@@ -466,7 +467,8 @@
new Object[] { typeId, name } );
String jrePath = new File( path ).getCanonicalPath();
File rtJarFile = new File( new File( jrePath ), "jre/lib/rt.jar" );
- if ( !rtJarFile.exists() ) {
+ if ( !rtJarFile.exists() )
+ {
logger.warn( Messages.getString( "EclipsePlugin.invalidvminworkspace", jrePath ) );
continue;
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java?rev=798342&r1=798341&r2=798342&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java Tue Jul 28 00:17:00 2009
@@ -40,7 +40,7 @@
/**
* Common behaviours for creating or adapting the manifest files for eclipse environments.
- *
+ *
* @author <a href="mailto:nir@cfc.at">Richard van Nieuwenhoven </a>
*/
public abstract class AbstractEclipseManifestWriter
@@ -58,7 +58,7 @@
/**
* Aphabeticaly sort the classpath. Do this by splitting it up, sort the entries and gleue them together again.
- *
+ *
* @param newValue classpath to sort
* @return the sorted classpath
*/
@@ -81,7 +81,7 @@
/**
* Read and parse the existing manifest file.
- *
+ *
* @param manifestFile file
* @return the read manifest
* @throws IOException if the file could not be read
@@ -111,7 +111,7 @@
* Add one dependency to the blank separated classpath stringbuffer. When the project is available in the reactor
* (current build) then the project is used else the jar representing the artifact. System dependencies will only be
* included if they are in this project.
- *
+ *
* @param classpath existing classpath to append
* @param dependency dependency to append as jar or as project
*/
@@ -143,7 +143,7 @@
* Check if the two manifests are equal. Manifest.equal can not be used because of the special case the Classpath
* entr, witch must be comaired sorted so that a different oder in the classpath does not result in "not equal".
* This not not realy correct but in this case it is more important to reduce the number of version-controll files.
- *
+ *
* @param manifest the new manifest
* @param existingManifest to compaire the new one with
* @return are the manifests equal
@@ -177,8 +177,8 @@
if ( ( newValue == null || !newValue.equals( existingValue ) )
&& ( existingValue == null || !existingValue.equals( newValue ) ) )
{
- log.info( "@@@ FALSE - Manifest are not equal because key = " + key + " has existing value = " + existingValue + " and new value = "
- + newValue + " are different" );
+ log.info( "@@@ FALSE - Manifest are not equal because key = " + key + " has existing value = "
+ + existingValue + " and new value = " + newValue + " are different" );
return false;
}
}
@@ -188,7 +188,7 @@
/**
* Convert all dependencies in a blank seperated list of jars and projects representing the classpath.
- *
+ *
* @return the blank separeted classpath string
*/
protected String constructManifestClasspath()
@@ -206,7 +206,7 @@
/**
* Create a manifest contaigning the required classpath.
- *
+ *
* @return the newly created manifest
*/
protected Manifest createNewManifest()
@@ -220,7 +220,7 @@
/**
* Verify is the manifest sould be overwritten this sould take in account that the manifest should only be written
* if the contents of the classpath was changed not the order. The classpath sorting oder should be ignored.
- *
+ *
* @param manifest the newly created classpath
* @param manifestFile the file where the manifest
* @return if the new manifest file must be written
@@ -248,7 +248,7 @@
/**
* Search the project for the existing META-INF directory where the manifest should be located.
- *
+ *
* @return the absolute path to the META-INF directory
* @throws MojoExecutionException
*/
@@ -256,12 +256,12 @@
throws MojoExecutionException;
/**
- * If the existing manifest file located in <code>getMetaInfBaseDirectory()</code>
- * already has a correct MANIFEST_VERSION and CLASS_PATH value then do nothing.
+ * If the existing manifest file located in <code>getMetaInfBaseDirectory()</code> already has a correct
+ * MANIFEST_VERSION and CLASS_PATH value then do nothing.
* <p>
- * Otherwise generate a <b>NEW</b> (i.e the old one is overwritten) which only contains
- * values for MANIFEST_VERSION and CLASS_PATH, all other previous entries are not kept.
- *
+ * Otherwise generate a <b>NEW</b> (i.e the old one is overwritten) which only contains values for MANIFEST_VERSION
+ * and CLASS_PATH, all other previous entries are not kept.
+ *
* @see AbstractWtpResourceWriter#write(EclipseSourceDir[], ArtifactRepository, File)
* @param sourceDirs all eclipse source directorys
* @param localRepository the local reposetory
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?rev=798342&r1=798341&r2=798342&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java Tue Jul 28 00:17:00 2009
@@ -45,7 +45,7 @@
/**
* Writes eclipse .classpath file.
- *
+ *
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @author <a href="mailto:kenney@neonics.com">Kenney Westerhof</a>
* @author <a href="mailto:fgiust@apache.org">Fabrizio Giustina</a>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java?rev=798342&r1=798341&r2=798342&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java Tue Jul 28 00:17:00 2009
@@ -179,5 +179,5 @@
// classpath that will be
// written by the superclass
manifestWriter.write();
- }
+ }
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java?rev=798342&r1=798341&r2=798342&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java Tue Jul 28 00:17:00 2009
@@ -186,7 +186,8 @@
}
catch ( IOException e )
{
- throw new MojoExecutionException( Messages.getString( "EclipsePlugin.cantreadfile", manifestFile.getAbsolutePath() ) );
+ throw new MojoExecutionException( Messages.getString( "EclipsePlugin.cantreadfile",
+ manifestFile.getAbsolutePath() ) );
}
manifestSb.append( addBundleClasspathEntries() );
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java?rev=798342&r1=798341&r2=798342&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadManifestWriter.java Tue Jul 28 00:17:00 2009
@@ -110,8 +110,6 @@
verifyManifestBasedirInSourceDirs( getMetaInfBaseDirectory( config.getProject() ) );
}
-
-
// NOTE: This could change the config!
private void verifyManifestBasedirInSourceDirs( String metaInfBaseDirectory )
{
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=798342&r1=798341&r2=798342&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 Jul 28 00:17:00 2009
@@ -171,7 +171,7 @@
// </dependent-module>
handle = "module:/resource/" + dep.getEclipseProjectName() + "/" + dep.getEclipseProjectName(); //$NON-NLS-1$ //$NON-NLS-2$
-
+
String archiveExtension = dep.getType();
if ( Constants.PROJECT_PACKAGING_EJB.equals( dep.getType() ) )
{
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=798342&r1=798341&r2=798342&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 Jul 28 00:17:00 2009
@@ -154,18 +154,19 @@
IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(),
warSourceDirectory, false ) );
writer.endElement();
-
+
// add web resources over the top of the war source directory
- Xpp3Dom[] webResources = IdeUtils.getPluginConfigurationDom( config.getProject(), JeeUtils.ARTIFACT_MAVEN_WAR_PLUGIN,
- new String[] { "webResources", "resource" } );
+ Xpp3Dom[] webResources =
+ IdeUtils.getPluginConfigurationDom( config.getProject(), JeeUtils.ARTIFACT_MAVEN_WAR_PLUGIN,
+ new String[] { "webResources", "resource" } );
for ( int index = 0; index < webResources.length; index++ )
{
File webResourceDirectory = new File( webResources[index].getChild( "directory" ).getValue() );
- writer.startElement( ELT_WB_RESOURCE );
+ writer.startElement( ELT_WB_RESOURCE );
writer.addAttribute( ATTR_DEPLOY_PATH, "/" ); //$NON-NLS-1$
writer.addAttribute( ATTR_SOURCE_PATH,
IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(),
- webResourceDirectory, false ) );
+ webResourceDirectory, false ) );
writer.endElement();
}
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=798342&r1=798341&r2=798342&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 Jul 28 00:17:00 2009
@@ -186,9 +186,9 @@
/**
* 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. With versions 2.6+ of the plugin to reset this cache run
- * <code>mvn eclipse:remove-cache</code>, or use the <code>forceRecheck</code> option with versions.
- * With older versions delete the file <code>mvn-eclipse-cache.properties</code> in the target directory.
+ * status cache is mantained. With versions 2.6+ of the plugin to reset this cache run
+ * <code>mvn eclipse:remove-cache</code>, or use the <code>forceRecheck</code> option with versions. With older
+ * versions delete the file <code>mvn-eclipse-cache.properties</code> in the target directory.
*
* @parameter expression="${downloadSources}"
*/
@@ -197,14 +197,14 @@
/**
* Enables/disables the downloading of javadoc attachments. Defaults to false. When this flag is <code>true</code>
* remote repositories are checked for javadocs: in order to avoid repeated check for unavailable javadoc archives,
- * a status cache is mantained. With versions 2.6+ of the plugin to reset this cache run
- * <code>mvn eclipse:remove-cache</code>, or use the <code>forceRecheck</code> option with versions.
- * With older versions delete the file <code>mvn-eclipse-cache.properties</code> in the target directory.
+ * a status cache is mantained. With versions 2.6+ of the plugin to reset this cache run
+ * <code>mvn eclipse:remove-cache</code>, or use the <code>forceRecheck</code> option with versions. With older
+ * versions delete the file <code>mvn-eclipse-cache.properties</code> in the target directory.
*
* @parameter expression="${downloadJavadocs}"
*/
protected boolean downloadJavadocs;
-
+
/**
* Enables/disables the rechecking of the remote repository for downloading source/javadoc attachments. Defaults to
* false. When this flag is <code>true</code> and the source or javadoc attachment has a status cache to indicate
@@ -597,7 +597,8 @@
{
getLog().debug( e.getMessage(), e );
getLog().warn(
- Messages.getString( "AbstractIdeSupportMojo.artifactdownload", new Object[] { //$NON-NLS-1$
+ Messages.getString(
+ "AbstractIdeSupportMojo.artifactdownload", new Object[] { //$NON-NLS-1$
e.getGroupId(), e.getArtifactId(), e.getVersion(),
e.getMessage() } ) );
}
@@ -605,7 +606,8 @@
{
getLog().debug( e.getMessage(), e );
getLog().warn(
- Messages.getString( "AbstractIdeSupportMojo.artifactresolution", new Object[] { //$NON-NLS-1$
+ Messages.getString(
+ "AbstractIdeSupportMojo.artifactresolution", new Object[] { //$NON-NLS-1$
e.getGroupId(), e.getArtifactId(), e.getVersion(),
e.getMessage() } ) );
}
@@ -806,14 +808,15 @@
{
return getReactorProject( artifact ) != null;
}
-
+
/**
* Checks the list of reactor projects to see if the artifact is included.
*
* @param artifact the artifact to check if it is in the reactor
* @return the reactor project or null if it is not in the reactor
*/
- protected MavenProject getReactorProject( Artifact artifact ) {
+ protected MavenProject getReactorProject( Artifact artifact )
+ {
if ( reactorProjects != null )
{
for ( Iterator iter = reactorProjects.iterator(); iter.hasNext(); )
@@ -837,7 +840,7 @@
}
}
}
- }
+ }
return null;
}
@@ -872,7 +875,9 @@
}
catch ( InvalidVersionSpecificationException e )
{
- throw new MojoExecutionException( Messages.getString( "AbstractIdeSupportMojo.unabletoparseversion", new Object[] { //$NON-NLS-1$
+ throw new MojoExecutionException(
+ Messages.getString(
+ "AbstractIdeSupportMojo.unabletoparseversion", new Object[] { //$NON-NLS-1$
projectId, d.getVersion(),
d.getManagementKey(), e.getMessage() } ),
e );
@@ -896,14 +901,12 @@
*/
private void resolveSourceAndJavadocArtifacts( IdeDependency[] deps )
{
- final List missingSources =
- resolveDependenciesWithClassifier( deps, "sources", getDownloadSources() );
+ final List missingSources = resolveDependenciesWithClassifier( deps, "sources", getDownloadSources() );
missingSourceDependencies.addAll( missingSources );
- final List missingJavadocs =
- resolveDependenciesWithClassifier( deps, "javadoc", getDownloadJavadocs() );
- missingJavadocDependencies.addAll( missingJavadocs );
- }
+ final List missingJavadocs = resolveDependenciesWithClassifier( deps, "javadoc", getDownloadJavadocs() );
+ missingJavadocDependencies.addAll( missingJavadocs );
+ }
/**
* Resolve the required artifacts for each of the dependency. <code>sources</code> or <code>javadoc</code> artifacts
@@ -943,28 +946,33 @@
Artifact baseArtifact =
artifactFactory.createArtifactWithClassifier( dependency.getGroupId(), dependency.getArtifactId(),
dependency.getVersion(), dependency.getType(),
- dependency.getClassifier() );
+ dependency.getClassifier() );
baseArtifact =
IdeUtils.resolveArtifact( artifactResolver, baseArtifact, remoteRepos, localRepository, getLog() );
- if (!baseArtifact.isResolved()) {
+ if ( !baseArtifact.isResolved() )
+ {
// base artifact does not exist - no point checking for javadoc/sources
continue;
}
-
+
Artifact artifact =
IdeUtils.createArtifactWithClassifier( dependency.getGroupId(), dependency.getArtifactId(),
dependency.getVersion(), dependency.getClassifier(),
inClassifier, artifactFactory );
File notAvailableMarkerFile = IdeUtils.getNotAvailableMarkerFile( localRepository, artifact );
- if (forceRecheck && notAvailableMarkerFile.exists()) {
- if (!notAvailableMarkerFile.delete()) {
- getLog().warn( Messages.getString( "AbstractIdeSupportMojo.unabletodeletenotavailablemarkerfile", notAvailableMarkerFile ) );
+ if ( forceRecheck && notAvailableMarkerFile.exists() )
+ {
+ if ( !notAvailableMarkerFile.delete() )
+ {
+ getLog().warn(
+ Messages.getString( "AbstractIdeSupportMojo.unabletodeletenotavailablemarkerfile",
+ notAvailableMarkerFile ) );
}
}
-
+
if ( !notAvailableMarkerFile.exists() )
- {
+ {
artifact =
IdeUtils.resolveArtifact( artifactResolver, artifact, remoteRepos, localRepository, getLog() );
if ( artifact.isResolved() )
@@ -985,11 +993,15 @@
try
{
notAvailableMarkerFile.createNewFile();
- getLog().debug( Messages.getString( "AbstractIdeSupportMojo.creatednotavailablemarkerfile", notAvailableMarkerFile ) );
+ getLog().debug(
+ Messages.getString( "AbstractIdeSupportMojo.creatednotavailablemarkerfile",
+ notAvailableMarkerFile ) );
}
catch ( IOException e )
{
- getLog().warn( Messages.getString( "AbstractIdeSupportMojo.failedtocreatenotavailablemarkerfile",
+ getLog().warn(
+ Messages.getString(
+ "AbstractIdeSupportMojo.failedtocreatenotavailablemarkerfile",
notAvailableMarkerFile ) );
}
}
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=798342&r1=798341&r2=798342&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 Jul 28 00:17:00 2009
@@ -87,14 +87,15 @@
* The suffix used to mark a file as not available.
*/
public static final String NOT_AVAILABLE_MARKER_FILE_SUFFIX = "-not-available";
-
+
/**
* Delete a file, handling log messages and exceptions
*
* @param f File to be deleted
* @throws MojoExecutionException only if a file exists and can't be deleted
*/
- public static void delete( File f, Log log ) throws MojoExecutionException
+ public static void delete( File f, Log log )
+ throws MojoExecutionException
{
if ( f.isDirectory() )
{
@@ -126,7 +127,7 @@
log.debug( Messages.getString( "EclipseCleanMojo.nofilefound", f.getName() ) ); //$NON-NLS-1$
}
}
-
+
public static String getCanonicalPath( File file )
throws MojoExecutionException
{
@@ -326,7 +327,7 @@
* @return the project name template.
*/
public static String calculateProjectNameTemplate( String projectNameTemplate, boolean addVersionToProjectName,
- boolean addGroupIdToProjectName, Log log )
+ boolean addGroupIdToProjectName, Log log )
{
if ( projectNameTemplate != null )
{
@@ -350,7 +351,8 @@
return IdeUtils.PROJECT_NAME_WITH_GROUP_TEMPLATE;
}
return IdeUtils.PROJECT_NAME_DEFAULT_TEMPLATE;
- }
+ }
+
/**
* Use {@link IdeDependency#getEclipseProjectName()} instead.
*/
@@ -389,13 +391,15 @@
}
/**
- * @param artifact the artifact
+ * @param artifact the artifact
* @return the not-available marker file for the specified artifact
*/
- public static File getNotAvailableMarkerFile( ArtifactRepository localRepository, Artifact artifact ) {
- return new File( localRepository.getBasedir(), localRepository.pathOf( artifact ) + NOT_AVAILABLE_MARKER_FILE_SUFFIX);
+ public static File getNotAvailableMarkerFile( ArtifactRepository localRepository, Artifact artifact )
+ {
+ return new File( localRepository.getBasedir(), localRepository.pathOf( artifact )
+ + NOT_AVAILABLE_MARKER_FILE_SUFFIX );
}
-
+
/**
* Wrapper around {@link ArtifactResolver#resolve(Artifact, List, ArtifactRepository)}
*
@@ -431,21 +435,21 @@
}
/**
- * Wrap {@link ArtifactFactory#createArtifactWithClassifier} so that the type and classifier
- * are set correctly for "sources" and "javadoc".
+ * 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 inClassifier either "sources" of "javadoc"
* @param artifactFactory see {@link ArtifactFactory#createArtifactWithClassifier}
* @return see {@link ArtifactFactory#createArtifactWithClassifier}
* @see ArtifactFactory#createArtifactWithClassifier
*/
public static Artifact createArtifactWithClassifier( String groupId, String artifactId, String version,
- String depClassifier, String inClassifier,
- ArtifactFactory artifactFactory )
+ String depClassifier, String inClassifier,
+ ArtifactFactory artifactFactory )
{
String type = null;
@@ -559,7 +563,7 @@
{
return StringUtils.replace( filename, '\\', '/' );
}
-
+
/**
* NOTE: This is to account for the unfortunate fact that "file:" URIs differ between Windows and Unix. On a Windows
* box, the path "C:\dir" is mapped to "file:/C:/dir". On a Unix box, the path "/home/dir" is mapped to
@@ -573,7 +577,7 @@
public static String fixWindowsDriveURI( String input )
{
return input.replaceAll( "file:([a-zA-Z]):", "file:/$1:" );
- }
+ }
/**
* Returns a compiler plugin settings from a list of plugins .
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=798342&r1=798341&r2=798342&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 Jul 28 00:17:00 2009
@@ -89,17 +89,17 @@
project.setFile( pom );
EclipsePlugin mojo = newMojo();
-
- ArrayList sourceIncludes = new ArrayList();
+
+ ArrayList sourceIncludes = new ArrayList();
Field field = EclipsePlugin.class.getDeclaredField( "sourceIncludes" );
field.setAccessible( true );
field.set( mojo, sourceIncludes );
-
+
ArrayList sourceExcludes = new ArrayList();
field = EclipsePlugin.class.getDeclaredField( "sourceExcludes" );
field.setAccessible( true );
field.set( mojo, sourceExcludes );
-
+
EclipseSourceDir[] result = mojo.buildDirectoryList( project, basedir, new File( "target/classes" ) );
assertEquals( "should have added 1 resource.", 1, result.length );
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java?rev=798342&r1=798341&r2=798342&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java Tue Jul 28 00:17:00 2009
@@ -32,30 +32,34 @@
public class EclipseSourceDirTest
extends TestCase
{
- private EclipseSourceDir testFixture_src_main_java() {
+ private EclipseSourceDir testFixture_src_main_java()
+ {
List includes = new ArrayList();
includes.add( EclipsePlugin.JAVA_FILE_PATTERN );
return new EclipseSourceDir( "/src/main/java", null, false, false, includes, null, false );
}
- private EclipseSourceDir testFixture_src_main_resources() {
+ private EclipseSourceDir testFixture_src_main_resources()
+ {
List excludes = new ArrayList();
excludes.add( EclipsePlugin.JAVA_FILE_PATTERN );
return new EclipseSourceDir( "/src/main/resources", "target/classes", true, false, null, excludes, false );
}
- private EclipseSourceDir testFixture_src_test_java() {
+ private EclipseSourceDir testFixture_src_test_java()
+ {
List includes = new ArrayList();
includes.add( EclipsePlugin.JAVA_FILE_PATTERN );
return new EclipseSourceDir( "/src/test/java", "target/test-classes", false, true, includes, null, false );
}
- private EclipseSourceDir testFixture_src_test_resources() {
+ private EclipseSourceDir testFixture_src_test_resources()
+ {
List excludes = new ArrayList();
excludes.add( EclipsePlugin.JAVA_FILE_PATTERN );
return new EclipseSourceDir( "/src/test/resources", "target/test-classes", true, true, null, excludes, false );
}
-
+
/**
* A merge with a source directory and a resource directory results in:
* <ul>
@@ -63,79 +67,96 @@
* <li>includes is empty
* <li>excludes is empty
* </ul>
+ *
* @throws Exception
*/
- public void testMerge_src_main_java_with_src_main_resources() throws Exception
+ public void testMerge_src_main_java_with_src_main_resources()
+ throws Exception
{
EclipseSourceDir src_main_java = testFixture_src_main_java();
EclipseSourceDir src_main_resources = testFixture_src_main_resources();
-
+
src_main_java.merge( src_main_resources );
- assertEquals( "source /src/main/java: output=null, include=[], exclude=[], test=false, filtering=false", src_main_java.toString());
+ assertEquals( "source /src/main/java: output=null, include=[], exclude=[], test=false, filtering=false",
+ src_main_java.toString() );
}
-
- public void testMerge_two_resource_directories() throws Exception {
+
+ public void testMerge_two_resource_directories()
+ throws Exception
+ {
EclipseSourceDir resource1 = testFixture_src_main_resources();
EclipseSourceDir resource2 = testFixture_src_main_resources();
-
+
resource1.getInclude().add( "**/*.txt" );
resource1.getExclude().add( "**/*.svn" );
-
+
resource2.getInclude().add( "**/*.xml" );
resource2.getExclude().add( "**/*.cvs" );
-
+
resource1.merge( resource2 );
-
- assertEquals( "resource /src/main/resources: output=target/classes, include=[**/*.txt|**/*.xml], exclude=[**/*.java|**/*.svn|**/*.cvs], test=false, filtering=false", resource1.toString());
+
+ assertEquals(
+ "resource /src/main/resources: output=target/classes, include=[**/*.txt|**/*.xml], exclude=[**/*.java|**/*.svn|**/*.cvs], test=false, filtering=false",
+ resource1.toString() );
}
-
- public void testMerge_two_resource_directories_with_duplicates() throws Exception {
+
+ public void testMerge_two_resource_directories_with_duplicates()
+ throws Exception
+ {
EclipseSourceDir resource1 = testFixture_src_main_resources();
EclipseSourceDir resource2 = testFixture_src_main_resources();
-
+
resource1.getInclude().add( "**/*.dup" );
resource1.getInclude().add( "**/*.txt" );
resource1.getExclude().add( "**/*.svn" );
resource1.getExclude().add( "**/*~" );
-
+
resource2.getInclude().add( "**/*.xml" );
resource2.getInclude().add( "**/*.dup" );
resource2.getExclude().add( "**/*.cvs" );
resource2.getExclude().add( "**/*~" );
resource1.merge( resource2 );
-
- assertEquals( "resource /src/main/resources: output=target/classes, include=[**/*.dup|**/*.txt|**/*.xml], exclude=[**/*.java|**/*.svn|**/*~|**/*.cvs], test=false, filtering=false", resource1.toString());
- }
+ assertEquals(
+ "resource /src/main/resources: output=target/classes, include=[**/*.dup|**/*.txt|**/*.xml], exclude=[**/*.java|**/*.svn|**/*~|**/*.cvs], test=false, filtering=false",
+ resource1.toString() );
+ }
public void testToString_src_main_java()
{
EclipseSourceDir objectUnderTest = testFixture_src_main_java();
-
- assertEquals( "source /src/main/java: output=null, include=[**/*.java], exclude=[], test=false, filtering=false", objectUnderTest.toString());
+
+ assertEquals(
+ "source /src/main/java: output=null, include=[**/*.java], exclude=[], test=false, filtering=false",
+ objectUnderTest.toString() );
}
-
+
public void testToString_src_main_resources()
{
EclipseSourceDir objectUnderTest = testFixture_src_main_resources();
-
- assertEquals( "resource /src/main/resources: output=target/classes, include=[], exclude=[**/*.java], test=false, filtering=false", objectUnderTest.toString());
+
+ assertEquals(
+ "resource /src/main/resources: output=target/classes, include=[], exclude=[**/*.java], test=false, filtering=false",
+ objectUnderTest.toString() );
}
-
+
public void testToString_src_test_java()
{
EclipseSourceDir objectUnderTest = testFixture_src_test_java();
-
- assertEquals( "source /src/test/java: output=target/test-classes, include=[**/*.java], exclude=[], test=true, filtering=false", objectUnderTest.toString());
+
+ assertEquals(
+ "source /src/test/java: output=target/test-classes, include=[**/*.java], exclude=[], test=true, filtering=false",
+ objectUnderTest.toString() );
}
-
+
public void testToString_src_test_resources()
{
EclipseSourceDir objectUnderTest = testFixture_src_test_resources();
-
- assertEquals( "resource /src/test/resources: output=target/test-classes, include=[], exclude=[**/*.java], test=true, filtering=false", objectUnderTest.toString());
- }
-
+
+ assertEquals(
+ "resource /src/test/resources: output=target/test-classes, include=[], exclude=[**/*.java], test=true, filtering=false",
+ objectUnderTest.toString() );
+ }
}
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=798342&r1=798341&r2=798342&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 Jul 28 00:17:00 2009
@@ -104,7 +104,7 @@
mm.verifyAll();
}
-
+
/**
* Has Bundle-Name but no Bundle-SymbolicName and should be installed.
*
@@ -122,8 +122,8 @@
assertInstalledDirDoesNotExist( artifact );
mm.verifyAll();
- }
-
+ }
+
/**
* Has neither Bundle-Name or Bundle-SymbolicName and should NOT be installed.
*
@@ -141,7 +141,7 @@
assertInstalledDirDoesNotExist( artifact );
mm.verifyAll();
- }
+ }
/**
* if a jar has no manifest, do not install plugin.