You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by fg...@apache.org on 2005/12/31 12:59:30 UTC
svn commit: r360273 - in
/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse:
./ writers/
Author: fgiust
Date: Sat Dec 31 03:59:16 2005
New Revision: 360273
URL: http://svn.apache.org/viewcvs?rev=360273&view=rev
Log:
marking non-i18n strings
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojo.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/EclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.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/EclipseProjectWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpSettingsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpmodulesWriter.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojo.java?rev=360273&r1=360272&r2=360273&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojo.java Sat Dec 31 03:59:16 2005
@@ -44,24 +44,24 @@
* Path under Eclipse workspace where Eclipse Plugin metadata/config is
* stored.
*/
- private static final String DIR_ECLIPSE_PLUGINS_METADATA = ".metadata/.plugins";
+ private static final String DIR_ECLIPSE_PLUGINS_METADATA = ".metadata/.plugins"; //$NON-NLS-1$
/**
* Path under {@value #DIR_ECLIPSE_PLUGINS_METADATA } folder where Eclipse
* Workspace Runtime settings are stored.
*/
private static final String DIR_ECLIPSE_CORE_RUNTIME_SETTINGS = DIR_ECLIPSE_PLUGINS_METADATA
- + "/org.eclipse.core.runtime/.settings";
+ + "/org.eclipse.core.runtime/.settings"; //$NON-NLS-1$
/**
* File that stores the Eclipse JDT Core preferences.
*/
- private static final String FILE_ECLIPSE_JDT_CORE_PREFS = "org.eclipse.jdt.core.prefs";
+ private static final String FILE_ECLIPSE_JDT_CORE_PREFS = "org.eclipse.jdt.core.prefs"; //$NON-NLS-1$
/**
* Property constant under which Variable 'M2_REPO' is setup.
*/
- private static final String CLASSPATH_VARIABLE_M2_REPO = "org.eclipse.jdt.core.classpathVariable.M2_REPO";
+ private static final String CLASSPATH_VARIABLE_M2_REPO = "org.eclipse.jdt.core.classpathVariable.M2_REPO"; //$NON-NLS-1$
/**
* Location of the <code>Eclipse</code> workspace that holds your
@@ -86,12 +86,12 @@
throws MojoExecutionException
{
- File workDir = new File( workspace, DIR_ECLIPSE_CORE_RUNTIME_SETTINGS ); //$NON-NLS-1$
+ File workDir = new File( workspace, DIR_ECLIPSE_CORE_RUNTIME_SETTINGS );
workDir.mkdirs();
Properties props = new Properties();
- File f = new File( workDir, FILE_ECLIPSE_JDT_CORE_PREFS ); //$NON-NLS-1$
+ File f = new File( workDir, FILE_ECLIPSE_JDT_CORE_PREFS );
// preserve old settings
if ( f.exists() )
@@ -112,8 +112,7 @@
}
}
- props.put( CLASSPATH_VARIABLE_M2_REPO, //$NON-NLS-1$
- StringUtils.replace( localRepository.getBasedir(), ":", "\\:" ) ); //$NON-NLS-1$ //$NON-NLS-2$
+ props.put( CLASSPATH_VARIABLE_M2_REPO, StringUtils.replace( localRepository.getBasedir(), ":", "\\:" ) ); //$NON-NLS-1$ //$NON-NLS-2$
try
{
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java?rev=360273&r1=360272&r2=360273&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 Sat Dec 31 03:59:16 2005
@@ -37,23 +37,23 @@
/**
* Definition file for Eclipse Web Tools project.
*/
- private static final String FILE_DOT_WTPMODULES = ".wtpmodules";
+ private static final String FILE_DOT_WTPMODULES = ".wtpmodules"; //$NON-NLS-1$
/**
* Classpath definition file for an Eclipse Java project.
*/
- private static final String FILE_DOT_CLASSPATH = ".classpath";
+ private static final String FILE_DOT_CLASSPATH = ".classpath"; //$NON-NLS-1$
/**
* Project definition file for an Eclipse Project.
*/
- private static final String FILE_DOT_PROJECT = ".project";
+ private static final String FILE_DOT_PROJECT = ".project"; //$NON-NLS-1$
/**
* Web Project definition file for Eclipse Web Tools Project (Release 1.0RC5
* compatible).
*/
- private static final String DIR_DOT_SETTINGS = ".settings";
+ private static final String DIR_DOT_SETTINGS = ".settings"; //$NON-NLS-1$
/**
* @parameter expression="${basedir}"
@@ -89,9 +89,11 @@
try
{
if ( getLog().isDebugEnabled() )
+ {
getLog().debug(
MessageFormat.format( "Forcibly deleting {0} file...", new Object[] { f
.getName() } ) );
+ }
FileUtils.forceDelete( f );
}
catch ( IOException e )
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=360273&r1=360272&r2=360273&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 Sat Dec 31 03:59:16 2005
@@ -53,36 +53,36 @@
extends AbstractMojo
{
- private static final String NATURE_WST_FACET_CORE_NATURE = "org.eclipse.wst.common.project.facet.core.nature";
+ private static final String NATURE_WST_FACET_CORE_NATURE = "org.eclipse.wst.common.project.facet.core.nature"; //$NON-NLS-1$
- private static final String BUILDER_WST_COMPONENT_STRUCTURAL_DEPENDENCY_RESOLVER = "org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver";
+ private static final String BUILDER_WST_COMPONENT_STRUCTURAL_DEPENDENCY_RESOLVER = "org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver"; //$NON-NLS-1$
- private static final String BUILDER_WST_VALIDATION = "org.eclipse.wst.validation.validationbuilder";
+ private static final String BUILDER_WST_VALIDATION = "org.eclipse.wst.validation.validationbuilder"; //$NON-NLS-1$
- private static final String BUILDER_JDT_CORE_JAVA = "org.eclipse.jdt.core.javabuilder";
+ private static final String BUILDER_JDT_CORE_JAVA = "org.eclipse.jdt.core.javabuilder"; //$NON-NLS-1$
- private static final String BUILDER_WST_COMPONENT_STRUCTURAL = "org.eclipse.wst.common.modulecore.ComponentStructuralBuilder";
+ private static final String BUILDER_WST_COMPONENT_STRUCTURAL = "org.eclipse.wst.common.modulecore.ComponentStructuralBuilder"; //$NON-NLS-1$
- private static final String NATURE_WST_MODULE_CORE_NATURE = "org.eclipse.wst.common.modulecore.ModuleCoreNature";
+ private static final String NATURE_WST_MODULE_CORE_NATURE = "org.eclipse.wst.common.modulecore.ModuleCoreNature"; //$NON-NLS-1$
- private static final String NATURE_JDT_CORE_JAVA = "org.eclipse.jdt.core.javanature";
+ private static final String NATURE_JDT_CORE_JAVA = "org.eclipse.jdt.core.javanature"; //$NON-NLS-1$
- private static final String NATURE_JEM_WORKBENCH_JAVA_EMF = "org.eclipse.jem.workbench.JavaEMFNature";
+ private static final String NATURE_JEM_WORKBENCH_JAVA_EMF = "org.eclipse.jem.workbench.JavaEMFNature"; //$NON-NLS-1$
- private static final String COMMON_PATH_JDT_LAUNCHING_JRE_CONTAINER = "org.eclipse.jdt.launching.JRE_CONTAINER";
+ private static final String COMMON_PATH_JDT_LAUNCHING_JRE_CONTAINER = "org.eclipse.jdt.launching.JRE_CONTAINER"; //$NON-NLS-1$
// warning, order is important for binary search
- public static final String[] WTP_SUPPORTED_VERSIONS = new String[] { "1.0", "R7" };
+ public static final String[] WTP_SUPPORTED_VERSIONS = new String[] { "1.0", "R7" }; //$NON-NLS-1$ //$NON-NLS-2$
/**
* Constant for 'artifactId' element in POM.xml.
*/
- private static final String POM_ELT_ARTIFACT_ID = "artifactId";
+ private static final String POM_ELT_ARTIFACT_ID = "artifactId"; //$NON-NLS-1$
/**
* Constant for 'groupId' element in POM.xml.
*/
- private static final String POM_ELT_GROUP_ID = "groupId";
+ private static final String POM_ELT_GROUP_ID = "groupId"; //$NON-NLS-1$
/**
* The project whose project files to create.
@@ -251,9 +251,9 @@
if ( Arrays.binarySearch( WTP_SUPPORTED_VERSIONS, wtpversion ) < 0 )
{
- throw new MojoExecutionException( Messages.getString( "EclipsePlugin.unsupportedwtp", new Object[] {
- wtpversion,
- StringUtils.join( WTP_SUPPORTED_VERSIONS, " " ) } ) );
+ throw new MojoExecutionException( Messages
+ .getString( "EclipsePlugin.unsupportedwtp", new Object[] { //$NON-NLS-1$
+ wtpversion, StringUtils.join( WTP_SUPPORTED_VERSIONS, " " ) } ) ); //$NON-NLS-1$
}
if ( executedProject == null )
@@ -353,18 +353,18 @@
downloadSourceArtifacts( artifacts, reactorArtifacts );
- if ( "R7".equalsIgnoreCase( wtpversion ) )
+ if ( "R7".equalsIgnoreCase( wtpversion ) ) //$NON-NLS-1$
{
new EclipseWtpmodulesWriter( getLog(), eclipseProjectDir, project, artifacts ).write( reactorArtifacts,
sourceDirs,
localRepository,
buildOutputDirectory );
}
- else if ( "1.0".equals( wtpversion ) )
+ else if ( "1.0".equals( wtpversion ) ) //$NON-NLS-1$
{
// Check and write out a WTP Project if this was required.
- if ( "war".equalsIgnoreCase( project.getPackaging() ) || "ear".equalsIgnoreCase( project.getPackaging() )
- || "ejb".equalsIgnoreCase( project.getPackaging() ) )
+ if ( "war".equalsIgnoreCase( project.getPackaging() ) || "ear".equalsIgnoreCase( project.getPackaging() ) //$NON-NLS-1$ //$NON-NLS-2$
+ || "ejb".equalsIgnoreCase( project.getPackaging() ) ) //$NON-NLS-1$
{
// we assume we have a version 1.0 for WTP
getLog().info( "Generating Eclipse web facet assuming version 1.0 for WTP..." );
@@ -423,7 +423,7 @@
projectnatures.add( NATURE_JDT_CORE_JAVA );
projectnatures.add( NATURE_WST_MODULE_CORE_NATURE ); // WTP nature
- if ( !"R7".equalsIgnoreCase( wtpversion ) )
+ if ( !"R7".equalsIgnoreCase( wtpversion ) ) //$NON-NLS-1$
{
projectnatures.add( NATURE_WST_FACET_CORE_NATURE ); // WTP nature
}
@@ -464,14 +464,14 @@
}
// source artifact: use the "sources" classifier added by the source plugin
- Artifact sourceArtifact = EclipseUtils.resolveArtifactWithClassifier( artifact, "sources", localRepository,
+ Artifact sourceArtifact = EclipseUtils.resolveArtifactWithClassifier( artifact, "sources", localRepository, //$NON-NLS-1$
artifactResolver, artifactFactory,
remoteRepos );
if ( !sourceArtifact.isResolved() )
{
// try using a plain javadoc jar if the source jar is not available
- EclipseUtils.resolveArtifactWithClassifier( artifact, "javadoc", localRepository, artifactResolver,
+ EclipseUtils.resolveArtifactWithClassifier( artifact, "javadoc", localRepository, artifactResolver, //$NON-NLS-1$
artifactFactory, remoteRepos );
missingSourceArtifacts.add( artifact );
@@ -500,9 +500,9 @@
for ( Iterator it = missingSourceArtifacts.iterator(); it.hasNext(); )
{
Artifact art = (Artifact) it.next();
- msg.append( Messages.getString( "EclipseClasspathWriter.sourcesmissingitem", art.getId() ) );
+ msg.append( Messages.getString( "EclipseClasspathWriter.sourcesmissingitem", art.getId() ) ); //$NON-NLS-1$
}
- msg.append( "\n" );
+ msg.append( "\n" ); //$NON-NLS-1$
getLog().info( msg ); //$NON-NLS-1$
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java?rev=360273&r1=360272&r2=360273&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseUtils.java Sat Dec 31 03:59:16 2005
@@ -65,7 +65,7 @@
}
catch ( IOException e )
{
- throw new MojoExecutionException( Messages.getString( "EclipsePlugin.cantcanonicalize", basedir
+ throw new MojoExecutionException( Messages.getString( "EclipsePlugin.cantcanonicalize", basedir //$NON-NLS-1$
.getAbsolutePath() ), e );
}
@@ -75,7 +75,7 @@
}
catch ( IOException e )
{
- throw new MojoExecutionException( Messages.getString( "EclipsePlugin.cantcanonicalize", fileToAdd
+ throw new MojoExecutionException( Messages.getString( "EclipsePlugin.cantcanonicalize", fileToAdd //$NON-NLS-1$
.getAbsolutePath() ), e );
}
@@ -83,7 +83,7 @@
if ( absolutePath.equals( basedirpath ) )
{
- relative = ".";
+ relative = "."; //$NON-NLS-1$
}
else if ( absolutePath.startsWith( basedirpath ) )
{
@@ -380,7 +380,7 @@
ArtifactResolver artifactResolver, ArtifactFactory artifactFactory )
throws MojoExecutionException
{
- return resolveArtifactWithClassifier( artifact, "sources", localRepository, artifactResolver, artifactFactory,
+ return resolveArtifactWithClassifier( artifact, "sources", localRepository, artifactResolver, artifactFactory, //$NON-NLS-1$
new ArrayList( 0 ) );
}
@@ -389,7 +389,7 @@
ArtifactFactory artifactFactory )
throws MojoExecutionException
{
- return resolveArtifactWithClassifier( artifact, "javadoc", localRepository, artifactResolver, artifactFactory,
+ return resolveArtifactWithClassifier( artifact, "javadoc", localRepository, artifactResolver, artifactFactory, //$NON-NLS-1$
new ArrayList( 0 ) );
}
@@ -402,9 +402,9 @@
String type = classifier;
// the "sources" classifier maps to the "java-source" type
- if ( "sources".equals( type ) )
+ if ( "sources".equals( type ) ) //$NON-NLS-1$
{
- type = "java-source";
+ type = "java-source"; //$NON-NLS-1$
}
Artifact resolvedArtifact = artifactFactory.createArtifactWithClassifier( artifact.getGroupId(), artifact
@@ -420,8 +420,8 @@
}
catch ( ArtifactResolutionException e )
{
- String message = Messages.getString( "EclipsePlugin.errorresolving", //$NON-NLS-1$
- new Object[] { classifier, resolvedArtifact.getId(), e.getMessage() } );
+ String message = Messages.getString( "EclipsePlugin.errorresolving", new Object[] { //$NON-NLS-1$
+ classifier, resolvedArtifact.getId(), e.getMessage() } );
throw new MojoExecutionException( message, e );
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java?rev=360273&r1=360272&r2=360273&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java Sat Dec 31 03:59:16 2005
@@ -29,39 +29,39 @@
extends AbstractEclipseResourceWriter
{
- private static final String ELT_DEPENDENCY_TYPE = "dependency-type";
+ private static final String ELT_DEPENDENCY_TYPE = "dependency-type"; //$NON-NLS-1$
- private static final String ATTR_HANDLE = "handle";
+ private static final String ATTR_HANDLE = "handle"; //$NON-NLS-1$
- private static final String ELT_DEPENDENT_MODULE = "dependent-module";
+ private static final String ELT_DEPENDENT_MODULE = "dependent-module"; //$NON-NLS-1$
- protected static final String ATTR_VALUE = "value";
+ protected static final String ATTR_VALUE = "value"; //$NON-NLS-1$
- protected static final String ATTR_NAME = "name";
+ protected static final String ATTR_NAME = "name"; //$NON-NLS-1$
- protected static final String ELT_PROPERTY = "property";
+ protected static final String ELT_PROPERTY = "property"; //$NON-NLS-1$
- protected static final String ELT_VERSION = "version";
+ protected static final String ELT_VERSION = "version"; //$NON-NLS-1$
- protected static final String ATTR_MODULE_TYPE_ID = "module-type-id";
+ protected static final String ATTR_MODULE_TYPE_ID = "module-type-id"; //$NON-NLS-1$
- protected static final String ATTR_SOURCE_PATH = "source-path";
+ protected static final String ATTR_SOURCE_PATH = "source-path"; //$NON-NLS-1$
- protected static final String ATTR_DEPLOY_PATH = "deploy-path";
+ protected static final String ATTR_DEPLOY_PATH = "deploy-path"; //$NON-NLS-1$
- protected static final String ELT_WB_RESOURCE = "wb-resource";
+ protected static final String ELT_WB_RESOURCE = "wb-resource"; //$NON-NLS-1$
- protected static final String ELT_MODULE_TYPE = "module-type";
+ protected static final String ELT_MODULE_TYPE = "module-type"; //$NON-NLS-1$
- protected static final String ATTR_DEPLOY_NAME = "deploy-name";
+ protected static final String ATTR_DEPLOY_NAME = "deploy-name"; //$NON-NLS-1$
- protected static final String ELT_WB_MODULE = "wb-module";
+ protected static final String ELT_WB_MODULE = "wb-module"; //$NON-NLS-1$
- protected static final String ATTR_MODULE_ID = "id";
+ protected static final String ATTR_MODULE_ID = "id"; //$NON-NLS-1$
- protected static final String ELT_PROJECT_MODULES = "project-modules";
+ protected static final String ELT_PROJECT_MODULES = "project-modules"; //$NON-NLS-1$
- protected static final String ARTIFACT_MAVEN_WAR_PLUGIN = "maven-war-plugin";
+ protected static final String ARTIFACT_MAVEN_WAR_PLUGIN = "maven-war-plugin"; //$NON-NLS-1$
/**
* Dependencies for our project.
@@ -109,9 +109,9 @@
{
if ( "war".equals( packaging ) ) //$NON-NLS-1$
{
- writer.addAttribute( ATTR_MODULE_TYPE_ID, "jst.web" ); //$NON-NLS-1$ //$NON-NLS-2$
+ writer.addAttribute( ATTR_MODULE_TYPE_ID, "jst.web" ); //$NON-NLS-1$
- writer.startElement( ELT_VERSION ); //$NON-NLS-1$
+ writer.startElement( ELT_VERSION );
writer.writeText( resolveServletVersion() );
writer.endElement();
@@ -119,48 +119,48 @@
// use finalName as context root only if it has been explicitely set
String contextRoot = project.getArtifactId();
String finalName = project.getBuild().getFinalName();
- if ( !finalName.equals( project.getArtifactId() + "-" + project.getVersion() ) )
+ if ( !finalName.equals( project.getArtifactId() + "-" + project.getVersion() ) ) //$NON-NLS-1$
{
contextRoot = finalName;
}
- writer.startElement( ELT_PROPERTY ); //$NON-NLS-1$
- writer.addAttribute( ATTR_NAME, "context-root" ); //$NON-NLS-1$ //$NON-NLS-2$
- writer.addAttribute( ATTR_VALUE, contextRoot ); //$NON-NLS-1$
+ writer.startElement( ELT_PROPERTY );
+ writer.addAttribute( ATTR_NAME, "context-root" ); //$NON-NLS-1$
+ writer.addAttribute( ATTR_VALUE, contextRoot );
writer.endElement();
}
else if ( "ejb".equals( packaging ) ) //$NON-NLS-1$
{
- writer.addAttribute( ATTR_MODULE_TYPE_ID, "jst.ejb" ); //$NON-NLS-1$ //$NON-NLS-2$
+ writer.addAttribute( ATTR_MODULE_TYPE_ID, "jst.ejb" ); //$NON-NLS-1$
- writer.startElement( ELT_VERSION ); //$NON-NLS-1$
- writer.writeText( resolveEjbVersion() ); //$NON-NLS-1$
+ writer.startElement( ELT_VERSION );
+ writer.writeText( resolveEjbVersion() );
writer.endElement();
- writer.startElement( ELT_PROPERTY ); //$NON-NLS-1$
- writer.addAttribute( ATTR_NAME, "java-output-path" ); //$NON-NLS-1$ //$NON-NLS-2$
- writer.addAttribute( ATTR_VALUE, "/" + //$NON-NLS-1$ //$NON-NLS-2$
+ writer.startElement( ELT_PROPERTY );
+ writer.addAttribute( ATTR_NAME, "java-output-path" ); //$NON-NLS-1$
+ writer.addAttribute( ATTR_VALUE, "/" + //$NON-NLS-1$
EclipseUtils.toRelativeAndFixSeparator( getProject().getBasedir(), buildOutputDirectory, false ) );
writer.endElement();
}
- else if ( "ear".equals( packaging ) )
+ else if ( "ear".equals( packaging ) ) //$NON-NLS-1$
{
- writer.addAttribute( ATTR_MODULE_TYPE_ID, "jst.ear" ); //$NON-NLS-1$ //$NON-NLS-2$
+ writer.addAttribute( ATTR_MODULE_TYPE_ID, "jst.ear" ); //$NON-NLS-1$
- writer.startElement( ELT_VERSION ); //$NON-NLS-1$
- writer.writeText( resolveJ2eeVersion() ); //$NON-NLS-1$
+ writer.startElement( ELT_VERSION );
+ writer.writeText( resolveJ2eeVersion() );
writer.endElement();
}
else
{
// jar
- writer.addAttribute( ATTR_MODULE_TYPE_ID, "jst.utility" ); //$NON-NLS-1$ //$NON-NLS-2$
+ writer.addAttribute( ATTR_MODULE_TYPE_ID, "jst.utility" ); //$NON-NLS-1$
- writer.startElement( ELT_PROPERTY ); //$NON-NLS-1$
- writer.addAttribute( ATTR_NAME, "java-output-path" ); //$NON-NLS-1$ //$NON-NLS-2$
- writer.addAttribute( ATTR_VALUE, "/" + //$NON-NLS-1$ //$NON-NLS-2$
+ writer.startElement( ELT_PROPERTY );
+ writer.addAttribute( ATTR_NAME, "java-output-path" ); //$NON-NLS-1$
+ writer.addAttribute( ATTR_VALUE, "/" + //$NON-NLS-1$
EclipseUtils.toRelativeAndFixSeparator( getProject().getBasedir(), buildOutputDirectory, false ) );
writer.endElement();
}
@@ -223,12 +223,12 @@
}
}
- writer.startElement( ELT_DEPENDENT_MODULE ); //$NON-NLS-1$
+ writer.startElement( ELT_DEPENDENT_MODULE );
- writer.addAttribute( ATTR_DEPLOY_PATH, "/WEB-INF/lib" ); //$NON-NLS-1$ //$NON-NLS-2$
- writer.addAttribute( ATTR_HANDLE, handle ); //$NON-NLS-1$
+ writer.addAttribute( ATTR_DEPLOY_PATH, "/WEB-INF/lib" ); //$NON-NLS-1$
+ writer.addAttribute( ATTR_HANDLE, handle );
- writer.startElement( ELT_DEPENDENCY_TYPE ); //$NON-NLS-1$
+ writer.startElement( ELT_DEPENDENCY_TYPE );
writer.writeText( "uses" ); //$NON-NLS-1$
writer.endElement();
@@ -251,7 +251,7 @@
// NB war is needed for ear projects, we suppose nobody adds a war
// dependency to a war/jar project
if ( ( scopeFilter.include( artifact ) || Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
- && ( "jar".equals( type ) || "ejb".equals( type ) || "ejb-client".equals( type ) || "war".equals( type ) ) )
+ && ( "jar".equals( type ) || "ejb".equals( type ) || "ejb-client".equals( type ) || "war".equals( type ) ) ) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
{
addDependency( writer, artifact, referencedReactorArtifacts, localRepository, getProject().getBasedir() );
}
@@ -260,21 +260,21 @@
protected String resolveServletVersion()
{
- String[] artifactNames = new String[] { "servlet-api", "servletapi", "geronimo-spec-servlet" };
+ String[] artifactNames = new String[] { "servlet-api", "servletapi", "geronimo-spec-servlet" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
String version = EclipseUtils.getDependencyVersion( artifactNames, getProject().getArtifacts(), 3 );
if ( version == null )
{
// none of the above specified matched, try geronimo-spec-j2ee
- artifactNames = new String[] { "geronimo-spec-j2ee" };
+ artifactNames = new String[] { "geronimo-spec-j2ee" }; //$NON-NLS-1$
version = EclipseUtils.getDependencyVersion( artifactNames, getProject().getArtifacts(), 3 );
if ( version != null )
{
String j2eeMinorVersion = StringUtils.substring( version, 2, 3 );
- version = "2." + j2eeMinorVersion;
+ version = "2." + j2eeMinorVersion; //$NON-NLS-1$
}
}
- return version == null ? "2.4" : version;
+ return version == null ? "2.4" : version; //$NON-NLS-1$
}
protected String resolveEjbVersion()
@@ -282,25 +282,25 @@
String version = null;
// @todo this is the default, find real ejb version from dependencies
- return version == null ? "2.1" : version;
+ return version == null ? "2.1" : version; //$NON-NLS-1$
}
protected String resolveJ2eeVersion()
{
String version = null;
// @todo this is the default, find real j2ee version from dependencies
- return version == null ? "1.3" : version;
+ return version == null ? "1.3" : version; //$NON-NLS-1$
}
protected String resolveJavaVersion()
{
- String version = EclipseUtils.getPluginSetting( getProject(), "maven-compiler-plugin", "target", null );
+ String version = EclipseUtils.getPluginSetting( getProject(), "maven-compiler-plugin", "target", null ); //$NON-NLS-1$ //$NON-NLS-2$
if ( version == null )
{
- EclipseUtils.getPluginSetting( getProject(), "maven-compiler-plugin", "source", null );
+ EclipseUtils.getPluginSetting( getProject(), "maven-compiler-plugin", "source", null ); //$NON-NLS-1$ //$NON-NLS-2$
}
- return version == null ? "1.4" : version;
+ return version == null ? "1.4" : version; //$NON-NLS-1$
}
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?rev=360273&r1=360272&r2=360273&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 Sat Dec 31 03:59:16 2005
@@ -53,46 +53,46 @@
/**
* Eclipse build path variable M2_REPO
*/
- private static final String M2_REPO = "M2_REPO";
+ private static final String M2_REPO = "M2_REPO"; //$NON-NLS-1$
private File eclipseProjectDir;
/**
* Attribute for sourcepath.
*/
- private static final String ATTR_SOURCEPATH = "sourcepath";
+ private static final String ATTR_SOURCEPATH = "sourcepath"; //$NON-NLS-1$
private MavenProject project;
/**
* Attribute for output.
*/
- private static final String ATTR_OUTPUT = "output";
+ private static final String ATTR_OUTPUT = "output"; //$NON-NLS-1$
/**
* Attribute for path.
*/
- private static final String ATTR_PATH = "path";
+ private static final String ATTR_PATH = "path"; //$NON-NLS-1$
/**
* Attribute for kind - Container (con), Variable (var)..etc.
*/
- private static final String ATTR_KIND = "kind";
+ private static final String ATTR_KIND = "kind"; //$NON-NLS-1$
/**
* Element for classpathentry.
*/
- private static final String ELT_CLASSPATHENTRY = "classpathentry";
+ private static final String ELT_CLASSPATHENTRY = "classpathentry"; //$NON-NLS-1$
/**
* Element for classpath.
*/
- private static final String ELT_CLASSPATH = "classpath";
+ private static final String ELT_CLASSPATH = "classpath"; //$NON-NLS-1$
/**
* File name that stores project classpath settings.
*/
- private static final String FILE_DOT_CLASSPATH = ".classpath";
+ private static final String FILE_DOT_CLASSPATH = ".classpath"; //$NON-NLS-1$
/**
* Dependencies for our project.
@@ -115,7 +115,7 @@
try
{
- w = new FileWriter( new File( getEclipseProjectDirectory(), FILE_DOT_CLASSPATH ) ); //$NON-NLS-1$
+ w = new FileWriter( new File( getEclipseProjectDirectory(), FILE_DOT_CLASSPATH ) );
}
catch ( IOException ex )
{
@@ -124,7 +124,7 @@
XMLWriter writer = new PrettyPrintXMLWriter( w );
- writer.startElement( ELT_CLASSPATH ); //$NON-NLS-1$
+ writer.startElement( ELT_CLASSPATH );
// ----------------------------------------------------------------------
// Source roots and resources
@@ -134,13 +134,13 @@
{
EclipseSourceDir dir = sourceDirs[j];
- writer.startElement( ELT_CLASSPATHENTRY ); //$NON-NLS-1$
+ writer.startElement( ELT_CLASSPATHENTRY );
- writer.addAttribute( ATTR_KIND, "src" ); //$NON-NLS-1$ //$NON-NLS-2$
- writer.addAttribute( ATTR_PATH, dir.getPath() ); //$NON-NLS-1$
+ writer.addAttribute( ATTR_KIND, "src" ); //$NON-NLS-1$
+ writer.addAttribute( ATTR_PATH, dir.getPath() );
if ( dir.getOutput() != null )
{
- writer.addAttribute( ATTR_OUTPUT, dir.getOutput() ); //$NON-NLS-1$
+ writer.addAttribute( ATTR_OUTPUT, dir.getOutput() );
}
writer.endElement();
@@ -151,10 +151,10 @@
// The default output
// ----------------------------------------------------------------------
- writer.startElement( ELT_CLASSPATHENTRY ); //$NON-NLS-1$
- writer.addAttribute( ATTR_KIND, ATTR_OUTPUT ); //$NON-NLS-1$ //$NON-NLS-2$
- writer.addAttribute( ATTR_PATH, //$NON-NLS-1$
- EclipseUtils.toRelativeAndFixSeparator( projectBaseDir, buildOutputDirectory, false ) );
+ writer.startElement( ELT_CLASSPATHENTRY );
+ writer.addAttribute( ATTR_KIND, ATTR_OUTPUT );
+ writer.addAttribute( ATTR_PATH, EclipseUtils.toRelativeAndFixSeparator( projectBaseDir, buildOutputDirectory,
+ false ) );
writer.endElement();
// ----------------------------------------------------------------------
@@ -163,9 +163,9 @@
for ( Iterator it = classpathContainers.iterator(); it.hasNext(); )
{
- writer.startElement( ELT_CLASSPATHENTRY ); //$NON-NLS-1$
- writer.addAttribute( ATTR_KIND, "con" ); //$NON-NLS-1$ //$NON-NLS-2$
- writer.addAttribute( ATTR_PATH, (String) it.next() ); //$NON-NLS-1$
+ writer.startElement( ELT_CLASSPATHENTRY );
+ writer.addAttribute( ATTR_KIND, "con" ); //$NON-NLS-1$
+ writer.addAttribute( ATTR_PATH, (String) it.next() );
writer.endElement(); // name
}
@@ -257,7 +257,7 @@
{
// NB eclipse (3.1) doesn't support variables in javadoc paths, so we need to add the
// full path for the maven repo
- javadocpath = StringUtils.replace( javadocArtifact.getFile().getCanonicalPath(), "\\", "/" );
+ javadocpath = StringUtils.replace( javadocArtifact.getFile().getCanonicalPath(), "\\", "/" ); //$NON-NLS-1$ //$NON-NLS-2$
}
catch ( IOException e )
{
@@ -285,8 +285,8 @@
writer.startElement( "attributes" ); //$NON-NLS-1$
writer.startElement( "attribute" ); //$NON-NLS-1$
- writer.addAttribute( "value", "jar:file:/" + javadocpath + "!/" );
- writer.addAttribute( "name", "javadoc_location" );
+ writer.addAttribute( "value", "jar:file:/" + javadocpath + "!/" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ writer.addAttribute( "name", "javadoc_location" ); //$NON-NLS-1$ //$NON-NLS-2$
writer.endElement();
writer.endElement();
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java?rev=360273&r1=360272&r2=360273&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java Sat Dec 31 03:59:16 2005
@@ -51,17 +51,17 @@
extends AbstractEclipseResourceWriter
{
- private static final String ELT_NAME = "name";
+ private static final String ELT_NAME = "name"; //$NON-NLS-1$
- private static final String ELT_BUILD_COMMAND = "buildCommand";
+ private static final String ELT_BUILD_COMMAND = "buildCommand"; //$NON-NLS-1$
- private static final String ELT_BUILD_SPEC = "buildSpec";
+ private static final String ELT_BUILD_SPEC = "buildSpec"; //$NON-NLS-1$
- private static final String ELT_NATURE = "nature";
+ private static final String ELT_NATURE = "nature"; //$NON-NLS-1$
- private static final String ELT_NATURES = "natures";
+ private static final String ELT_NATURES = "natures"; //$NON-NLS-1$
- private static final String FILE_DOT_PROJECT = ".project";
+ private static final String FILE_DOT_PROJECT = ".project"; //$NON-NLS-1$
public EclipseProjectWriter( Log log, File eclipseProjectDir, MavenProject project )
{
@@ -143,7 +143,7 @@
try
{
- w = new FileWriter( dotProject ); //$NON-NLS-1$
+ w = new FileWriter( dotProject );
}
catch ( IOException ex )
{
@@ -154,7 +154,7 @@
writer.startElement( "projectDescription" ); //$NON-NLS-1$
- writer.startElement( ELT_NAME ); //$NON-NLS-1$
+ writer.startElement( ELT_NAME );
writer.writeText( getProject().getArtifactId() );
writer.endElement();
@@ -185,12 +185,12 @@
writer.endElement(); // projects
- writer.startElement( ELT_BUILD_SPEC ); //$NON-NLS-1$
+ writer.startElement( ELT_BUILD_SPEC );
for ( Iterator it = buildCommands.iterator(); it.hasNext(); )
{
- writer.startElement( ELT_BUILD_COMMAND ); //$NON-NLS-1$
- writer.startElement( ELT_NAME ); //$NON-NLS-1$
+ writer.startElement( ELT_BUILD_COMMAND );
+ writer.startElement( ELT_NAME );
writer.writeText( (String) it.next() );
writer.endElement(); // name
writer.startElement( "arguments" ); //$NON-NLS-1$
@@ -200,11 +200,11 @@
writer.endElement(); // buildSpec
- writer.startElement( ELT_NATURES ); //$NON-NLS-1$
+ writer.startElement( ELT_NATURES );
for ( Iterator it = projectnatures.iterator(); it.hasNext(); )
{
- writer.startElement( ELT_NATURE ); //$NON-NLS-1$
+ writer.startElement( ELT_NATURE );
writer.writeText( (String) it.next() );
writer.endElement(); // name
}
@@ -242,7 +242,7 @@
{
writer.startElement( "link" ); //$NON-NLS-1$
- writer.startElement( ELT_NAME ); //$NON-NLS-1$
+ writer.startElement( ELT_NAME );
writer.writeText( EclipseUtils.toRelativeAndFixSeparator( projectBaseDir, file, true ) );
writer.endElement(); // name
@@ -257,7 +257,7 @@
}
catch ( IOException e )
{
- throw new MojoExecutionException( Messages.getString( "EclipsePlugin.cantcanonicalize", file
+ throw new MojoExecutionException( Messages.getString( "EclipsePlugin.cantcanonicalize", file //$NON-NLS-1$
.getAbsolutePath() ), e );
}
writer.endElement(); // location
@@ -282,7 +282,7 @@
{
writer.startElement( "link" ); //$NON-NLS-1$
- writer.startElement( ELT_NAME ); //$NON-NLS-1$
+ writer.startElement( ELT_NAME );
writer.writeText( EclipseUtils.toRelativeAndFixSeparator( projectBaseDir, sourceRoot, true ) );
writer.endElement(); // name
@@ -297,7 +297,7 @@
}
catch ( IOException e )
{
- throw new MojoExecutionException( Messages.getString( "EclipsePlugin.cantcanonicalize", sourceRoot
+ throw new MojoExecutionException( Messages.getString( "EclipsePlugin.cantcanonicalize", sourceRoot //$NON-NLS-1$
.getAbsolutePath() ), e );
}
@@ -320,7 +320,7 @@
{
writer.startElement( "link" ); //$NON-NLS-1$
- writer.startElement( ELT_NAME ); //$NON-NLS-1$
+ writer.startElement( ELT_NAME );
writer.writeText( EclipseUtils.toRelativeAndFixSeparator( projectBaseDir, resourceDir, true ) );
writer.endElement(); // name
@@ -335,7 +335,7 @@
}
catch ( IOException e )
{
- throw new MojoExecutionException( Messages.getString( "EclipsePlugin.cantcanonicalize", resourceDir
+ throw new MojoExecutionException( Messages.getString( "EclipsePlugin.cantcanonicalize", resourceDir //$NON-NLS-1$
.getAbsolutePath() ), e );
}
writer.endElement(); // location
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java?rev=360273&r1=360272&r2=360273&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseSettingsWriter.java Sat Dec 31 03:59:16 2005
@@ -42,28 +42,28 @@
/**
* 'target' property for maven-compiler-plugin.
*/
- private static final String PROPERTY_TARGET = "target";
+ private static final String PROPERTY_TARGET = "target"; //$NON-NLS-1$
/**
* 'source' property for maven-compiler-plugin.
*/
- private static final String PROPERTY_SOURCE = "source";
+ private static final String PROPERTY_SOURCE = "source"; //$NON-NLS-1$
- private static final String JDK_1_2_SOURCES = "1.2";
+ private static final String JDK_1_2_SOURCES = "1.2"; //$NON-NLS-1$
- private static final String JDK_1_3_SOURCES = "1.3";
+ private static final String JDK_1_3_SOURCES = "1.3"; //$NON-NLS-1$
- private static final String FILE_ECLIPSE_JDT_CORE_PREFS = "org.eclipse.jdt.core.prefs";
+ private static final String FILE_ECLIPSE_JDT_CORE_PREFS = "org.eclipse.jdt.core.prefs"; //$NON-NLS-1$
- private static final String PROP_ECLIPSE_PREFERENCES_VERSION = "eclipse.preferences.version";
+ private static final String PROP_ECLIPSE_PREFERENCES_VERSION = "eclipse.preferences.version"; //$NON-NLS-1$
- private static final String DIR_DOT_SETTINGS = ".settings";
+ private static final String DIR_DOT_SETTINGS = ".settings"; //$NON-NLS-1$
- private static final String PROP_JDT_CORE_COMPILER_COMPLIANCE = "org.eclipse.jdt.core.compiler.compliance";
+ private static final String PROP_JDT_CORE_COMPILER_COMPLIANCE = "org.eclipse.jdt.core.compiler.compliance"; //$NON-NLS-1$
- private static final String PROP_JDT_CORE_COMPILER_SOURCE = "org.eclipse.jdt.core.compiler.source";
+ private static final String PROP_JDT_CORE_COMPILER_SOURCE = "org.eclipse.jdt.core.compiler.source"; //$NON-NLS-1$
- private static final String ARTIFACT_MAVEN_COMPILER_PLUGIN = "maven-compiler-plugin";
+ private static final String ARTIFACT_MAVEN_COMPILER_PLUGIN = "maven-compiler-plugin"; //$NON-NLS-1$
public EclipseSettingsWriter( Log log, File eclipseProjectDir, MavenProject project )
{
@@ -78,17 +78,17 @@
Properties coreSettings = new Properties();
String source = EclipseUtils.getPluginSetting( getProject(), ARTIFACT_MAVEN_COMPILER_PLUGIN, PROPERTY_SOURCE,
- null ); //$NON-NLS-1$ //$NON-NLS-2$
+ null );
String target = EclipseUtils.getPluginSetting( getProject(), ARTIFACT_MAVEN_COMPILER_PLUGIN, PROPERTY_TARGET,
- null ); //$NON-NLS-1$ //$NON-NLS-2$
+ null );
- if ( source != null && !JDK_1_3_SOURCES.equals( source ) ) //$NON-NLS-1$
+ if ( source != null && !JDK_1_3_SOURCES.equals( source ) )
{
- coreSettings.put( PROP_JDT_CORE_COMPILER_SOURCE, source ); //$NON-NLS-1$
- coreSettings.put( PROP_JDT_CORE_COMPILER_COMPLIANCE, source ); //$NON-NLS-1$
+ coreSettings.put( PROP_JDT_CORE_COMPILER_SOURCE, source );
+ coreSettings.put( PROP_JDT_CORE_COMPILER_COMPLIANCE, source );
}
- if ( target != null && !JDK_1_2_SOURCES.equals( target ) ) //$NON-NLS-1$
+ if ( target != null && !JDK_1_2_SOURCES.equals( target ) )
{
coreSettings.put( "org.eclipse.jdt.core.compiler.codegen.targetPlatform", target ); //$NON-NLS-1$
}
@@ -100,13 +100,13 @@
settingsDir.mkdirs();
- coreSettings.put( PROP_ECLIPSE_PREFERENCES_VERSION, "1" ); //$NON-NLS-1$ //$NON-NLS-2$
+ coreSettings.put( PROP_ECLIPSE_PREFERENCES_VERSION, "1" ); //$NON-NLS-1$
try
{
File oldCoreSettingsFile;
- File coreSettingsFile = new File( settingsDir, FILE_ECLIPSE_JDT_CORE_PREFS ); //$NON-NLS-1$
+ File coreSettingsFile = new File( settingsDir, FILE_ECLIPSE_JDT_CORE_PREFS );
if ( coreSettingsFile.exists() )
{
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpSettingsWriter.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpSettingsWriter.java?rev=360273&r1=360272&r2=360273&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpSettingsWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpSettingsWriter.java Sat Dec 31 03:59:16 2005
@@ -48,40 +48,40 @@
extends AbstractWtpResourceWriter
{
- private static final String FACET_JST_EAR = "jst.ear";
+ private static final String FACET_JST_EAR = "jst.ear"; //$NON-NLS-1$
- private static final String ATTR_CONTEXT_ROOT = "context-root";
+ private static final String ATTR_CONTEXT_ROOT = "context-root"; //$NON-NLS-1$
- private static final String ATTR_VERSION = "version";
+ private static final String ATTR_VERSION = "version"; //$NON-NLS-1$
- private static final String ELT_INSTALLED = "installed";
+ private static final String ELT_INSTALLED = "installed"; //$NON-NLS-1$
- private static final String FACET_JST_EJB = "jst.ejb";
+ private static final String FACET_JST_EJB = "jst.ejb"; //$NON-NLS-1$
- private static final String FACET_JST_WEB = "jst.web";
+ private static final String FACET_JST_WEB = "jst.web"; //$NON-NLS-1$
- private static final String FACET_JST_JAVA = "jst.java";
+ private static final String FACET_JST_JAVA = "jst.java"; //$NON-NLS-1$
- private static final String ATTR_FACET = "facet";
+ private static final String ATTR_FACET = "facet"; //$NON-NLS-1$
- private static final String ELT_FIXED = "fixed";
+ private static final String ELT_FIXED = "fixed"; //$NON-NLS-1$
- private static final String ELT_FACETED_PROJECT = "faceted-project";
+ private static final String ELT_FACETED_PROJECT = "faceted-project"; //$NON-NLS-1$
/**
* The .settings folder for Web Tools Project 1.x release.
*/
- private static final String DIR_WTP_SETTINGS = ".settings";
+ private static final String DIR_WTP_SETTINGS = ".settings"; //$NON-NLS-1$
/**
* File name where the WTP component settings will be stored for our Eclipse Project.
*/
- private static final String FILE_DOT_COMPONENT = ".component";
+ private static final String FILE_DOT_COMPONENT = ".component"; //$NON-NLS-1$
/**
* File name where Eclipse Project's Facet configuration will be stored.
*/
- private static final String FILE_FACET_CORE_XML = "org.eclipse.wst.common.project.facet.core.xml";
+ private static final String FILE_FACET_CORE_XML = "org.eclipse.wst.common.project.facet.core.xml"; //$NON-NLS-1$
public EclipseWtpSettingsWriter( Log log, File eclipseProjectDir, MavenProject project, Collection artifacts )
{
@@ -104,7 +104,9 @@
catch ( IOException e )
{
if ( getLog().isErrorEnabled() )
+ {
getLog().error( "Unable to delete directory " + DIR_WTP_SETTINGS );
+ }
}
}
@@ -155,13 +157,13 @@
throws MojoExecutionException
{
writer.startElement( ELT_PROJECT_MODULES );
- writer.addAttribute( ATTR_MODULE_ID, "moduleCoreId" );
+ writer.addAttribute( ATTR_MODULE_ID, "moduleCoreId" ); //$NON-NLS-1$
writer.startElement( ELT_WB_MODULE );
writer.addAttribute( ATTR_DEPLOY_NAME, getProject().getArtifactId() );
- if ( "war".equalsIgnoreCase( packaging ) )
+ if ( "war".equalsIgnoreCase( packaging ) ) //$NON-NLS-1$
{
writer.startElement( ELT_WB_RESOURCE );
- writer.addAttribute( ATTR_DEPLOY_PATH, "/WEB-INF/classes" );
+ writer.addAttribute( ATTR_DEPLOY_PATH, "/WEB-INF/classes" ); //$NON-NLS-1$
writer.addAttribute( ATTR_SOURCE_PATH, EclipseUtils.toRelativeAndFixSeparator( getProject().getBasedir(),
new File( getProject()
.getBuild()
@@ -169,18 +171,18 @@
false ) );
writer.endElement();
String warSourceDirectory = EclipseUtils.getPluginSetting( getProject(), ARTIFACT_MAVEN_WAR_PLUGIN,
- "warSourceDirectory", "/src/main/webapp" );
+ "warSourceDirectory", "/src/main/webapp" ); //$NON-NLS-1$ //$NON-NLS-2$
writer.startElement( ELT_WB_RESOURCE );
- writer.addAttribute( ATTR_DEPLOY_PATH, "/" );
+ writer.addAttribute( ATTR_DEPLOY_PATH, "/" ); //$NON-NLS-1$
writer.addAttribute( ATTR_SOURCE_PATH, EclipseUtils
.toRelativeAndFixSeparator( getProject().getBasedir(), new File( getEclipseProjectDirectory(),
warSourceDirectory ), false ) );
writer.endElement();
}
- else if ( "ear".equalsIgnoreCase( packaging ) )
+ else if ( "ear".equalsIgnoreCase( packaging ) ) //$NON-NLS-1$
{
writer.startElement( ELT_WB_RESOURCE );
- writer.addAttribute( ATTR_DEPLOY_PATH, "/ejbmodule" );
+ writer.addAttribute( ATTR_DEPLOY_PATH, "/ejbmodule" ); //$NON-NLS-1$
writer.endElement();
}
// write out the dependencies.
@@ -191,8 +193,8 @@
// write out properties.
writer.startElement( ELT_PROPERTY );
- writer.addAttribute( ATTR_NAME, "java-output-path" );
- writer.addAttribute( ATTR_VALUE, "/"
+ writer.addAttribute( ATTR_NAME, "java-output-path" ); //$NON-NLS-1$
+ writer.addAttribute( ATTR_VALUE, "/" //$NON-NLS-1$
+ EclipseUtils.toRelativeAndFixSeparator( getProject().getBasedir(), buildOutputDirectory, false ) );
// close elements
@@ -217,7 +219,7 @@
writer.startElement( ELT_FIXED );
writer.addAttribute( ATTR_FACET, FACET_JST_JAVA );
writer.endElement(); // element fixed
- if ( "war".equalsIgnoreCase( packaging ) )
+ if ( "war".equalsIgnoreCase( packaging ) ) //$NON-NLS-1$
{
writer.startElement( ELT_FIXED );
writer.addAttribute( ATTR_FACET, FACET_JST_WEB );
@@ -227,7 +229,7 @@
writer.addAttribute( ATTR_VERSION, resolveServletVersion() );
writer.endElement(); // installed
}
- else if ( "ejb".equalsIgnoreCase( packaging ) )
+ else if ( "ejb".equalsIgnoreCase( packaging ) ) //$NON-NLS-1$
{
writer.startElement( ELT_FIXED );
writer.addAttribute( ATTR_FACET, FACET_JST_EJB );
@@ -237,7 +239,7 @@
writer.addAttribute( ATTR_VERSION, resolveEjbVersion() );
writer.endElement(); // installed
}
- else if ( "ear".equalsIgnoreCase( packaging ) )
+ else if ( "ear".equalsIgnoreCase( packaging ) ) //$NON-NLS-1$
{
writer.startElement( ELT_FIXED );
writer.addAttribute( ATTR_FACET, FACET_JST_EAR );
@@ -267,9 +269,9 @@
{
ScopeArtifactFilter scopeFilter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
String warSourceDirectory = EclipseUtils.getPluginSetting( getProject(), ARTIFACT_MAVEN_WAR_PLUGIN,
- "warSourceDirectory", "/src/main/webapp/" );
+ "warSourceDirectory", "/src/main/webapp/" ); //$NON-NLS-1$ //$NON-NLS-2$
- File webInfLibDir = new File( getEclipseProjectDirectory() + "/" + warSourceDirectory + "/WEB-INF/lib" );
+ File webInfLibDir = new File( getEclipseProjectDirectory() + "/" + warSourceDirectory + "/WEB-INF/lib" ); //$NON-NLS-1$ //$NON-NLS-2$
String webInfLibDirAsString = EclipseUtils.toRelativeAndFixSeparator( getProject().getBasedir(), webInfLibDir,
false );
@@ -291,7 +293,7 @@
if ( !referencedReactorArtifacts.contains( artifact )
&& ( scopeFilter.include( artifact ) || Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
- && ( "jar".equals( type ) || "ejb".equals( type ) || "ejb-client".equals( type ) || "war".equals( type ) ) )
+ && ( "jar".equals( type ) || "ejb".equals( type ) || "ejb-client".equals( type ) || "war".equals( type ) ) ) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
{
// we want this bit container independent, so copy over everything to /WEB-INF/lib under our eclipse
// warSourceDirectory and add a deploy-path so that resources get published.
@@ -317,7 +319,7 @@
getLog().warn( "----------------------------------------------------------------------------" );
}
writer.startElement( ELT_WB_RESOURCE );
- writer.addAttribute( ATTR_DEPLOY_PATH, "/WEB-INF/lib" );
+ writer.addAttribute( ATTR_DEPLOY_PATH, "/WEB-INF/lib" ); //$NON-NLS-1$
writer.addAttribute( ATTR_SOURCE_PATH, webInfLibDirAsString );
writer.endElement();
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpmodulesWriter.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpmodulesWriter.java?rev=360273&r1=360272&r2=360273&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpmodulesWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpmodulesWriter.java Sat Dec 31 03:59:16 2005
@@ -43,7 +43,7 @@
extends AbstractWtpResourceWriter
{
- protected static final String FILE_DOT_WTPMODULES = ".wtpmodules";
+ protected static final String FILE_DOT_WTPMODULES = ".wtpmodules"; //$NON-NLS-1$
public EclipseWtpmodulesWriter( Log log, File eclipseProjectDir, MavenProject project, Collection artifacts )
{
@@ -58,7 +58,7 @@
try
{
- w = new FileWriter( new File( getEclipseProjectDirectory(), FILE_DOT_WTPMODULES ) ); //$NON-NLS-1$
+ w = new FileWriter( new File( getEclipseProjectDirectory(), FILE_DOT_WTPMODULES ) );
}
catch ( IOException ex )
{
@@ -66,15 +66,15 @@
}
XMLWriter writer = new PrettyPrintXMLWriter( w );
- writer.startElement( ELT_PROJECT_MODULES ); //$NON-NLS-1$
- writer.addAttribute( ATTR_MODULE_ID, "moduleCoreId" ); //$NON-NLS-1$ //$NON-NLS-2$
+ writer.startElement( ELT_PROJECT_MODULES );
+ writer.addAttribute( ATTR_MODULE_ID, "moduleCoreId" ); //$NON-NLS-1$
- writer.startElement( ELT_WB_MODULE ); //$NON-NLS-1$
- writer.addAttribute( ATTR_DEPLOY_NAME, getProject().getArtifactId() ); //$NON-NLS-1$
+ writer.startElement( ELT_WB_MODULE );
+ writer.addAttribute( ATTR_DEPLOY_NAME, getProject().getArtifactId() );
String packaging = getProject().getPackaging();
- writer.startElement( ELT_MODULE_TYPE ); //$NON-NLS-1$
+ writer.startElement( ELT_MODULE_TYPE );
writeModuleTypeAccordingToPackaging( getProject(), writer, packaging, buildOutputDirectory );
writer.endElement(); // module-type
@@ -84,17 +84,16 @@
String target = "/"; //$NON-NLS-1$
if ( "war".equals( getProject().getPackaging() ) ) //$NON-NLS-1$
{
- String warSourceDirectory = EclipseUtils.getPluginSetting( getProject(), ARTIFACT_MAVEN_WAR_PLUGIN, //$NON-NLS-1$
+ String warSourceDirectory = EclipseUtils.getPluginSetting( getProject(), ARTIFACT_MAVEN_WAR_PLUGIN,
"warSourceDirectory", //$NON-NLS-1$
"/src/main/webapp" ); //$NON-NLS-1$
- writer.startElement( ELT_WB_RESOURCE ); //$NON-NLS-1$
- writer.addAttribute( ATTR_DEPLOY_PATH, "/" ); //$NON-NLS-1$ //$NON-NLS-2$
- writer.addAttribute( ATTR_SOURCE_PATH, //$NON-NLS-1$
- "/"
- + EclipseUtils.toRelativeAndFixSeparator( getEclipseProjectDirectory(),
- new File( getEclipseProjectDirectory(),
- warSourceDirectory ), false ) );
+ writer.startElement( ELT_WB_RESOURCE );
+ writer.addAttribute( ATTR_DEPLOY_PATH, "/" ); //$NON-NLS-1$
+ writer.addAttribute( ATTR_SOURCE_PATH, "/" //$NON-NLS-1$
+ + EclipseUtils.toRelativeAndFixSeparator( getEclipseProjectDirectory(),
+ new File( getEclipseProjectDirectory(), warSourceDirectory ),
+ false ) );
writer.endElement();
writeWarOrEarResources( writer, getProject(), referencedReactorArtifacts, localRepository );
@@ -103,9 +102,9 @@
}
else if ( "ear".equals( getProject().getPackaging() ) ) //$NON-NLS-1$
{
- writer.startElement( ELT_WB_RESOURCE ); //$NON-NLS-1$
- writer.addAttribute( ATTR_DEPLOY_PATH, "/" ); //$NON-NLS-1$ //$NON-NLS-2$
- writer.addAttribute( ATTR_SOURCE_PATH, "/" ); //$NON-NLS-1$ //$NON-NLS-2$
+ writer.startElement( ELT_WB_RESOURCE );
+ writer.addAttribute( ATTR_DEPLOY_PATH, "/" ); //$NON-NLS-1$
+ writer.addAttribute( ATTR_SOURCE_PATH, "/" ); //$NON-NLS-1$
writer.endElement();
writeWarOrEarResources( writer, getProject(), referencedReactorArtifacts, localRepository );
@@ -118,9 +117,9 @@
if ( !dir.isTest() )
{
// <wb-resource deploy-path="/" source-path="/src/java" />
- writer.startElement( ELT_WB_RESOURCE ); //$NON-NLS-1$
- writer.addAttribute( ATTR_DEPLOY_PATH, target ); //$NON-NLS-1$
- writer.addAttribute( ATTR_SOURCE_PATH, dir.getPath() ); //$NON-NLS-1$
+ writer.startElement( ELT_WB_RESOURCE );
+ writer.addAttribute( ATTR_DEPLOY_PATH, target );
+ writer.addAttribute( ATTR_SOURCE_PATH, dir.getPath() );
writer.endElement();
}
}