Author: rfscholte
Date: Fri Sep 25 21:53:36 2015
New Revision: 1705359
URL: http://svn.apache.org/viewvc?rev=1705359&view=rev
Log:
Fix 500+ checkstyle reported errors
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AbstractWorkspaceMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/ConfigureWorkspaceMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/Constants.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseConfigFile.java
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/InstallPluginsMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/LinkedResource.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/Messages.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipseCleanMojo.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/RadCleanMojo.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/RemoveCacheMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceConfiguration.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/AbstractEclipseOsgiPlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/EclipseOsgiPlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/ExplodedPlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/PackagedPlugin.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/AbstractEclipseWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAntExternalLaunchConfigurationWriter.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/EclipseLaunchConfigurationWriter.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/EclipseProjectWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/MonitoredResource.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseHibernateWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseMetadataWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseStrutsDataWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadEjbClasspathWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadJ2EEWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadLibCopier.java
maven/plugins/trunk/maven-eclipse-plugin/src/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/rad/RadWebSettingsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebsiteConfigWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseCodeFormatterProfile.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseSettingsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseWorkspaceWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/WorkspaceWriter.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/EclipseWtpApplicationXMLWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponent15Writer.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/eclipse/writers/wtp/EclipseWtpFacetsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.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/IdeDependency.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeDescriptor.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AbstractWorkspaceMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AbstractWorkspaceMojo.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AbstractWorkspaceMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AbstractWorkspaceMojo.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,12 +18,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Parameter;
+/**
+ *
+ */
public abstract class AbstractWorkspaceMojo
extends AbstractMojo
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
import java.util.HashMap;
import java.util.Map;
@@ -178,15 +179,16 @@ public class BuildCommand
writer.startElement( "dictionary" );
- for (Object o : arguments.keySet()) {
+ for ( Object o : arguments.keySet() )
+ {
String key = (String) o;
- writer.startElement("key");
- writer.writeText(key);
+ writer.startElement( "key" );
+ writer.writeText( key );
writer.endElement();
- writer.startElement("value");
- writer.writeText((String) arguments.get(key));
+ writer.startElement( "value" );
+ writer.writeText( (String) arguments.get( key ) );
writer.endElement();
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/ConfigureWorkspaceMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/ConfigureWorkspaceMojo.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/ConfigureWorkspaceMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/ConfigureWorkspaceMojo.java
Fri Sep 25 21:53:36 2015
@@ -1,18 +1,23 @@
+package org.apache.maven.plugin.eclipse;
+
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
- * agreements. See the NOTICE file distributed with this work for additional
information regarding
- * copyright ownership. The ASF licenses this file to you under the Apache
License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
- * or implied. See the License for the specific language governing permissions
and limitations under
- * the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-package org.apache.maven.plugin.eclipse;
import java.io.File;
import java.net.MalformedURLException;
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/Constants.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/Constants.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/Constants.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/Constants.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,8 +18,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
+/**
+ * Constants for supported language and project packaging
+ */
public final class Constants
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -98,8 +99,9 @@ public class EclipseCleanMojo
if ( additionalConfig != null )
{
- for (EclipseConfigFile anAdditionalConfig : additionalConfig) {
- delete(new File(basedir, anAdditionalConfig.getName()));
+ for ( EclipseConfigFile anAdditionalConfig : additionalConfig )
+ {
+ delete( new File( basedir, anAdditionalConfig.getName() ) );
}
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseConfigFile.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseConfigFile.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseConfigFile.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseConfigFile.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
import java.net.URL;
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=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
import java.io.File;
import java.io.FileOutputStream;
@@ -119,36 +120,37 @@ public class EclipsePlugin
private static final String DEFAULT_ASPECT_DIRECTORY = "src/main/aspect";
- private static final String NATURE_WST_FACET_CORE_NATURE =
"org.eclipse.wst.common.project.facet.core.nature"; //$NON-NLS-1$
+ private static final String NATURE_WST_FACET_CORE_NATURE =
+ "org.eclipse.wst.common.project.facet.core.nature";
private static final String
BUILDER_WST_COMPONENT_STRUCTURAL_DEPENDENCY_RESOLVER =
-
"org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver";
//$NON-NLS-1$
+
"org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver";
- protected static final String BUILDER_WST_VALIDATION =
"org.eclipse.wst.validation.validationbuilder"; //$NON-NLS-1$
+ protected static final String BUILDER_WST_VALIDATION =
"org.eclipse.wst.validation.validationbuilder";
- private static final String BUILDER_JDT_CORE_JAVA =
"org.eclipse.jdt.core.javabuilder"; //$NON-NLS-1$
+ private static final String BUILDER_JDT_CORE_JAVA =
"org.eclipse.jdt.core.javabuilder";
private static final String BUILDER_WST_COMPONENT_STRUCTURAL =
- "org.eclipse.wst.common.modulecore.ComponentStructuralBuilder";
//$NON-NLS-1$
+ "org.eclipse.wst.common.modulecore.ComponentStructuralBuilder";
- private static final String BUILDER_WST_FACET =
"org.eclipse.wst.common.project.facet.core.builder"; //$NON-NLS-1$
+ private static final String BUILDER_WST_FACET =
"org.eclipse.wst.common.project.facet.core.builder";
- private static final String BUILDER_AJDT_CORE_JAVA =
"org.eclipse.ajdt.core.ajbuilder"; //$NON-NLS-1$
+ private static final String BUILDER_AJDT_CORE_JAVA =
"org.eclipse.ajdt.core.ajbuilder";
- private static final String NATURE_WST_MODULE_CORE_NATURE =
"org.eclipse.wst.common.modulecore.ModuleCoreNature"; //$NON-NLS-1$
+ private static final String NATURE_WST_MODULE_CORE_NATURE =
"org.eclipse.wst.common.modulecore.ModuleCoreNature";
- private static final String NATURE_JDT_CORE_JAVA =
"org.eclipse.jdt.core.javanature"; //$NON-NLS-1$
+ private static final String NATURE_JDT_CORE_JAVA =
"org.eclipse.jdt.core.javanature";
- private static final String NATURE_JEM_WORKBENCH_JAVA_EMF =
"org.eclipse.jem.workbench.JavaEMFNature"; //$NON-NLS-1$
+ private static final String NATURE_JEM_WORKBENCH_JAVA_EMF =
"org.eclipse.jem.workbench.JavaEMFNature";
- private static final String NATURE_AJDT_CORE_JAVA =
"org.eclipse.ajdt.ui.ajnature"; //$NON-NLS-1$
+ private static final String NATURE_AJDT_CORE_JAVA =
"org.eclipse.ajdt.ui.ajnature";
- protected static final String COMMON_PATH_JDT_LAUNCHING_JRE_CONTAINER =
"org.eclipse.jdt.launching.JRE_CONTAINER"; //$NON-NLS-1$
+ protected static final String COMMON_PATH_JDT_LAUNCHING_JRE_CONTAINER =
"org.eclipse.jdt.launching.JRE_CONTAINER";
- protected static final String ASPECTJ_RT_CONTAINER =
"org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"; //$NON-NLS-1$
+ protected static final String ASPECTJ_RT_CONTAINER =
"org.eclipse.ajdt.core.ASPECTJRT_CONTAINER";
// 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[] WTP_SUPPORTED_VERSIONS = new String[] {
"1.0", "1.5", "2.0", "R7", "none" };
public static final String ASPECTJ_FILE_PATTERN = "**/*.aj";
@@ -157,12 +159,12 @@ public class EclipsePlugin
/**
* Constant for 'artifactId' element in POM.xml.
*/
- private static final String POM_ELT_ARTIFACT_ID = "artifactId";
//$NON-NLS-1$
+ private static final String POM_ELT_ARTIFACT_ID = "artifactId";
/**
* Constant for 'groupId' element in POM.xml.
*/
- private static final String POM_ELT_GROUP_ID = "groupId"; //$NON-NLS-1$
+ private static final String POM_ELT_GROUP_ID = "groupId";
/**
* List of eclipse project natures. By default the
<code>org.eclipse.jdt.core.javanature</code> nature plus the
@@ -212,6 +214,7 @@ public class EclipsePlugin
@Parameter
private Map additionalProjectFacets;
+ // CHECKSTYLE_OFF: LineLength
/**
* List of eclipse build commands. By default the
<code>org.eclipse.jdt.core.javabuilder</code> builder plus the
* needed WTP builders are added. If you specify any configuration for
this parameter, only those buildcommands
@@ -228,9 +231,11 @@ public class EclipsePlugin
*
* For new style, see <code>additionalBuildCommands</code>.
*/
+ // CHECKSTYLE_ON: LineLength
@Parameter
private List buildcommands;
+ // CHECKSTYLE_OFF: LineLength
/**
* List of eclipse build commands to be added to the default ones. Old
style:
*
@@ -257,9 +262,11 @@ public class EclipsePlugin
* Note the difference between <code>build<strong>c</strong>ommand</code>
and
* <code>build<strong>C</strong>ommand</code>. You can mix and match old
and new-style configuration entries.
*/
+ // CHECKSTYLE_ON: LineLength
@Parameter
private List additionalBuildcommands;
+ // CHECKSTYLE_OFF: LineLength
/**
* List of container classpath entries. By default the
<code>org.eclipse.jdt.launching.JRE_CONTAINER</code>
* classpath container is added. Configuration example:
@@ -272,6 +279,7 @@ public class EclipsePlugin
* </classpathContainers>
* </pre>
*/
+ // CHECKSTYLE_ON: LineLength
@Parameter
private List classpathContainers;
@@ -299,7 +307,8 @@ public class EclipsePlugin
/**
* The default output directory
*/
- @Parameter( property = "outputDirectory", alias = "outputDirectory",
defaultValue = "${project.build.outputDirectory}", required = true )
+ @Parameter( property = "outputDirectory", alias = "outputDirectory",
+ defaultValue = "${project.build.outputDirectory}",
required = true )
private File buildOutputDirectory;
/**
@@ -327,6 +336,7 @@ public class EclipsePlugin
@Parameter( property = "eclipse.manifest", defaultValue =
"${basedir}/META-INF/MANIFEST.MF" )
private File manifest;
+ // CHECKSTYLE_OFF: LineLength
/**
* Allow to configure additional generic configuration files for eclipse
that will be written out to disk when
* running eclipse:eclipse. FOr each file you can specify the name and the
text content.
@@ -394,6 +404,7 @@ public class EclipsePlugin
* </plugin>
* </pre>
*/
+ // CHECKSTYLE_ON: LineLength
@Parameter
private EclipseConfigFile[] additionalConfig;
@@ -449,8 +460,8 @@ public class EclipsePlugin
/**
* If set to <code>true</code>, the standard execution environment
matching the compiler settings is set as JRE. If
- * set to <code>false</code>, the JRE matching the configured
compiler-plugin executable or JAVA_HOME is selected by
- * name, if it is configured in the workspace.
+ * set to <code>false</code>, the JRE matching the configured
compiler-plugin executable or JAVA_HOME is selected
+ * by name, if it is configured in the workspace.
*
* @since 2.10
*/
@@ -910,7 +921,8 @@ public class EclipsePlugin
// ear projects don't contain java sources
// pde projects are always java projects
isJavaProject =
- ( Constants.LANGUAGE_JAVA.equals( artifactHandler.getLanguage() )
&& !Constants.PROJECT_PACKAGING_EAR.equals( packaging ) );
+ ( Constants.LANGUAGE_JAVA.equals( artifactHandler.getLanguage() )
+ && !Constants.PROJECT_PACKAGING_EAR.equals(
packaging ) );
if ( sourceIncludes == null )
{
@@ -1004,6 +1016,7 @@ public class EclipsePlugin
}
}
+ // CHECKSTYLE_OFF: MagicNumber
private void parseConfigurationOptions()
{
if ( "R7".equalsIgnoreCase( wtpversion ) ) //$NON-NLS-1$
@@ -1027,6 +1040,7 @@ public class EclipsePlugin
getLog().info( Messages.getString( "EclipsePlugin.wtpversion",
wtpversion ) );
}
}
+ // CHECKSTYLE_ON: MagicNumber
/**
* Extension point for subclasses.
@@ -1057,7 +1071,7 @@ public class EclipsePlugin
}
if ( !containsJREContainer )
{
- getLog().warn( Messages.getString(
"EclipsePlugin.missingjrecontainer" ) ); //$NON-NLS-1$
+ getLog().warn( Messages.getString(
"EclipsePlugin.missingjrecontainer" ) );
classpathContainers.add( 0,
COMMON_PATH_JDT_LAUNCHING_JRE_CONTAINER );
}
}
@@ -1068,10 +1082,8 @@ public class EclipsePlugin
// validate sanity of the current m2 project
if ( Arrays.binarySearch( WTP_SUPPORTED_VERSIONS, wtpversion ) < 0 )
{
- throw new MojoExecutionException(
- Messages.getString(
"EclipsePlugin.unsupportedwtp", new Object[] { //$NON-NLS-1$
- wtpversion,
-
StringUtils.join( WTP_SUPPORTED_VERSIONS, " " ) } ) ); //$NON-NLS-1$
+ throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.unsupportedwtp", new Object[] {
+ wtpversion, StringUtils.join( WTP_SUPPORTED_VERSIONS, " " ) }
) );
}
assertNotEmpty( executedProject.getGroupId(), POM_ELT_GROUP_ID );
@@ -1079,18 +1091,18 @@ public class EclipsePlugin
if ( executedProject.getFile() == null ||
!executedProject.getFile().exists() )
{
- throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.missingpom" ) ); //$NON-NLS-1$
+ throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.missingpom" ) );
}
- if ( "pom".equals( packaging ) && eclipseProjectDir == null )
//$NON-NLS-1$
+ if ( "pom".equals( packaging ) && eclipseProjectDir == null )
{
- getLog().info( Messages.getString( "EclipsePlugin.pompackaging" )
); //$NON-NLS-1$
+ getLog().info( Messages.getString( "EclipsePlugin.pompackaging" )
);
return false;
}
if ( "eclipse-plugin".equals( packaging ) )
{
- getLog().info( Messages.getString( "EclipsePlugin.pdepackaging" )
); //$NON-NLS-1$
+ getLog().info( Messages.getString( "EclipsePlugin.pdepackaging" )
);
return false;
}
@@ -1101,19 +1113,20 @@ public class EclipsePlugin
if ( !eclipseProjectDir.exists() && !eclipseProjectDir.mkdirs() )
{
- throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.cantcreatedir", eclipseProjectDir ) ); //$NON-NLS-1$
+ throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.cantcreatedir", eclipseProjectDir ) );
}
if ( !eclipseProjectDir.equals(
executedProject.getFile().getParentFile() ) )
{
if ( !eclipseProjectDir.isDirectory() )
{
- throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.notadir", eclipseProjectDir ) ); //$NON-NLS-1$
+ throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.notadir", eclipseProjectDir ) );
}
eclipseProjectDir = new File( eclipseProjectDir,
executedProject.getArtifactId() );
if ( !eclipseProjectDir.isDirectory() &&
!eclipseProjectDir.mkdirs() )
{
- throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.cantcreatedir", eclipseProjectDir ) ); //$NON-NLS-1$
+ throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.cantcreatedir",
+
eclipseProjectDir ) );
}
}
@@ -1140,9 +1153,9 @@ public class EclipsePlugin
if ( eclipseDownloadSources )
{
// deprecated warning
- getLog().warn( Messages.getString( "EclipsePlugin.deprecatedpar",
new Object[] { //$NON-NLS-1$
- "eclipse.downloadSources",
//$NON-NLS-1$
- "downloadSources" } ) );
//$NON-NLS-1$
+ getLog().warn( Messages.getString( "EclipsePlugin.deprecatedpar",
new Object[] {
+ "eclipse.downloadSources",
+ "downloadSources" } ) );
downloadSources = true;
}
@@ -1172,6 +1185,7 @@ public class EclipsePlugin
// NOTE: This could change the config!
writeConfigurationExtras( config );
+ // CHECKSTYLE_OFF: MagicNumber
if ( wtpVersionFloat == 0.7f )
{
new EclipseWtpmodulesWriter().init( getLog(), config ).write();
@@ -1189,6 +1203,7 @@ public class EclipsePlugin
{
new EclipseWtpComponent15Writer().init( getLog(), config ).write();
}
+ // CHECKSTYLE_ON: MagicNumber
new EclipseSettingsWriter().init( getLog(), config ).write();
@@ -1214,7 +1229,7 @@ public class EclipsePlugin
writeAdditionalConfig();
- getLog().info( Messages.getString( "EclipsePlugin.wrote", new Object[]
{ //$NON-NLS-1$
+ getLog().info( Messages.getString( "EclipsePlugin.wrote", new Object[]
{
config.getEclipseProjectName(),
eclipseProjectDir.getAbsolutePath() } ) );
}
@@ -1229,7 +1244,7 @@ public class EclipsePlugin
if ( projectRelativeFile.isDirectory() )
{
// just ignore?
- getLog().warn( Messages.getString(
"EclipsePlugin.foundadir", //$NON-NLS-1$
+ getLog().warn( Messages.getString(
"EclipsePlugin.foundadir",
projectRelativeFile.getAbsolutePath() ) );
}
@@ -1301,23 +1316,22 @@ public class EclipsePlugin
}
catch ( WagonException e )
{
- throw new MojoExecutionException(
- Messages.getString(
"EclipsePlugin.remoteexception", //$NON-NLS-1$
- new
Object[] { file.getURL(), e.getMessage() } ) );
+ throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.remoteexception",
+ new Object[] {
file.getURL(), e.getMessage() } ) );
}
catch ( IOException e )
{
- throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.cantwritetofile", //$NON-NLS-1$
+ throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.cantwritetofile",
projectRelativeFile.getAbsolutePath() ) );
}
catch ( ResourceNotFoundException e )
{
- throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.cantfindresource", //$NON-NLS-1$
+ throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.cantfindresource",
file.getLocation() ) );
}
catch ( XmlPullParserException e )
{
- throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.settingsxmlfailure", //$NON-NLS-1$
+ throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.settingsxmlfailure",
e.getMessage() ) );
}
}
@@ -1493,7 +1507,7 @@ public class EclipsePlugin
{
if ( string == null )
{
- throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.missingelement", elementName ) ); //$NON-NLS-1$
+ throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.missingelement", elementName ) );
}
}
@@ -1509,6 +1523,7 @@ public class EclipsePlugin
{
projectnatures = new ArrayList();
+ // CHECKSTYLE_OFF: MagicNumber
if ( wtpVersionFloat >= 1.0f )
{
projectnatures.add( NATURE_WST_FACET_CORE_NATURE ); // WTP 1.0
nature
@@ -1533,6 +1548,7 @@ public class EclipsePlugin
projectnatures.add( NATURE_JEM_WORKBENCH_JAVA_EMF ); // WTP
0.7/1.0 nature
}
}
+ // CHECKSTYLE_ON: MagicNumber
}
@@ -1573,6 +1589,7 @@ public class EclipsePlugin
{
buildcommands = new ArrayList();
+ // CHECKSTYLE_OFF: MagicNumber
if ( wtpVersionFloat == 0.7f )
{
buildcommands.add( new BuildCommand(
BUILDER_WST_COMPONENT_STRUCTURAL ) ); // WTP 0.7 builder
@@ -1605,6 +1622,7 @@ public class EclipsePlugin
// WTP 0.7 builder
buildcommands.add( new BuildCommand(
BUILDER_WST_COMPONENT_STRUCTURAL_DEPENDENCY_RESOLVER ) );
}
+ // CHECKSTYLE_ON: MagicNumber
}
public final EclipseSourceDir[] buildDirectoryList( MavenProject project,
File basedir, File buildOutputDirectory )
@@ -1667,7 +1685,9 @@ public class EclipsePlugin
directories.addAll( testDirectories );
}
if ( ajdt )
+ {
extractAspectDirs( directories, project, basedir, projectBaseDir,
testOutput );
+ }
return (EclipseSourceDir[]) directories.toArray( new
EclipseSourceDir[directories.size()] );
}
@@ -1756,14 +1776,15 @@ public class EclipsePlugin
boolean merged = originalDir.merge( resourceDir );
if ( merged )
{
- getLog().info( "Resource directory's path matches an
existing source directory. Resources have been merged with the source directory
"
+ getLog().info( "Resource directory's path matches an
existing source directory. "
+ + "Resources have been merged with the source
directory "
+ originalDir.getPath() );
}
else
{
- getLog().info( "Resource directory's path matches an
existing source directory but \"test\", \"filtering\" or \"output\" were
different."
- + "The resulting eclipse configuration
may not accurately reflect the project configuration for "
- + originalDir.getPath() );
+ getLog().info( "Resource directory's path matches an
existing source directory but \"test\", "
+ + "\"filtering\" or \"output\" were different. The
resulting eclipse configuration "
+ + "may not accurately reflect the project
configuration for " + originalDir.getPath() );
}
}
@@ -2084,8 +2105,9 @@ public class EclipsePlugin
{
getLog().info( "Artifact "
+ artifact.getId()
- + " already available as a workspace
project, but with different version. Expected: "
- + artifact.getBaseVersion() + ", found:
" + workspaceArtefact.getVersion() );
+ + " already available as a workspace
project, but with different version. "
+ + "Expected: " +
artifact.getBaseVersion() + ", found: "
+ + workspaceArtefact.getVersion() );
}
}
}
@@ -2101,7 +2123,8 @@ public class EclipsePlugin
protected final boolean hasToResolveJar( Artifact art )
{
return !( getUseProjectReferences() && isAvailableAsAReactorProject(
art ) )
- || ( limitProjectReferencesToWorkspace && !(
getUseProjectReferences() && isAvailableAsAWorkspaceProject( art ) ) );
+ || ( limitProjectReferencesToWorkspace
+ && !( getUseProjectReferences() &&
isAvailableAsAWorkspaceProject( art ) ) );
}
/**
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=1705359&r1=1705358&r2=1705359&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
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
import java.util.ArrayList;
import java.util.LinkedHashSet;
@@ -231,9 +232,10 @@ public class EclipseSourceDir
/**
* Wheter this resource should be copied with filtering.
+ *
* @param filtering filter resources
*/
- public void setFiltering(boolean filtering)
+ public void setFiltering( boolean filtering )
{
this.filtering = filtering;
}
@@ -268,7 +270,9 @@ public class EclipseSourceDir
*/
public String toString()
{
- return (isResource ? "resource " : "source ") + path + ": " +
"output=" + output + ", " + "include=[" + getIncludeAsString() + "], " +
"exclude=[" + getExcludeAsString() + "], " + "test=" + test + ", " +
"filtering=" + filtering;
+ return ( isResource ? "resource " : "source " ) + path + ": " +
"output=" + output + ", " + "include=["
+ + getIncludeAsString() + "], " + "exclude=[" +
getExcludeAsString() + "], " + "test=" + test + ", "
+ + "filtering=" + filtering;
}
/**
@@ -312,10 +316,10 @@ public class EclipseSourceDir
// if the orginal or merged dir have an empty "include" this means
all is included,
// so merge includes only if both are not empty
- if (!include.isEmpty() && !mergeWith.include.isEmpty())
+ if ( !include.isEmpty() && !mergeWith.include.isEmpty() )
{
- includesAsSet.addAll(include);
- includesAsSet.addAll(mergeWith.include);
+ includesAsSet.addAll( include );
+ includesAsSet.addAll( mergeWith.include );
}
include = new ArrayList( includesAsSet );
@@ -326,19 +330,19 @@ public class EclipseSourceDir
exclude = new ArrayList( excludesAsSet );
}
- if (!StringUtils.equals(output, mergeWith.output))
+ if ( !StringUtils.equals( output, mergeWith.output ) )
{
// Request to merge when 'output' is not identical
return false;
}
- if (test != mergeWith.test)
+ if ( test != mergeWith.test )
{
// Request to merge when 'test' is not identical
return false;
}
- if (filtering != mergeWith.filtering)
+ if ( filtering != mergeWith.filtering )
{
// Request to merge when 'filtering' is not identical
return false;
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=1705359&r1=1705358&r2=1705359&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
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
import aQute.lib.osgi.Analyzer;
import org.apache.maven.artifact.Artifact;
@@ -70,7 +71,9 @@ import java.util.regex.Pattern;
* directory, copy plugins jars to the local maven repo, and generates
appropriate poms. This is the official central
* repository builder for Eclipse plugins, so it has the necessary default
values. For customized repositories see
* {@link MakeArtifactsMojo} Typical usage:
- * <code>mvn eclipse:to-maven
-DdeployTo=maven.org::default::scpexe://repo1.maven.org/home/maven/repository-staging/to-ibiblio/eclipse-staging
-DeclipseDir=.</code>
+ * <code>mvn eclipse:to-maven
+ *
-DdeployTo=maven.org::default::scpexe://repo1.maven.org/home/maven/repository-staging/to-ibiblio/eclipse-staging
+ * -DeclipseDir=.</code>
*
* @author Fabrizio Giustina
* @author <a href="mailto:[email protected]";>Carlos Sanchez</a>
@@ -85,12 +88,12 @@ public class EclipseToMavenMojo
/**
* A pattern the <code>deployTo</code> param should match.
*/
- private static final Pattern DEPLOYTO_PATTERN = Pattern.compile(
"(.+)::(.+)::(.+)" ); //$NON-NLS-1$
+ private static final Pattern DEPLOYTO_PATTERN = Pattern.compile(
"(.+)::(.+)::(.+)" );
/**
* A pattern for a 4 digit osgi version number.
*/
- private static final Pattern VERSION_PATTERN = Pattern.compile(
"(([0-9]+\\.)+[0-9]+)" ); //$NON-NLS-1$
+ private static final Pattern VERSION_PATTERN = Pattern.compile(
"(([0-9]+\\.)+[0-9]+)" );
/**
* Plexus container, needed to manually lookup components for deploy of
artifacts.
@@ -164,7 +167,7 @@ public class EclipseToMavenMojo
{
if ( eclipseDir == null )
{
- getLog().info( Messages.getString(
"EclipseToMavenMojo.eclipseDirectoryPrompt" ) ); //$NON-NLS-1$
+ getLog().info( Messages.getString(
"EclipseToMavenMojo.eclipseDirectoryPrompt" ) );
String eclipseDirString;
try
@@ -173,8 +176,8 @@ public class EclipseToMavenMojo
}
catch ( IOException e )
{
- throw new MojoFailureException(
- Messages.getString(
"EclipseToMavenMojo.errorreadingfromstandardinput" ) ); //$NON-NLS-1$
+ throw new MojoFailureException(
+ Messages.getString(
"EclipseToMavenMojo.errorreadingfromstandardinput" ) );
}
eclipseDir = new File( eclipseDirString );
}
@@ -182,15 +185,15 @@ public class EclipseToMavenMojo
if ( !eclipseDir.isDirectory() )
{
throw new MojoFailureException( Messages.getString(
"EclipseToMavenMojo.directoydoesnotexist",
-
eclipseDir.getAbsolutePath() ) ); //$NON-NLS-1$
+
eclipseDir.getAbsolutePath() ) );
}
- File pluginDir = new File( eclipseDir, "plugins" ); //$NON-NLS-1$
+ File pluginDir = new File( eclipseDir, "plugins" );
if ( !pluginDir.isDirectory() )
{
throw new MojoFailureException( Messages.getString(
"EclipseToMavenMojo.plugindirectorydoesnotexist",
-
pluginDir.getAbsolutePath() ) ); //$NON-NLS-1$
+
pluginDir.getAbsolutePath() ) );
}
File[] files = pluginDir.listFiles();
@@ -199,29 +202,28 @@ public class EclipseToMavenMojo
if ( remoteRepo != null )
{
- getLog().info(
- Messages.getString(
"EclipseToMavenMojo.remoterepositorydeployto", deployTo ) ); //$NON-NLS-1$
+ getLog().info( Messages.getString(
"EclipseToMavenMojo.remoterepositorydeployto", deployTo ) );
}
Map plugins = new HashMap();
Map models = new HashMap();
- for (File file : files) {
- getLog().info(
- Messages.getString("EclipseToMavenMojo.processingfile",
file.getAbsolutePath())); //$NON-NLS-1$
+ for ( File file : files )
+ {
+ getLog().info( Messages.getString(
"EclipseToMavenMojo.processingfile", file.getAbsolutePath() ) );
- processFile(file, plugins, models);
+ processFile( file, plugins, models );
}
int i = 1;
- for (Object o : plugins.keySet()) {
-
getLog().info(Messages.getString("EclipseToMavenMojo.processingplugin",
- new Object[]{i++,
- plugins.keySet().size()})); //$NON-NLS-1$
+ for ( Object o : plugins.keySet() )
+ {
+ getLog().info( Messages.getString(
"EclipseToMavenMojo.processingplugin", new Object[] { i++,
+ plugins.keySet().size() } ) ); //$NON-NLS-1$
String key = (String) o;
- EclipseOsgiPlugin plugin = (EclipseOsgiPlugin) plugins.get(key);
- Model model = (Model) models.get(key);
- writeArtifact(plugin, model, remoteRepo);
+ EclipseOsgiPlugin plugin = (EclipseOsgiPlugin) plugins.get( key );
+ Model model = (Model) models.get( key );
+ writeArtifact( plugin, model, remoteRepo );
}
}
@@ -232,8 +234,7 @@ public class EclipseToMavenMojo
if ( plugin == null )
{
- getLog().warn(
- Messages.getString( "EclipseToMavenMojo.skippingfile",
file.getAbsolutePath() ) ); //$NON-NLS-1$
+ getLog().warn( Messages.getString(
"EclipseToMavenMojo.skippingfile", file.getAbsolutePath() ) );
return;
}
@@ -256,12 +257,12 @@ public class EclipseToMavenMojo
protected String getKey( Model model )
{
- return model.getGroupId() + "." + model.getArtifactId(); //$NON-NLS-1$
+ return model.getGroupId() + "." + model.getArtifactId();
}
private String getKey( Dependency dependency )
{
- return dependency.getGroupId() + "." + dependency.getArtifactId();
//$NON-NLS-1$
+ return dependency.getGroupId() + "." + dependency.getArtifactId();
}
/**
@@ -275,19 +276,21 @@ public class EclipseToMavenMojo
protected void resolveVersionRanges( Model model, Map models )
throws MojoFailureException
{
- for (Dependency dep : model.getDependencies()) {
- if (dep.getVersion().contains("[")
- || dep.getVersion().contains("(")) //$NON-NLS-1$
//$NON-NLS-2$
- {
- String key = getKey(model);
- Model dependencyModel = (Model) models.get(getKey(dep));
- if (dependencyModel != null) {
- dep.setVersion(dependencyModel.getVersion());
- } else {
+ for ( Dependency dep : model.getDependencies() )
+ {
+ if ( dep.getVersion().contains( "[" ) ||
dep.getVersion().contains( "(" ) )
+ {
+ String key = getKey( model );
+ Model dependencyModel = (Model) models.get( getKey( dep ) );
+ if ( dependencyModel != null )
+ {
+ dep.setVersion( dependencyModel.getVersion() );
+ }
+ else
+ {
throw new MojoFailureException(
-
Messages.getString("EclipseToMavenMojo.unabletoresolveversionrange",
- new Object[]{dep //$NON-NLS-1$
- , key})); //$NON-NLS-1$
+ Messages.getString(
"EclipseToMavenMojo.unabletoresolveversionrange",
+ new
Object[] { dep, key } ) );
}
}
}
@@ -306,7 +309,7 @@ public class EclipseToMavenMojo
{
return new ExplodedPlugin( file );
}
- else if ( file.getName().endsWith( ".jar" ) ) //$NON-NLS-1$
+ else if ( file.getName().endsWith( ".jar" ) )
{
try
{
@@ -314,9 +317,8 @@ public class EclipseToMavenMojo
}
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 );
}
}
@@ -339,8 +341,7 @@ public class EclipseToMavenMojo
{
if ( !plugin.hasManifest() )
{
- getLog().warn(
- Messages.getString(
"EclipseToMavenMojo.plugindoesnothavemanifest", plugin ) ); //$NON-NLS-1$
+ getLog().warn( Messages.getString(
"EclipseToMavenMojo.plugindoesnothavemanifest", plugin ) );
return null;
}
@@ -353,8 +354,7 @@ public class EclipseToMavenMojo
if ( bundleName == null || version == null )
{
- getLog().error(
- Messages.getString(
"EclipseToMavenMojo.unabletoreadbundlefrommanifest" ) ); //$NON-NLS-1$
+ getLog().error( Messages.getString(
"EclipseToMavenMojo.unabletoreadbundlefrommanifest" ) );
return null;
}
@@ -377,7 +377,7 @@ public class EclipseToMavenMojo
artifactId = createArtifactId( bundleName );
Model model = new Model();
- model.setModelVersion( "4.0.0" ); //$NON-NLS-1$
+ model.setModelVersion( "4.0.0" );
model.setGroupId( groupId );
model.setArtifactId( artifactId );
model.setName( name );
@@ -385,7 +385,7 @@ public class EclipseToMavenMojo
model.setProperties( plugin.getPomProperties() );
- if ( groupId.startsWith( "org.eclipse" ) ) //$NON-NLS-1$
+ if ( groupId.startsWith( "org.eclipse" ) )
{
// why do we need a parent?
@@ -398,15 +398,16 @@ public class EclipseToMavenMojo
// infer license for know projects, everything at eclipse is
licensed under EPL
// maybe too simplicistic, but better than nothing
License license = new License();
- license.setName( "Eclipse Public License - v 1.0" ); //$NON-NLS-1$
- license.setUrl(
"http://www.eclipse.org/org/documents/epl-v10.html"; ); //$NON-NLS-1$
+ license.setName( "Eclipse Public License - v 1.0" );
+ license.setUrl(
"http://www.eclipse.org/org/documents/epl-v10.html"; );
model.addLicense( license );
}
if ( deps.length > 0 )
{
- for (Dependency dep : deps) {
- model.getDependencies().add(dep);
+ for ( Dependency dep : deps )
+ {
+ model.getDependencies().add( dep );
}
}
@@ -428,19 +429,18 @@ public class EclipseToMavenMojo
ArtifactMetadata metadata;
File pomFile = null;
Artifact pomArtifact =
- artifactFactory.createArtifact( model.getGroupId(),
model.getArtifactId(), model.getVersion(), null,
- "pom" ); //$NON-NLS-1$
+ artifactFactory.createArtifact( model.getGroupId(),
model.getArtifactId(), model.getVersion(), null,
+ "pom" );
Artifact artifact =
artifactFactory.createArtifact( model.getGroupId(),
model.getArtifactId(), model.getVersion(), null,
Constants.PROJECT_PACKAGING_JAR );
try
{
- pomFile = File.createTempFile( "pom-", ".xml" ); //$NON-NLS-1$
//$NON-NLS-2$
+ pomFile = File.createTempFile( "pom-", ".xml" );
// TODO use WriterFactory.newXmlWriter() when plexus-utils is
upgraded to 1.4.5+
- fw = new OutputStreamWriter( new FileOutputStream( pomFile ),
"UTF-8" ); //$NON-NLS-1$
- model.setModelEncoding(
- "UTF-8" ); // to be removed when encoding is detected instead
of forced to UTF-8 //$NON-NLS-1$
+ fw = new OutputStreamWriter( new FileOutputStream( pomFile ),
"UTF-8" );
+ model.setModelEncoding( "UTF-8" ); // to be removed when encoding
is detected instead of forced to UTF-8
pomFile.deleteOnExit();
new MavenXpp3Writer().write( fw, model );
metadata = new ProjectArtifactMetadata( pomArtifact, pomFile );
@@ -448,8 +448,8 @@ public class EclipseToMavenMojo
}
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 );
}
finally
{
@@ -473,18 +473,18 @@ public class EclipseToMavenMojo
}
catch ( ArtifactDeploymentException e )
{
- throw new MojoExecutionException(
- Messages.getString(
"EclipseToMavenMojo.errordeployartifacttorepository" ), e ); //$NON-NLS-1$
+ throw new MojoExecutionException(
+ Messages.getString(
"EclipseToMavenMojo.errordeployartifacttorepository" ), e );
}
catch ( ArtifactInstallationException e )
{
- throw new MojoExecutionException(
- Messages.getString(
"EclipseToMavenMojo.errorinstallartifacttorepository" ), e ); //$NON-NLS-1$
+ throw new MojoExecutionException(
+ Messages.getString(
"EclipseToMavenMojo.errorinstallartifacttorepository" ), e );
}
catch ( IOException e )
{
- throw new MojoExecutionException(
- Messages.getString(
"EclipseToMavenMojo.errorgettingjarfileforplugin", plugin ), e ); //$NON-NLS-1$
+ throw new MojoExecutionException(
+ Messages.getString(
"EclipseToMavenMojo.errorgettingjarfileforplugin", plugin ), e );
}
finally
{
@@ -502,27 +502,27 @@ public class EclipseToMavenMojo
* The 4th (build) token MUST be separed with "-" and not with "." in
maven. A version with 4 dots is not parsed,
* and the whole string is considered a qualifier. See tests in
DefaultArtifactVersion for reference.
*
- * @param version initial version
+ * @param version initial version
* @param forcedQualifier build number
- * @param stripQualifier always remove 4th token in version
+ * @param stripQualifier always remove 4th token in version
* @return converted version
*/
protected String osgiVersionToMavenVersion( String version, String
forcedQualifier, boolean stripQualifier )
{
- if ( stripQualifier && StringUtils.countMatches( version, "." ) > 2 )
//$NON-NLS-1$
+ if ( stripQualifier && StringUtils.countMatches( version, "." ) > 2 )
{
- version = StringUtils.substring( version, 0, version.lastIndexOf(
'.' ) ); //$NON-NLS-1$
+ version = StringUtils.substring( version, 0, version.lastIndexOf(
'.' ) );
}
- else if ( StringUtils.countMatches( version, "." ) > 2 ) //$NON-NLS-1$
+ else if ( StringUtils.countMatches( version, "." ) > 2 )
{
- int lastDot = version.lastIndexOf( '.' ); //$NON-NLS-1$
+ int lastDot = version.lastIndexOf( '.' );
if ( StringUtils.isNotEmpty( forcedQualifier ) )
{
- version = StringUtils.substring( version, 0, lastDot ) + "-" +
forcedQualifier; //$NON-NLS-1$
+ version = StringUtils.substring( version, 0, lastDot ) + "-" +
forcedQualifier;
}
else
{
- version = StringUtils.substring( version, 0, lastDot ) + "-"
//$NON-NLS-1$
+ version = StringUtils.substring( version, 0, lastDot ) + "-"
+ StringUtils.substring( version, lastDot + 1,
version.length() );
}
}
@@ -546,10 +546,8 @@ public class EclipseToMavenMojo
if ( !matcher.matches() )
{
throw new MojoFailureException( deployTo,
- Messages.getString(
"EclipseToMavenMojo.invalidsyntaxforrepository" ),
- //$NON-NLS-1$
- Messages.getString(
-
"EclipseToMavenMojo.invalidremoterepositorysyntax" ) ); //$NON-NLS-1$
+ Messages.getString(
"EclipseToMavenMojo.invalidsyntaxforrepository" ),
+ Messages.getString(
"EclipseToMavenMojo.invalidremoterepositorysyntax" ) );
}
else
{
@@ -565,8 +563,8 @@ public class EclipseToMavenMojo
catch ( ComponentLookupException e )
{
throw new MojoExecutionException(
- Messages.getString(
"EclipseToMavenMojo.cannotfindrepositorylayout", layout ),
- e ); //$NON-NLS-1$
+ Messages.getString(
"EclipseToMavenMojo.cannotfindrepositorylayout",
+
layout ), e );
}
return
artifactRepositoryFactory.createDeploymentArtifactRepository( id, url,
repoLayout, true );
@@ -642,29 +640,30 @@ public class EclipseToMavenMojo
Map requireBundleHeader = analyzer.parseHeader( requireBundle );
// now iterates on bundles and extract dependencies
- for (Object o : requireBundleHeader.entrySet()) {
+ for ( Object o : requireBundleHeader.entrySet() )
+ {
Map.Entry entry = (Map.Entry) o;
String bundleName = (String) entry.getKey();
Map attributes = (Map) entry.getValue();
- String version = (String)
attributes.get(Analyzer.BUNDLE_VERSION.toLowerCase());
- boolean optional =
"optional".equals(attributes.get("resolution:")); //$NON-NLS-1$ //$NON-NLS-2$
+ String version = (String) attributes.get(
Analyzer.BUNDLE_VERSION.toLowerCase() );
+ boolean optional = "optional".equals( attributes.get(
"resolution:" ) );
- if (version == null) {
- getLog().info(
-
Messages.getString("EclipseToMavenMojo.missingversionforbundle", bundleName));
//$NON-NLS-1$
+ if ( version == null )
+ {
+ getLog().info( Messages.getString(
"EclipseToMavenMojo.missingversionforbundle", bundleName ) );
version = "[0,)"; //$NON-NLS-1$
}
- version = fixBuildNumberSeparator(version);
+ version = fixBuildNumberSeparator( version );
Dependency dep = new Dependency();
- dep.setGroupId(createGroupId(bundleName));
- dep.setArtifactId(createArtifactId(bundleName));
- dep.setVersion(version);
- dep.setOptional(optional);
+ dep.setGroupId( createGroupId( bundleName ) );
+ dep.setArtifactId( createArtifactId( bundleName ) );
+ dep.setVersion( version );
+ dep.setOptional( optional );
- dependencies.add(dep);
+ dependencies.add( dep );
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
import java.io.File;
import java.io.IOException;
@@ -180,28 +181,33 @@ public class InstallPluginsMojo
eclipseDir.mkdirs();
}
- for (Object artifact1 : artifacts) {
+ for ( Object artifact1 : artifacts )
+ {
Artifact artifact = (Artifact) artifact1;
- if (pluginDependencyTypes.contains(artifact.getType())) {
- getLog().debug("Processing Eclipse plugin dependency: " +
artifact.getId());
+ if ( pluginDependencyTypes.contains( artifact.getType() ) )
+ {
+ getLog().debug( "Processing Eclipse plugin dependency: " +
artifact.getId() );
MavenProject project;
- try {
+ try
+ {
project =
- projectBuilder.buildFromRepository(artifact,
Collections.EMPTY_LIST, localRepository, true);
- } catch (ProjectBuildingException e) {
- throw new MojoExecutionException("Failed to load project
metadata (POM) for: " + artifact.getId(),
- e);
+ projectBuilder.buildFromRepository( artifact,
Collections.EMPTY_LIST, localRepository, true );
+ }
+ catch ( ProjectBuildingException e )
+ {
+ throw new MojoExecutionException( "Failed to load project
metadata (POM) for: " + artifact.getId(),
+ e );
}
- install(artifact, project);
- } else {
- getLog().debug(
- "Skipping dependency: "
- + artifact.getId()
- + ". Set pluginDependencyTypes with a
comma-separated list of types to change this.");
+ install( artifact, project );
+ }
+ else
+ {
+ getLog().debug( "Skipping dependency: " + artifact.getId() +
". "
+ + "Set pluginDependencyTypes with a comma-separated list
of types to change this." );
}
}
}
@@ -249,7 +255,7 @@ public class InstallPluginsMojo
Properties properties = project.getProperties();
if ( properties != null )
{
- installAsJar =
!Boolean.valueOf(properties.getProperty(PROP_UNPACK_PLUGIN, "false"));
+ installAsJar = !Boolean.valueOf( properties.getProperty(
PROP_UNPACK_PLUGIN, "false" ) );
}
Attributes attributes;
@@ -260,8 +266,7 @@ public class InstallPluginsMojo
Manifest manifest = jar.getManifest();
if ( manifest == null )
{
- getLog().debug(
- "Ignoring " + artifact.getArtifactId()
+ getLog().debug( "Ignoring " + artifact.getArtifactId()
+ " as it is does not have a Manifest (and
so is not an OSGi bundle)" );
return;
}
@@ -285,8 +290,7 @@ public class InstallPluginsMojo
Object bundleSymbolicName = attributes.getValue( "Bundle-SymbolicName"
);
if ( bundleSymbolicName == null && bundleName == null )
{
- getLog().debug(
- "Ignoring " + artifact.getArtifactId()
+ getLog().debug( "Ignoring " + artifact.getArtifactId()
+ " as it is not an OSGi bundle (no
Bundle-SymbolicName or Bundle-Name in manifest)" );
return;
}
@@ -334,14 +338,12 @@ public class InstallPluginsMojo
{
if ( installAsJar )
{
- getLog().info(
- "Skipping plugin installation for: " +
artifact.getId() + "; file: " + pluginFile
+ getLog().info( "Skipping plugin installation for: " +
artifact.getId() + "; file: " + pluginFile
+ " already exists. Set overwrite = true to
override this." );
}
else if ( !installAsJar )
{
- getLog().info(
- "Skipping plugin installation for: " +
artifact.getId() + "; directory: " + pluginDir
+ getLog().info( "Skipping plugin installation for: " +
artifact.getId() + "; directory: " + pluginDir
+ " already exists. Set overwrite = true to
override this." );
}
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/LinkedResource.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/LinkedResource.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/LinkedResource.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/LinkedResource.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
-
import org.codehaus.plexus.util.xml.XMLWriter;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -128,12 +128,12 @@ public class LinkedResource
throw new IllegalArgumentException( "Both location and locationURI
nodes are set." );
}
- if (locationNode != null)
+ if ( locationNode != null )
{
location = locationNode.getValue();
}
- if (locationURINode != null)
+ if ( locationURINode != null )
{
locationURI = locationURINode.getValue();
}
@@ -163,7 +163,7 @@ public class LinkedResource
writer.writeText( locationURI );
writer.endElement(); // locationURI
}
- writer.endElement();// link
+ writer.endElement(); // link
}
public boolean equals( Object obj )
@@ -182,10 +182,13 @@ public class LinkedResource
}
}
+
public int hashCode()
{
+ // CHECKSTYLE_OFF: MagicNumber
return name.hashCode() + ( type == null ? 0 : 13 * type.hashCode() )
+ ( location == null ? 0 : 17 * location.hashCode() )
+ ( locationURI == null ? 0 : 19 * locationURI.hashCode() );
+ // CHECKSTYLE_ON: MagicNumber
}
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/Messages.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/Messages.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/Messages.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/Messages.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
import java.text.MessageFormat;
import java.util.MissingResourceException;
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipseCleanMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipseCleanMojo.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipseCleanMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipseCleanMojo.java
Fri Sep 25 21:53:36 2015
@@ -19,7 +19,6 @@ package org.apache.maven.plugin.eclipse;
* under the License.
*/
-
import java.io.File;
import org.apache.maven.plugin.MojoExecutionException;
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=1705359&r1=1705358&r2=1705359&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
Fri Sep 25 21:53:36 2015
@@ -19,7 +19,6 @@ package org.apache.maven.plugin.eclipse;
* under the License.
*/
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -141,13 +140,15 @@ public class MyEclipsePlugin
{
String warSourceDirectory =
IdeUtils.getPluginSetting( config.getProject(),
JeeUtils.ARTIFACT_MAVEN_WAR_PLUGIN,
-
"warSourceDirectory",//$NON-NLS-1$
- "/src/main/webapp" );
//$NON-NLS-1$
+ "warSourceDirectory",
+ "/src/main/webapp" );
EclipseSourceDir[] sourceDirs = config.getSourceDirs();
- for (EclipseSourceDir sourceDir : sourceDirs) {
- if (!sourceDir.isTest()) {
- sourceDir.setOutput(warSourceDirectory +
"/WEB-INF/classes");
+ for ( EclipseSourceDir sourceDir : sourceDirs )
+ {
+ if ( !sourceDir.isTest() )
+ {
+ sourceDir.setOutput( warSourceDirectory +
"/WEB-INF/classes" );
}
}
}
@@ -297,7 +298,8 @@ public class MyEclipsePlugin
else
{
j2eeVersion =
- JeeUtils.getJeeDescriptorFromServletVersion(
JeeUtils.resolveServletVersion( project ) ).getJeeVersion();
+ JeeUtils.getJeeDescriptorFromServletVersion(
+
JeeUtils.resolveServletVersion( project ) ).getJeeVersion();
}
if ( "1.3".equals( j2eeVersion ) )
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadCleanMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadCleanMojo.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadCleanMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RadCleanMojo.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
import java.io.File;
@@ -175,10 +176,11 @@ public class RadCleanMojo
{
String[] oldFiles =
FileUtils.getFilesFromExtension( directory.getAbsolutePath(),
new String[] { packagingType } );
- for (String oldFile : oldFiles) {
- File f = new File(oldFile);
+ for ( String oldFile : oldFiles )
+ {
+ File f = new File( oldFile );
- delete(f);
+ delete( f );
}
}
}
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=1705359&r1=1705358&r2=1705359&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
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
import java.io.File;
import java.util.ArrayList;
@@ -309,21 +310,27 @@ public class RadPlugin
{
if ( this.reactorProjects != null
&& ( Constants.PROJECT_PACKAGING_JAR.equals( artifact.getType() )
- || Constants.PROJECT_PACKAGING_EJB.equals( artifact.getType()
) || Constants.PROJECT_PACKAGING_WAR.equals( artifact.getType() ) ) )
+ || Constants.PROJECT_PACKAGING_EJB.equals( artifact.getType()
)
+ || Constants.PROJECT_PACKAGING_WAR.equals( artifact.getType()
) ) )
{
- for (Object reactorProject1 : this.reactorProjects) {
+ for ( Object reactorProject1 : this.reactorProjects )
+ {
MavenProject reactorProject = (MavenProject) reactorProject1;
- if (reactorProject.getGroupId().equals(artifact.getGroupId())
- &&
reactorProject.getArtifactId().equals(artifact.getArtifactId())) {
- if
(reactorProject.getVersion().equals(artifact.getVersion())) {
+ if ( reactorProject.getGroupId().equals( artifact.getGroupId()
)
+ && reactorProject.getArtifactId().equals(
artifact.getArtifactId() ) )
+ {
+ if ( reactorProject.getVersion().equals(
artifact.getVersion() ) )
+ {
return true;
- } else {
- getLog().info(
- "Artifact "
- + artifact.getId()
- + " already available as a reactor
project, but with different version. Expected: "
- + artifact.getVersion() + ", found: "
+ reactorProject.getVersion());
+ }
+ else
+ {
+ getLog().info( "Artifact "
+ + artifact.getId()
+ + " already available as a reactor
project, but with different version. "
+ + "Expected: " +
artifact.getVersion()
+ + ", found: " +
reactorProject.getVersion() );
}
}
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RemoveCacheMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RemoveCacheMojo.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RemoveCacheMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RemoveCacheMojo.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse;
import java.io.File;
import java.util.ArrayList;
@@ -69,12 +70,16 @@ public class RemoveCacheMojo
*/
private void deleteMarkerFiles( List/* <File> */notAvailableMarkerFiles )
{
- for (Object notAvailableMarkerFile : notAvailableMarkerFiles) {
+ for ( Object notAvailableMarkerFile : notAvailableMarkerFiles )
+ {
File markerFile = (File) notAvailableMarkerFile;
- try {
- IdeUtils.delete(markerFile, getLog());
- } catch (MojoExecutionException e) {
- getLog().warn(e.getMessage(), e);
+ try
+ {
+ IdeUtils.delete( markerFile, getLog() );
+ }
+ catch ( MojoExecutionException e )
+ {
+ getLog().warn( e.getMessage(), e );
}
}
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceConfiguration.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceConfiguration.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceConfiguration.java
Fri Sep 25 21:53:36 2015
@@ -25,6 +25,9 @@ import java.net.URL;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.ide.IdeDependency;
+/**
+ *
+ */
public class WorkspaceConfiguration
{
private File workspaceDirectory;
@@ -130,23 +133,23 @@ public class WorkspaceConfiguration
{
if ( getDefaultDeployServerId() != null &&
getDefaultDeployServerId().startsWith( "was." ) )
{
- if (getDefaultDeployServerId().contains("v7"))
+ if ( getDefaultDeployServerId().contains( "v7" ) )
{
return "7.0";
}
- if (getDefaultDeployServerId().contains("v61"))
+ if ( getDefaultDeployServerId().contains( "v61" ) )
{
return "6.1";
}
- if (getDefaultDeployServerId().contains("v6"))
+ if ( getDefaultDeployServerId().contains( "v6" ) )
{
return "6.0";
}
- if (getDefaultDeployServerId().contains("v51"))
+ if ( getDefaultDeployServerId().contains( "v51" ) )
{
return "5.1";
}
- if (getDefaultDeployServerId().contains("v5"))
+ if ( getDefaultDeployServerId().contains( "v5" ) )
{
return "5.0";
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/AbstractEclipseOsgiPlugin.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/AbstractEclipseOsgiPlugin.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/AbstractEclipseOsgiPlugin.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/AbstractEclipseOsgiPlugin.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse.osgiplugin;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse.osgiplugin;
import java.io.File;
import java.io.IOException;
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/EclipseOsgiPlugin.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/EclipseOsgiPlugin.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/EclipseOsgiPlugin.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/EclipseOsgiPlugin.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse.osgiplugin;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse.osgiplugin;
import java.io.File;
import java.io.IOException;
@@ -84,6 +85,6 @@ public interface EclipseOsgiPlugin
*/
Properties getPomProperties();
- public String getManifestAttribute( String key )
+ String getManifestAttribute( String key )
throws IOException;
}
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/ExplodedPlugin.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/ExplodedPlugin.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/ExplodedPlugin.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/ExplodedPlugin.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse.osgiplugin;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse.osgiplugin;
import java.io.File;
import java.io.FileInputStream;
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/PackagedPlugin.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/PackagedPlugin.java?rev=1705359&r1=1705358&r2=1705359&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/PackagedPlugin.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/osgiplugin/PackagedPlugin.java
Fri Sep 25 21:53:36 2015
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.eclipse.osgiplugin;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.eclipse.osgiplugin;
import java.io.File;
import java.io.IOException;
