Author: rob.stryker(a)jboss.com Date: 2007-05-01 13:46:04 -0400 (Tue, 01 May 2007) New Revision: 1974 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/WebtoolsProjectJBossClasspathContainerInitializer.java Log: ejb.ui now depends on as.core. That should be the only dependency between as and ejb. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2007-05-01 17:46:01 UTC (rev 1973) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2007-05-01 17:46:04 UTC (rev 1974) @@ -18,8 +18,7 @@ org.eclipse.wst.common.project.facet.core, org.eclipse.jst.common.project.facet.core, org.eclipse.wst.xml.core, - org.jboss.ide.eclipse.archives.core, - org.jboss.ide.eclipse.ejb3.wizards.core + org.jboss.ide.eclipse.archives.core Eclipse-LazyStart: true Export-Package: org.jboss.ide.eclipse.as.core, org.jboss.ide.eclipse.as.core.model, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/WebtoolsProjectJBossClasspathContainerInitializer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/WebtoolsProjectJBossClasspathContainerInitializer.java 2007-05-01 17:46:01 UTC (rev 1973) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/WebtoolsProjectJBossClasspathContainerInitializer.java 2007-05-01 17:46:04 UTC (rev 1974) @@ -134,12 +134,12 @@ if( facetId.equals(JST_JAVA_FACET.getId())) { return loadJREClasspathEntries(jbsRuntime); } else if( jbVersion.equals("4.2")) { - return loadClasspathEntries42(runtimeId, facetId, facetVersion, serverHome, configName); + return loadClasspathEntries42(facetId, facetVersion, serverHome, configName); } else if( jbVersion.equals("4.0")) - return loadClasspathEntries40(runtimeId, facetId, facetVersion, serverHome, configName); + return loadClasspathEntries40(facetId, facetVersion, serverHome, configName); if( jbVersion.equals("3.2")) - return loadClasspathEntries32(runtimeId, facetId, facetVersion, serverHome, configName); - return loadClasspathEntriesDefault(runtimeId, facetId, facetVersion, serverHome, configName); + return loadClasspathEntries32( facetId, facetVersion, serverHome, configName); + return loadClasspathEntriesDefault(facetId, facetVersion, serverHome, configName); } protected boolean isEjb30(String facetId, String facetVersion) { @@ -164,7 +164,7 @@ return null; } - protected IClasspathEntry[] loadClasspathEntries42(String runtimeId, String facetId, String facetVersion, String serverHome, String configName) { + protected IClasspathEntry[] loadClasspathEntries42(String facetId, String facetVersion, String serverHome, String configName) { IPath homePath = new Path(serverHome); IPath configPath = homePath.append("server").append(configName); ArrayList list = new ArrayList(); @@ -199,7 +199,7 @@ return (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]); } - protected IClasspathEntry[] loadClasspathEntries40(String runtimeId, String facetId, String facetVersion, String serverHome, String configName) { + protected IClasspathEntry[] loadClasspathEntries40(String facetId, String facetVersion, String serverHome, String configName) { IPath homePath = new Path(serverHome); IPath configPath = homePath.append("server").append(configName); ArrayList list = new ArrayList(); @@ -235,7 +235,7 @@ } - protected IClasspathEntry[] loadClasspathEntries32(String runtimeId, String facetId, String facetVersion, String serverHome, String configName) { + protected IClasspathEntry[] loadClasspathEntries32(String facetId, String facetVersion, String serverHome, String configName) { IPath homePath = new Path(serverHome); IPath configPath = homePath.append("server").append(configName); ArrayList list = new ArrayList(); @@ -243,17 +243,24 @@ IPath p = configPath.append("deploy").append("jbossweb-tomcat50.sar"); list.add(getEntry(p.append("jsp-api.jar"))); list.add(getEntry(p.append("servlet-api.jar"))); - } else if( facetId.equals(EJB_FACET.getId()) || facetId.equals(EAR_FACET.getId()) ) { + } else if( (facetId.equals(EJB_FACET.getId()) && !isEjb30(facetId, facetVersion)) + || facetId.equals(EAR_FACET.getId()) ) { list.add(getEntry(homePath.append("client").append("jboss-j2ee.jar"))); } else if( facetId.equals(APP_CLIENT_FACET.getId())) { list.add(getEntry(homePath.append("client").append("jbossall-client.jar"))); } return (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]); } - protected IClasspathEntry[] loadClasspathEntriesDefault(String runtimeId, String facetId, String facetVersion, String serverHome, String configName) { + protected IClasspathEntry[] loadClasspathEntriesDefault(String facetId, String facetVersion, String serverHome, String configName) { return new IClasspathEntry[0]; } + protected IClasspathEntry[] pathsAsEntries(IPath[] paths) { + IClasspathEntry[] entries = new IClasspathEntry[paths.length]; + for( int i = 0; i < paths.length; i++ ) + entries[i] = getEntry(paths[i]); + return entries; + } }