Author: aheritier
Date: Wed Nov 21 04:49:31 2007
New Revision: 597060
URL: http://svn.apache.org/viewvc?rev=597060&view=rev
Log:
MECLIPSE-346 : Fix previous commit.
Add a test case to validate the new behavior
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.project
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/pom.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/src/main/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/src/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/src/test/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/src/test/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.project
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/pom.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/Hello.java
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/HelloBean.java
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/test/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/test/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml
(with props)
Modified:
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/RadJ2EEWriter.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/wtp/AbstractWtpResourceWriter.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/ide/AbstractIdeSupportMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java?rev=597060&r1=597059&r2=597060&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
Wed Nov 21 04:49:31 2007
@@ -177,7 +177,7 @@
*/
private Xpp3Dom createNewApplicationXml()
{
- String j2eeVersion = JeeUtils.resolveJeeVersion( config.getProject() );
+ String j2eeVersion = JeeUtils.resolveJeeVersion( config.getDeps() );
// By default J2EE version is in the format X.X
// Must be fixed for JEE < 1.4. Schemas didn't exist
Xpp3Dom result = new Xpp3Dom( APPLICATION_XML_APPLICATION );
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadJ2EEWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadJ2EEWriter.java?rev=597060&r1=597059&r2=597060&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadJ2EEWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadJ2EEWriter.java
Wed Nov 21 04:49:31 2007
@@ -104,19 +104,19 @@
if ( Constants.PROJECT_PACKAGING_WAR.equalsIgnoreCase( packaging ) )
{
// In format X.X
- String servletVersion = JeeUtils.resolveServletVersion(
config.getProject() );
+ String servletVersion = JeeUtils.resolveServletVersion(
config.getDeps() );
writer.writeText( "" + servletVersion.charAt( 0 ) +
servletVersion.charAt( 2 ) );
}
else if ( Constants.PROJECT_PACKAGING_EJB.equalsIgnoreCase( packaging
) )
{
// In format X.X
- String ejbVersion = JeeUtils.resolveEjbVersion(
config.getProject() );
+ String ejbVersion = JeeUtils.resolveEjbVersion( config.getDeps() );
writer.writeText( "" + ejbVersion.charAt( 0 ) + ejbVersion.charAt(
2 ) );
}
else if ( Constants.PROJECT_PACKAGING_EAR.equalsIgnoreCase( packaging
) )
{
// In format X.X
- String jeeVersion = JeeUtils.resolveJeeVersion(
config.getProject() );
+ String jeeVersion = JeeUtils.resolveJeeVersion( config.getDeps() );
writer.writeText( "" + jeeVersion.charAt( 0 ) + jeeVersion.charAt(
2 ) );
}
writer.endElement();
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java?rev=597060&r1=597059&r2=597060&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
Wed Nov 21 04:49:31 2007
@@ -139,7 +139,7 @@
writer.writeText( "J2EE" );
writer.endElement();
writer.startElement( WEBSETTINGS_JSP_LEVEL );
- writer.writeText( JeeUtils.resolveJspVersion( config.getProject() ) );
+ writer.writeText( JeeUtils.resolveJspVersion( config.getDeps() ) );
writer.endElement();
writer.startElement( WEBSETTINGS_FEATURES );
writer.startElement( WEBSETTINGS_FEATURE );
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java?rev=597060&r1=597059&r2=597060&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
Wed Nov 21 04:49:31 2007
@@ -92,7 +92,7 @@
writer.startElement( ELT_VERSION );
- writer.writeText( JeeUtils.resolveServletVersion( project ) );
+ writer.writeText( JeeUtils.resolveServletVersion( config.getDeps()
) );
writer.endElement();
String contextRoot = config.getContextName();
@@ -107,7 +107,7 @@
writer.addAttribute( ATTR_MODULE_TYPE_ID, "jst.ejb" );
//$NON-NLS-1$
writer.startElement( ELT_VERSION );
- writer.writeText( JeeUtils.resolveEjbVersion( project ) );
+ writer.writeText( JeeUtils.resolveEjbVersion( config.getDeps() ) );
writer.endElement();
@@ -123,7 +123,7 @@
writer.addAttribute( ATTR_MODULE_TYPE_ID, "jst.ear" );
//$NON-NLS-1$
writer.startElement( ELT_VERSION );
- writer.writeText( JeeUtils.resolveJeeVersion( project ) );
+ writer.writeText( JeeUtils.resolveJeeVersion( config.getDeps() ) );
writer.endElement();
}
else
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java?rev=597060&r1=597059&r2=597060&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java
Wed Nov 21 04:49:31 2007
@@ -125,7 +125,7 @@
writer.endElement(); // fixed
writer.startElement( ELT_INSTALLED );
writer.addAttribute( ATTR_FACET, FACET_JST_WEB );
- writer.addAttribute( ATTR_VERSION, JeeUtils.resolveServletVersion(
config.getProject() ) );
+ writer.addAttribute( ATTR_VERSION, JeeUtils.resolveServletVersion(
config.getDeps() ) );
writer.endElement(); // installed
}
else if ( Constants.PROJECT_PACKAGING_EJB.equalsIgnoreCase( packaging
) ) //$NON-NLS-1$
@@ -135,7 +135,7 @@
writer.endElement(); // fixed
writer.startElement( ELT_INSTALLED );
writer.addAttribute( ATTR_FACET, FACET_JST_EJB );
- writer.addAttribute( ATTR_VERSION, JeeUtils.resolveEjbVersion(
config.getProject() ) );
+ writer.addAttribute( ATTR_VERSION, JeeUtils.resolveEjbVersion(
config.getDeps() ) );
writer.endElement(); // installed
}
else if ( Constants.PROJECT_PACKAGING_EAR.equalsIgnoreCase( packaging
) ) //$NON-NLS-1$
@@ -145,7 +145,7 @@
writer.endElement(); // fixed
writer.startElement( ELT_INSTALLED );
writer.addAttribute( ATTR_FACET, FACET_JST_EAR );
- writer.addAttribute( ATTR_VERSION, JeeUtils.resolveJeeVersion(
config.getProject() ) );
+ writer.addAttribute( ATTR_VERSION, JeeUtils.resolveJeeVersion(
config.getDeps() ) );
writer.endElement(); // installed
}
else if ( Constants.PROJECT_PACKAGING_JAR.equalsIgnoreCase( packaging
) ) //$NON-NLS-1$
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java?rev=597060&r1=597059&r2=597060&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
Wed Nov 21 04:49:31 2007
@@ -498,12 +498,12 @@
}
/**
- * Resolve project dependencies. Manual resolution is needed in order to
avoid resoltion of multiproject artifacts
+ * Resolve project dependencies. Manual resolution is needed in order to
avoid resolution of multiproject artifacts
* (if projects will be linked each other an installed jar is not needed)
and to avoid a failure when a jar is
* missing.
*
* @throws MojoExecutionException if dependencies can't be resolved
- * @return resoved IDE dependencies, with attached jars for non-reactor
dependencies
+ * @return resolved IDE dependencies, with attached jars for non-reactor
dependencies
*/
protected IdeDependency[] doDependencyResolution()
throws MojoExecutionException
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java?rev=597060&r1=597059&r2=597060&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
Wed Nov 21 04:49:31 2007
@@ -23,7 +23,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -31,7 +30,6 @@
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.plugin.MojoExecutionException;
@@ -138,30 +136,30 @@
return IdeUtils.getCompilerPluginSetting( project, PROPERTY_TARGET );
}
- /**
- * Extracts the version of the first matching dependency in the given list.
- *
- * @param artifactIds artifact names to compare against for extracting
version
- * @param dependencies Collection of dependencies for our project
- * @param len expected length of the version sub-string
- * @return
- */
- public static String getDependencyVersion( String[] artifactIds, List
dependencies, int len )
- {
- for ( int j = 0; j < artifactIds.length; j++ )
- {
- String id = artifactIds[j];
- for ( Iterator itr = dependencies.iterator(); itr.hasNext(); )
- {
- Dependency dependency = (Dependency) itr.next();
- if ( id.equals( dependency.getArtifactId() ) )
- {
- return StringUtils.substring( dependency.getVersion(), 0,
len );
- }
- }
- }
- return null;
- }
+ // /**
+ // * Extracts the version of the first matching dependency in the given
list.
+ // *
+ // * @param artifactIds artifact names to compare against for extracting
version
+ // * @param dependencies Collection of dependencies for our project
+ // * @param len expected length of the version sub-string
+ // * @return
+ // */
+ // public static String getDependencyVersion( String[] artifactIds, List
dependencies, int len )
+ // {
+ // for ( int j = 0; j < artifactIds.length; j++ )
+ // {
+ // String id = artifactIds[j];
+ // for ( Iterator itr = dependencies.iterator(); itr.hasNext(); )
+ // {
+ // Dependency dependency = (Dependency) itr.next();
+ // if ( id.equals( dependency.getArtifactId() ) )
+ // {
+ // return StringUtils.substring( dependency.getVersion(), 0, len );
+ // }
+ // }
+ // }
+ // return null;
+ // }
/**
* Extracts the version of the first matching artifact in the given list.
@@ -171,14 +169,14 @@
* @param len expected length of the version sub-string
* @return
*/
- public static String getArtifactVersion( String[] artifactIds, Set
artifacts, int len )
+ public static String getArtifactVersion( String[] artifactIds,
IdeDependency[] artifacts, int len )
{
for ( int j = 0; j < artifactIds.length; j++ )
{
String id = artifactIds[j];
- for ( Iterator itr = artifacts.iterator(); itr.hasNext(); )
+ for ( int k = 0; k < artifacts.length; k++ )
{
- Artifact artifact = (Artifact) itr.next();
+ IdeDependency artifact = artifacts[k];
if ( id.equals( artifact.getArtifactId() ) )
{
return StringUtils.substring( artifact.getVersion(), 0,
len );
@@ -188,7 +186,6 @@
return null;
}
-
/**
* Search for a configuration setting of an other plugin for a
configuration setting.
*
@@ -336,22 +333,6 @@
return resolvedArtifact;
}
- /**
- * @deprecated Use [EMAIL PROTECTED]
JeeUtils#resolveEjbVersion(MavenProject)} instead
- */
- public static String resolveEjbVersion( MavenProject project )
- {
- return JeeUtils.resolveEjbVersion( project );
- }
-
- /**
- * @deprecated Use [EMAIL PROTECTED]
JeeUtils#resolveJeeVersion(MavenProject)} instead
- */
- public static String resolveJ2eeVersion( MavenProject project )
- {
- return JeeUtils.resolveJeeVersion( project );
- }
-
public static String resolveJavaVersion( MavenProject project )
{
String version = IdeUtils.getCompilerTargetVersion( project );
@@ -374,14 +355,6 @@
}
return version == null ? IdeUtils.JAVA_1_4 : version; //$NON-NLS-1$
- }
-
- /**
- * @deprecated Use [EMAIL PROTECTED]
JeeUtils#resolveServletVersion(MavenProject)} instead
- */
- public static String resolveServletVersion( MavenProject project )
- {
- return JeeUtils.resolveServletVersion( project );
}
public static String toRelativeAndFixSeparator( File basedir, File
fileToAdd, boolean replaceSlashesWithDashes )
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java?rev=597060&r1=597059&r2=597060&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
Wed Nov 21 04:49:31 2007
@@ -19,11 +19,7 @@
package org.apache.maven.plugin.ide;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
-
-import org.apache.maven.project.MavenProject;
public class JeeUtils
{
@@ -110,19 +106,19 @@
/**
* Search in dependencies a version of EJB APIs (or of JEE APIs).
*
- * @param project The maven project descriptor.
+ * @param artifacts The list of dependencies where we search the
information
* @return An EJB version as defined by constants JeeDescriptor.EJB_x_x.
By default, if nothing is found, returns
* JeeDescriptor.EJB_2_1.
*/
- public static String resolveEjbVersion( MavenProject project )
+ public static String resolveEjbVersion( IdeDependency[] artifacts )
{
- String version = findEjbVersionInDependencies( project );
+ String version = findEjbVersionInDependencies( artifacts );
if ( version == null )
{
// No ejb dependency detected. Try to resolve the ejb
// version from J2EE/JEE.
- JeeDescriptor descriptor = getJeeDescriptorFromJeeVersion(
findJeeVersionInDependencies( project ) );
+ JeeDescriptor descriptor = getJeeDescriptorFromJeeVersion(
findJeeVersionInDependencies( artifacts ) );
if ( descriptor != null )
version = descriptor.getEjbVersion();
}
@@ -132,35 +128,58 @@
/**
* Search in dependencies a version of JEE APIs.
*
- * @param project The maven project descriptor.
+ * @param artifacts The list of dependencies where we search the
information
* @return A JEE version as defined by constants JeeDescriptor.JEE_x_x. By
default, if nothing is found, returns
* JeeDescriptor.JEE_1_4.
*/
- public static String resolveJeeVersion( MavenProject project )
+ public static String resolveJeeVersion( IdeDependency[] artifacts )
{
// try to find version in dependencies
- String version = findJeeVersionInDependencies( project );
-
+ String version = findJeeVersionInDependencies( artifacts );
+ if ( version == null )
+ {
+ // No JEE dependency detected. Try to resolve the JEE
+ // version from EJB.
+ JeeDescriptor descriptor = getJeeDescriptorFromEjbVersion(
findEjbVersionInDependencies( artifacts ) );
+ if ( descriptor != null )
+ version = descriptor.getJeeVersion();
+ }
+ if ( version == null )
+ {
+ // No JEE dependency detected. Try to resolve the JEE
+ // version from SERVLET.
+ JeeDescriptor descriptor = getJeeDescriptorFromServletVersion(
findServletVersionInDependencies( artifacts ) );
+ if ( descriptor != null )
+ version = descriptor.getJeeVersion();
+ }
+ if ( version == null )
+ {
+ // No JEE dependency detected. Try to resolve the JEE
+ // version from JSP.
+ JeeDescriptor descriptor = getJeeDescriptorFromJspVersion(
findJspVersionInDependencies( artifacts ) );
+ if ( descriptor != null )
+ version = descriptor.getJeeVersion();
+ }
return version == null ? JeeDescriptor.JEE_1_4 : version; //$NON-NLS-1$
}
/**
* Search in dependencies a version of JSP APIs (or from JEE APIs, or from
Servlet APIs).
*
- * @param project The maven project descriptor.
+ * @param artifacts The list of dependencies where we search the
information
* @return A JSP version as defined by constants JeeDescriptor.JSP_x_x. By
default, if nothing is found, returns
* JeeDescriptor.JSP_2_0.
*/
- public static String resolveJspVersion( MavenProject project )
+ public static String resolveJspVersion( IdeDependency[] artifacts )
{
- String version = findJspVersionInDependencies( project );
+ String version = findJspVersionInDependencies( artifacts );
if ( version == null )
{
// No jsp dependency detected. Try to resolve the jsp
// version from J2EE/JEE.
- JeeDescriptor descriptor = getJeeDescriptorFromJeeVersion(
findJeeVersionInDependencies( project ) );
+ JeeDescriptor descriptor = getJeeDescriptorFromJeeVersion(
findJeeVersionInDependencies( artifacts ) );
if ( descriptor != null )
version = descriptor.getJspVersion();
}
@@ -168,7 +187,7 @@
{
// No jsp dependency detected. Try to resolve the jsp
// version from Servlet.
- JeeDescriptor descriptor = getJeeDescriptorFromServletVersion(
findServletVersionInDependencies( project ) );
+ JeeDescriptor descriptor = getJeeDescriptorFromServletVersion(
findServletVersionInDependencies( artifacts ) );
if ( descriptor != null )
version = descriptor.getJspVersion();
}
@@ -178,19 +197,19 @@
/**
* Search in dependencies a version of Servlet APIs (or of JEE APIs).
*
- * @param project The maven project descriptor.
+ * @param artifacts The list of dependencies where we search the
information
* @return A SERVLET version as defined by constants
JeeDescriptor.SERLVET_x_x. By default, if nothing is found,
* returns JeeDescriptor.SERVLET_2_4.
*/
- public static String resolveServletVersion( MavenProject project )
+ public static String resolveServletVersion( IdeDependency[] artifacts )
{
- String version = findServletVersionInDependencies( project );
+ String version = findServletVersionInDependencies( artifacts );
if ( version == null )
{
// No servlet dependency detected. Try to resolve the servlet
// version from J2EE/JEE.
- JeeDescriptor descriptor = getJeeDescriptorFromJeeVersion(
findJeeVersionInDependencies( project ) );
+ JeeDescriptor descriptor = getJeeDescriptorFromJeeVersion(
findJeeVersionInDependencies( artifacts ) );
if ( descriptor != null )
version = descriptor.getServletVersion();
}
@@ -206,66 +225,61 @@
jspMap.put( jspVersion, descriptor );
}
- private static String findEjbVersionInDependencies( MavenProject project )
+ private static String findEjbVersionInDependencies( IdeDependency[]
artifacts )
{
String version =
- IdeUtils.getArtifactVersion( new String[] { "ejb", "ejb-api",
"geronimo-spec-ejb" },
- project.getArtifacts(), 3 );
-
+ IdeUtils.getArtifactVersion( new String[] { "ejb", "ejb-api",
"geronimo-spec-ejb" }, artifacts, 3 );
// For new Geronimo APIs, the version of the artifact isn't the one of
the spec
if ( version == null )
{
- if ( IdeUtils.getArtifactVersion( new String[] {
"geronimo-ejb_2.1_spec" }, project.getArtifacts(), 3 ) != null )
+ if ( IdeUtils.getArtifactVersion( new String[] {
"geronimo-ejb_2.1_spec" }, artifacts, 3 ) != null )
return JeeDescriptor.EJB_2_1;
}
if ( version == null )
{
- if ( IdeUtils.getArtifactVersion( new String[] {
"geronimo-ejb_3.0_spec" }, project.getArtifacts(), 3 ) != null )
+ if ( IdeUtils.getArtifactVersion( new String[] {
"geronimo-ejb_3.0_spec" }, artifacts, 3 ) != null )
return JeeDescriptor.EJB_3_0;
}
-
return version;
}
- private static String findJeeVersionInDependencies( MavenProject project )
+ private static String findJeeVersionInDependencies( IdeDependency[]
artifacts )
{
String[] artifactIds = new String[] { "javaee-api", "j2ee",
"geronimo-spec-j2ee" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- String version = IdeUtils.getArtifactVersion( artifactIds,
project.getArtifacts(), 3 );
+ String version = IdeUtils.getArtifactVersion( artifactIds, artifacts,
3 );
// For new Geronimo APIs, the version of the artifact isn't the one of
the spec
if ( version == null )
{
- if ( IdeUtils.getArtifactVersion( new String[] {
"geronimo-j2ee_1.4_spec" }, project.getArtifacts(), 3 ) != null )
+ if ( IdeUtils.getArtifactVersion( new String[] {
"geronimo-j2ee_1.4_spec" }, artifacts, 3 ) != null )
return JeeDescriptor.JEE_1_4;
}
return version;
}
- private static String findJspVersionInDependencies( MavenProject project )
+ private static String findJspVersionInDependencies( IdeDependency[]
artifacts )
{
return null;
}
- private static String findServletVersionInDependencies( MavenProject
project )
+ private static String findServletVersionInDependencies( IdeDependency[]
artifacts )
{
String[] artifactIds = new String[] { "servlet-api", "servletapi",
"geronimo-spec-servlet" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- String version = IdeUtils.getArtifactVersion( artifactIds,
project.getArtifacts(), 3 );
+ String version = IdeUtils.getArtifactVersion( artifactIds, artifacts,
3 );
// For new Geronimo APIs, the version of the artifact isn't the one of
the spec
if ( version == null )
{
- if ( IdeUtils.getArtifactVersion( new String[] {
"geronimo-servlet_2.4_spec" },
- project.getArtifacts(), 3 ) !=
null )
+ if ( IdeUtils.getArtifactVersion( new String[] {
"geronimo-servlet_2.4_spec" }, artifacts, 3 ) != null )
return JeeDescriptor.SERVLET_2_4;
}
if ( version == null )
{
- if ( IdeUtils.getArtifactVersion( new String[] {
"geronimo-servlet_2.5_spec" },
- project.getArtifacts(), 3 ) !=
null )
+ if ( IdeUtils.getArtifactVersion( new String[] {
"geronimo-servlet_2.5_spec" }, artifacts, 3 ) != null )
return JeeDescriptor.SERVLET_2_5;
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?rev=597060&r1=597059&r2=597060&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Wed Nov 21 04:49:31 2007
@@ -377,6 +377,7 @@
File pom = new File( basedir, "pom.xml" );
List goals = new ArrayList();
goals.add( "install" );
+ goals.add( "clean" );
executeMaven( pom, new Properties(), goals );
// Test project
testProject( "j2ee-simple" );
@@ -474,4 +475,18 @@
* the user's local repo.
*/
-}
+ public void testProject36()
+ throws Exception
+ {
+ // Install artefacts
+ File basedir = getTestFile( "target/test-classes/projects/project-36"
);
+ File pom = new File( basedir, "pom.xml" );
+ List goals = new ArrayList();
+ goals.add( "install" );
+ goals.add( "clean" );
+ executeMaven( pom, new Properties(), goals );
+ // Test
+ testProject( "project-36" );
+ }
+
+}
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 21 04:49:31 2007
@@ -0,0 +1 @@
+target
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 21 04:49:31 2007
@@ -0,0 +1,3 @@
+.project
+.settings
+target
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.project?rev=597060&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.project
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.project
Wed Nov 21 04:49:31 2007
@@ -0,0 +1,19 @@
+<projectDescription>
+ <name>my-ear</name>
+ <comment/>
+ <projects>
+ <project>my-ejb</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.project
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.jdt.core.prefs?rev=597060&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.jdt.core.prefs
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.jdt.core.prefs
Wed Nov 21 04:49:31 2007
@@ -0,0 +1,5 @@
+#Wed Nov 21 11:20:59 CET 2007
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component?rev=597060&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component
Wed Nov 21 04:49:31 2007
@@ -0,0 +1,14 @@
+<project-modules id="moduleCoreId" project-version="2.0">
+ <wb-module deploy-name="my-ear">
+ <wb-resource deploy-path="/" source-path="src/main/application"/>
+ <dependent-module archiveName="my-ejb.ejb" deploy-path="/"
handle="module:/resource/my-ejb/my-ejb">
+ <dependent-object>EjbModule_17743384</dependent-object>
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="geronimo-ejb_3.0_spec-1.0.jar"
deploy-path="/"
handle="module:/classpath/var/M2_REPO/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0/geronimo-ejb_3.0_spec-1.0.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <wb-resource deploy-path="/" source-path="src/main/java"/>
+ <wb-resource deploy-path="/" source-path="src/main/resources"/>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?rev=597060&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
Wed Nov 21 04:49:31 2007
@@ -0,0 +1,6 @@
+<faceted-project>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.ear"/>
+ <installed facet="jst.ear" version="5.0"/>
+ <installed facet="jst.java" version="5.0"/>
+</faceted-project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/pom.xml?rev=597060&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/pom.xml
Wed Nov 21 04:49:31 2007
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugins.eclipse.test.project-36</groupId>
+ <artifactId>master</artifactId>
+ <version>1.0</version>
+ </parent>
+ <packaging>ear</packaging>
+ <artifactId>my-ear</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>my-ejb</artifactId>
+ <version>${pom.version}</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 21 04:49:31 2007
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath?rev=597060&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath
Wed Nov 21 04:49:31 2007
@@ -0,0 +1,9 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java"
output="target/test-classes"/>
+ <classpathentry kind="src" path="src/test/resources"
output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0/geronimo-ejb_3.0_spec-1.0.jar"/>
+</classpath>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.project?rev=597060&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.project
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.project
Wed Nov 21 04:49:31 2007
@@ -0,0 +1,22 @@
+<projectDescription>
+ <name>my-ejb</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.project
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.jdt.core.prefs?rev=597060&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.jdt.core.prefs
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.jdt.core.prefs
Wed Nov 21 04:49:31 2007
@@ -0,0 +1,5 @@
+#Wed Nov 21 11:20:58 CET 2007
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.component
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.component?rev=597060&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.component
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.component
Wed Nov 21 04:49:31 2007
@@ -0,0 +1,6 @@
+<project-modules id="moduleCoreId" project-version="2.0">
+ <wb-module deploy-name="my-ejb">
+ <wb-resource deploy-path="/" source-path="src/main/java"/>
+ <wb-resource deploy-path="/" source-path="src/main/resources"/>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?rev=597060&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
Wed Nov 21 04:49:31 2007
@@ -0,0 +1,6 @@
+<faceted-project>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.ejb"/>
+ <installed facet="jst.ejb" version="3.0"/>
+ <installed facet="jst.java" version="5.0"/>
+</faceted-project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/pom.xml?rev=597060&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/pom.xml
Wed Nov 21 04:49:31 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugins.eclipse.test.project-36</groupId>
+ <artifactId>master</artifactId>
+ <version>1.0</version>
+ </parent>
+ <packaging>ejb</packaging>
+ <artifactId>my-ejb</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <ejbVersion>3.0</ejbVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/Hello.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/Hello.java?rev=597060&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/Hello.java
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/Hello.java
Wed Nov 21 04:49:31 2007
@@ -0,0 +1,11 @@
+package example;
+
+/**
+ * Interface for the Hello session.
+ */
+public interface Hello {
+ /**
+ * Returns a hello, world string.
+ */
+ public String hello();
+}
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/Hello.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/Hello.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/HelloBean.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/HelloBean.java?rev=597060&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/HelloBean.java
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/HelloBean.java
Wed Nov 21 04:49:31 2007
@@ -0,0 +1,22 @@
+package example;
+
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import static javax.ejb.TransactionAttributeType.SUPPORTS;
+
+/**
+ * Implementation of the Hello bean.
+ */
[EMAIL PROTECTED]
+public class HelloBean implements Hello {
+ private String _greeting = "Default Hello";
+
+ /**
+ * Returns a hello, world string.
+ */
+ @TransactionAttribute(SUPPORTS)
+ public String hello()
+ {
+ return _greeting;
+ }
+}
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/HelloBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/src/main/java/example/HelloBean.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml?rev=597060&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml
Wed Nov 21 04:49:31 2007
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
+ <groupId>org.apache.maven.plugins.eclipse.test.project-36</groupId>
+ <artifactId>master</artifactId>
+ <version>1.0</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ <configuration>
+ <wtpversion>2.0</wtpversion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <modules>
+ <module>my-ejb</module>
+ <module>my-ear</module>
+ </modules>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
