Author: snjeza Date: 2009-06-18 06:50:31 -0400 (Thu, 18 Jun 2009) New Revision: 16033 Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java Log: https://jira.jboss.org/jira/browse/JBIDE-3874 Maven integration Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2009-06-18 10:19:41 UTC (rev 16032) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2009-06-18 10:50:31 UTC (rev 16033) @@ -123,8 +123,10 @@ } } if (!hasJavaNature) { - createFolder("target",monitor, project); - IFolder binFolder = createFolder("target/classes",monitor, project); + // EAR project + createFolder("src",monitor, project); + createFolder("src/main",monitor,project); + IFolder binFolder = createFolder("src/main/application",monitor, project); String[] newNatureIds = new String[natureIds.length + 1]; for (int i = 0; i < natureIds.length; i++) { newNatureIds[i]=natureIds[i]; Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2009-06-18 10:19:41 UTC (rev 16032) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2009-06-18 10:50:31 UTC (rev 16033) @@ -137,17 +137,15 @@ parentArtifactId = artifactId + PARENT_SUFFIX; testProjectName = webProjectName + TEST_SUFFIX; testArtifactId = artifactId + TEST_SUFFIX; + earProjectName = webProjectName + EAR_SUFFIX; + earArtifactId = artifactId + EAR_SUFFIX; + ejbProjectName = webProjectName + EJB_SUFFIX; + ejbArtifactId = artifactId + EJB_SUFFIX; configureParentProject(m2FacetModel, seamFacetModel); configureWarProject(m2FacetModel, seamFacetModel); configureTestProject(m2FacetModel, seamFacetModel); if (!SeamFacetAbstractInstallDelegate .isWarConfiguration(seamFacetModel)) { - - earProjectName = webProjectName + EAR_SUFFIX; - earArtifactId = artifactId + EAR_SUFFIX; - ejbProjectName = webProjectName + EJB_SUFFIX; - ejbArtifactId = artifactId + EJB_SUFFIX; - configureEjbProject(m2FacetModel, seamFacetModel); configureEarProject(m2FacetModel, seamFacetModel); @@ -360,7 +358,7 @@ if (sourceDirectory != null) { build.setSourceDirectory(sourceDirectory); } - build.setOutputDirectory("target/classes"); + build.setOutputDirectory("src/main/application"); MavenCoreActivator.addMavenEarPlugin(build, project, m2FacetModel, true); model.setBuild(build); MavenCoreActivator.createMavenProject(earProjectName, null, model, true);