You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2008/03/27 23:58:52 UTC
svn commit: r642017 - in /maven/plugins/trunk/maven-eclipse-plugin/src:
main/java/org/apache/maven/plugin/eclipse/writers/wtp/
test/resources/projects/project-41/expected/.settings/
test/resources/projects/project-42/expected/.settings/
Author: aheritier
Date: Thu Mar 27 15:58:44 2008
New Revision: 642017
URL: http://svn.apache.org/viewvc?rev=642017&view=rev
Log:
MECLIPSE-266 : plugin applies java facet to ear project
Patch submitted by Tionan Lim, Rune Peter Bjørnstad, Stefan Bley
Modified:
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/test/resources/projects/project-41/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-42/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
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=642017&r1=642016&r2=642017&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 Thu Mar 27 15:58:44 2008
@@ -118,29 +118,19 @@
private void writeModuleTypeFacetCore( XMLWriter writer, String packaging )
{
writer.startElement( ELT_FACETED_PROJECT );
- // common facet
- writer.startElement( ELT_FIXED );
- writer.addAttribute( ATTR_FACET, FACET_JST_JAVA );
- writer.endElement(); // element fixed
if ( Constants.PROJECT_PACKAGING_WAR.equalsIgnoreCase( packaging ) ) //$NON-NLS-1$
{
- writer.startElement( ELT_FIXED );
- writer.addAttribute( ATTR_FACET, FACET_JST_WEB );
- writer.endElement(); // fixed
- writer.startElement( ELT_INSTALLED );
- writer.addAttribute( ATTR_FACET, FACET_JST_WEB );
- writer.addAttribute( ATTR_VERSION, JeeUtils.resolveServletVersion( config.getProject() ) );
- writer.endElement(); // installed
+ writeFacetFixedElement( writer, FACET_JST_JAVA ); // fixed
+ writeFacetFixedElement( writer, FACET_JST_WEB ); // fixed
+ writeFacetInstalledElement( writer, FACET_JST_WEB, JeeUtils.resolveServletVersion( config.getProject() ) ); // installed
+ writeFacetInstalledElement( writer, FACET_JST_JAVA, IdeUtils.resolveJavaVersion( config.getProject() ) ); // installed
}
else if ( Constants.PROJECT_PACKAGING_EJB.equalsIgnoreCase( packaging ) ) //$NON-NLS-1$
{
- writer.startElement( ELT_FIXED );
- writer.addAttribute( ATTR_FACET, FACET_JST_EJB );
- writer.endElement(); // fixed
- writer.startElement( ELT_INSTALLED );
- writer.addAttribute( ATTR_FACET, FACET_JST_EJB );
- writer.addAttribute( ATTR_VERSION, JeeUtils.resolveEjbVersion( config.getProject() ) );
- writer.endElement(); // installed
+ writeFacetFixedElement( writer, FACET_JST_JAVA ); // fixed
+ writeFacetFixedElement( writer, FACET_JST_EJB ); // fixed
+ writeFacetInstalledElement( writer, FACET_JST_EJB, JeeUtils.resolveEjbVersion( config.getProject() ) ); // installed
+ writeFacetInstalledElement( writer, FACET_JST_JAVA, IdeUtils.resolveJavaVersion( config.getProject() ) ); // installed
}
else if ( Constants.PROJECT_PACKAGING_EAR.equalsIgnoreCase( packaging ) ) //$NON-NLS-1$
{
@@ -150,46 +140,59 @@
writer.addAttribute( "name", config.getWorkspaceConfiguration().getDefaultDeployServerName() );
writer.endElement(); // runtime
- writer.startElement( ELT_INSTALLED );
- writer.addAttribute( ATTR_FACET, FACET_COM_IBM_WEBSPHERE_EXTENDED_EAR );
- writer.addAttribute( ATTR_VERSION, this.config.getWorkspaceConfiguration().getWebsphereVersion() );
- writer.endElement(); // installed
-
- writer.startElement( ELT_INSTALLED );
- writer.addAttribute( ATTR_FACET, FACET_COM_IBM_WEBSPHERE_COEXISTENCE_EAR );
- writer.addAttribute( ATTR_VERSION, this.config.getWorkspaceConfiguration().getWebsphereVersion() );
- writer.endElement(); // installed
+ writeFacetInstalledElement( writer, FACET_COM_IBM_WEBSPHERE_EXTENDED_EAR,
+ this.config.getWorkspaceConfiguration().getWebsphereVersion() ); // installed
+ writeFacetInstalledElement( writer, FACET_COM_IBM_WEBSPHERE_COEXISTENCE_EAR,
+ this.config.getWorkspaceConfiguration().getWebsphereVersion() ); // installed
}
- writer.startElement( ELT_FIXED );
- writer.addAttribute( ATTR_FACET, FACET_JST_EAR );
- writer.endElement(); // fixed
- writer.startElement( ELT_INSTALLED );
- writer.addAttribute( ATTR_FACET, FACET_JST_EAR );
- writer.addAttribute( ATTR_VERSION, JeeUtils.resolveJeeVersion( config.getProject() ) );
- writer.endElement(); // installed
+ writeFacetFixedElement( writer, FACET_JST_EAR ); // fixed
+ writeFacetInstalledElement( writer, FACET_JST_EAR, JeeUtils.resolveJeeVersion( config.getProject() ) ); // installed
}
else if ( Constants.PROJECT_PACKAGING_JAR.equalsIgnoreCase( packaging ) ) //$NON-NLS-1$
{
- writer.startElement( ELT_FIXED );
- writer.addAttribute( ATTR_FACET, FACET_JST_UTILITY );
- writer.endElement(); // fixed
- writer.startElement( ELT_INSTALLED );
- writer.addAttribute( ATTR_FACET, FACET_JST_UTILITY );
- writer.addAttribute( ATTR_VERSION, "1.0" ); //$NON-NLS-1$
- writer.endElement(); // installed
+ writeFacetFixedElement( writer, FACET_JST_JAVA ); // fixed
+ writeFacetFixedElement( writer, FACET_JST_UTILITY ); // fixed
+ writeFacetInstalledElement( writer, FACET_JST_UTILITY, "1.0" ); //$NON-NLS-1$
+ writeFacetInstalledElement( writer, FACET_JST_JAVA, IdeUtils.resolveJavaVersion( config.getProject() ) ); // installed
+ // installed
}
- // common installed element
- writer.startElement( ELT_INSTALLED );
- writer.addAttribute( ATTR_FACET, FACET_JST_JAVA );
- writer.addAttribute( ATTR_VERSION, IdeUtils.resolveJavaVersion( config.getProject() ) );
- writer.endElement(); // installed
-
writeAdditionalProjectFacets( writer );
writer.endElement(); // faceted-project
+ }
+
+ /**
+ * Writes facet <code>fixed</code> element with attribute <code>facet</code> set to the value of argument
+ * <code>facetName</code>.
+ *
+ * @param writer
+ * @param facetName
+ */
+ private void writeFacetFixedElement( XMLWriter writer, String facetName )
+ {
+ writer.startElement( ELT_FIXED );
+ writer.addAttribute( ATTR_FACET, facetName );
+ writer.endElement();
+ }
+
+ /**
+ * Writes a facet <code>installed</code> element with attribute <code>facet</code> set to the value of argument
+ * <code>facetName</code>, and attribute <code>version</code> set to the value of argument
+ * <code>facetVersion</code>.
+ *
+ * @param writer
+ * @param facetName
+ * @param facetVersion
+ */
+ private void writeFacetInstalledElement( XMLWriter writer, String facetName, String facetVersion )
+ {
+ writer.startElement( ELT_INSTALLED );
+ writer.addAttribute( ATTR_FACET, facetName );
+ writer.addAttribute( ATTR_VERSION, facetVersion );
+ writer.endElement();
}
/**
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-41/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-41/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?rev=642017&r1=642016&r2=642017&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-41/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-41/expected/.settings/org.eclipse.wst.common.project.facet.core.xml Thu Mar 27 15:58:44 2008
@@ -1,9 +1,7 @@
<faceted-project>
- <fixed facet="jst.java"/>
<runtime name="WebSphere Application Server v5.1 Express stub"/>
<installed facet="com.ibm.websphere.extended.ear" version="5.1"/>
<installed facet="com.ibm.websphere.coexistence.ear" version="5.1"/>
<fixed facet="jst.ear"/>
<installed facet="jst.ear" version="1.4"/>
- <installed facet="jst.java" version="1.4"/>
</faceted-project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-42/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-42/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?rev=642017&r1=642016&r2=642017&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-42/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-42/expected/.settings/org.eclipse.wst.common.project.facet.core.xml Thu Mar 27 15:58:44 2008
@@ -1,9 +1,7 @@
<faceted-project>
- <fixed facet="jst.java"/>
<runtime name="WebSphere Application Server v6.0 stub"/>
<installed facet="com.ibm.websphere.extended.ear" version="6.0"/>
<installed facet="com.ibm.websphere.coexistence.ear" version="6.0"/>
<fixed facet="jst.ear"/>
<installed facet="jst.ear" version="1.4"/>
- <installed facet="jst.java" version="1.4"/>
</faceted-project>