Author: bentmann
Date: Mon Aug 18 09:46:46 2008
New Revision: 686814
URL: http://svn.apache.org/viewvc?rev=686814&view=rev
Log:
[MECLIPSE-479] More "contaigner" entries
Submitted by: David J. M. Karlsen
Reviewed by: Benjamin Bentmann
Modified:
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/rad/RadEjbClasspathWriter.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java?rev=686814&r1=686813&r2=686814&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
Mon Aug 18 09:46:46 2008
@@ -86,7 +86,7 @@
public void init( Log log, WorkspaceConfiguration workspaceConfiguration,
MavenProject project,
String wtpDefaultServer )
{
- detectDefaultJREContaigner( workspaceConfiguration, project, log );
+ detectDefaultJREContainer( workspaceConfiguration, project, log );
readWorkspace( workspaceConfiguration, log );
detectWTPDefaultServer( log, workspaceConfiguration, wtpDefaultServer
);
}
@@ -144,9 +144,9 @@
* @param logger the logger to log the error's
* @return the found container or null if non found.
*/
- private String getContaignerFromExecutable( String rawExecutable, Map
jreMap, Log logger )
+ private String getContainerFromExecutable( String rawExecutable, Map
jreMap, Log logger )
{
- String foundContaigner = null;
+ String foundContainer = null;
if ( rawExecutable != null )
{
String executable;
@@ -162,11 +162,11 @@
File executableFile = new File( executable );
while ( executableFile != null )
{
- foundContaigner = (String) jreMap.get(
executableFile.getPath() );
- if ( foundContaigner != null )
+ foundContainer = (String) jreMap.get( executableFile.getPath()
);
+ if ( foundContainer != null )
{
- logger.debug( "detected classpathContaigner from
executable: " + foundContaigner );
- return foundContaigner;
+ logger.debug( "detected classpathContainer from
executable: " + foundContainer );
+ return foundContainer;
}
executableFile = executableFile.getParentFile();
@@ -182,7 +182,7 @@
* @param project the maven project the get the configuration
* @param logger the logger for errors
*/
- private void detectDefaultJREContaigner( WorkspaceConfiguration
workspaceConfiguration, MavenProject project,
+ private void detectDefaultJREContainer( WorkspaceConfiguration
workspaceConfiguration, MavenProject project,
Log logger )
{
String defaultJREContainer =
ReadWorkspaceLocations.CLASSPATHENTRY_DEFAULT;
@@ -191,31 +191,31 @@
Map jreMap = readAvailableJREs(
workspaceConfiguration.getWorkspaceDirectory(), logger );
if ( jreMap != null )
{
- String foundContaigner =
- getContaignerFromExecutable( System.getProperty(
"maven.compiler.executable" ), jreMap, logger );
- if ( foundContaigner == null )
+ String foundContainer =
+ getContainerFromExecutable( System.getProperty(
"maven.compiler.executable" ), jreMap, logger );
+ if ( foundContainer == null )
{
- foundContaigner =
- getContaignerFromExecutable(
IdeUtils.getCompilerPluginSetting( project, "executable" ),
+ foundContainer =
+ getContainerFromExecutable(
IdeUtils.getCompilerPluginSetting( project, "executable" ),
jreMap, logger );
}
- if ( foundContaigner == null )
+ if ( foundContainer == null )
{
String sourceVersion = IdeUtils.getCompilerSourceVersion(
project );
- foundContaigner = (String) jreMap.get( sourceVersion );
- if ( foundContaigner != null )
+ foundContainer = (String) jreMap.get( sourceVersion );
+ if ( foundContainer != null )
{
- logger.debug( "detected classpathContaigner from
sourceVersion(" + sourceVersion + "): " +
- foundContaigner );
+ logger.debug( "detected classpathContainer from
sourceVersion(" + sourceVersion + "): " +
+ foundContainer );
}
}
- if ( foundContaigner == null )
+ if ( foundContainer == null )
{
- foundContaigner = getContaignerFromExecutable(
System.getProperty( "java.home" ), jreMap, logger );
+ foundContainer = getContainerFromExecutable(
System.getProperty( "java.home" ), jreMap, logger );
}
- if ( foundContaigner != null )
+ if ( foundContainer != null )
{
- defaultJREContainer = foundContaigner;
+ defaultJREContainer = foundContainer;
}
}
@@ -458,7 +458,7 @@
{
jreMap.put( jrePath,
ReadWorkspaceLocations.CLASSPATHENTRY_DEFAULT );
jreMap.put( version,
ReadWorkspaceLocations.CLASSPATHENTRY_DEFAULT );
- logger.debug( "Default Classpath Contaigner version: "
+ version + " location: " + jrePath );
+ logger.debug( "Default Classpath Container version: "
+ version + " location: " + jrePath );
}
else if ( !jreMap.containsKey( jrePath ) )
{
@@ -467,12 +467,12 @@
jreMap.put( version, classpathEntry );
}
jreMap.put( jrePath, classpathEntry );
- logger.debug( "Additional Classpath Contaigner
version: " + version + " " + classpathEntry +
+ logger.debug( "Additional Classpath Container version:
" + version + " " + classpathEntry +
" location: " + jrePath );
}
else
{
- logger.debug( "Ignored (duplicated) additional
Classpath Contaigner version: " + version + " " +
+ logger.debug( "Ignored (duplicated) additional
Classpath Container version: " + version + " " +
classpathEntry + " location: " + jrePath );
}
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadEjbClasspathWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadEjbClasspathWriter.java?rev=686814&r1=686813&r2=686814&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadEjbClasspathWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadEjbClasspathWriter.java
Mon Aug 18 09:46:46 2008
@@ -76,7 +76,7 @@
private static final String VAR = "var";
- private static final String WEBSPHERE6CONTAIGNER =
+ private static final String WEBSPHERE6CONTAINER =
"com.ibm.wtp.server.java.core.container/com.ibm.ws.ast.st.runtime.core.runtimeTarget.v60/was.base.v6";
/**
@@ -119,7 +119,7 @@
newEntry = new Xpp3Dom( CLASSPATHENTRY );
newEntry.setAttribute( KIND, CON );
- newEntry.setAttribute( PATH, WEBSPHERE6CONTAIGNER );
+ newEntry.setAttribute( PATH, WEBSPHERE6CONTAINER );
classpath.addChild( newEntry );
children = classpath.getChildren();
