[204331] Ear Libraries not added
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/web/project/facet/WebFacetInstallDelegate.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/web/project/facet/WebFacetInstallDelegate.java index 1c2c9ef..bca7cc3 100644 --- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/web/project/facet/WebFacetInstallDelegate.java +++ b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/web/project/facet/WebFacetInstallDelegate.java
@@ -35,6 +35,8 @@ import org.eclipse.jst.common.project.facet.WtpUtils; import org.eclipse.jst.common.project.facet.core.ClasspathHelper; import org.eclipse.jst.j2ee.internal.J2EEConstants; +import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer; +import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainerUtils; import org.eclipse.jst.j2ee.internal.web.classpath.WebAppLibrariesContainer; import org.eclipse.jst.j2ee.model.IModelProvider; import org.eclipse.jst.j2ee.model.ModelProviderManager; @@ -141,6 +143,10 @@ // ClasspathHelper.addClasspathEntries( project, fv, <something> ); } + if(J2EEComponentClasspathContainerUtils.getDefaultUseEARLibraries()){ + final IPath earLibContainer = new Path(J2EEComponentClasspathContainer.CONTAINER_ID); + addToClasspath(jproj, JavaCore.newContainerEntry(earLibContainer)); + } // Add the web libraries container. final IPath webLibContainer = new Path(WebAppLibrariesContainer.CONTAINER_ID);
diff --git a/plugins/org.eclipse.jst.jee/appclientcreation/org/eclipse/jst/jee/project/facet/AppClientFacetInstallDelegate.java b/plugins/org.eclipse.jst.jee/appclientcreation/org/eclipse/jst/jee/project/facet/AppClientFacetInstallDelegate.java index 7cfedc2..a512b32 100644 --- a/plugins/org.eclipse.jst.jee/appclientcreation/org/eclipse/jst/jee/project/facet/AppClientFacetInstallDelegate.java +++ b/plugins/org.eclipse.jst.jee/appclientcreation/org/eclipse/jst/jee/project/facet/AppClientFacetInstallDelegate.java
@@ -31,6 +31,8 @@ import org.eclipse.jst.common.project.facet.WtpUtils; import org.eclipse.jst.common.project.facet.core.ClasspathHelper; import org.eclipse.jst.j2ee.internal.J2EEConstants; +import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer; +import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainerUtils; import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties; import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties; import org.eclipse.wst.common.componentcore.ComponentCore; @@ -64,11 +66,15 @@ // ClasspathHelper.addClasspathEntries( project, fv, <something> ); } + if(J2EEComponentClasspathContainerUtils.getDefaultUseEARLibraries()){ + final IPath earLibContainer = new Path(J2EEComponentClasspathContainer.CONTAINER_ID); + addToClasspath(jproj, JavaCore.newContainerEntry(earLibContainer)); + } // // Add main class if necessary // if (model.getBooleanProperty(IAppClientFacetInstallDataModelProperties.CREATE_DEFAULT_MAIN_CLASS)) // addMainClass(monitor, model, project); - + try { ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null); } catch (ExecutionException e) {