Author: mculpepper(a)jboss.com Date: 2007-06-18 12:34:06 -0400 (Mon, 18 Jun 2007) New Revision: 2145 Modified: branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesBuildListener.java branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java Log: updates for WTP 2.0 / Eclipse 3.3 EXIN-288/EXIN-329 Modified: branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF =================================================================== --- branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2007-06-18 16:09:10 UTC (rev 2144) +++ branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2007-06-18 16:34:06 UTC (rev 2145) @@ -22,11 +22,13 @@ org.apache.ant Eclipse-LazyStart: true Export-Package: org.jboss.ide.eclipse.as.core, + org.jboss.ide.eclipse.as.core.client, org.jboss.ide.eclipse.as.core.model, org.jboss.ide.eclipse.as.core.packages, org.jboss.ide.eclipse.as.core.packages.types, org.jboss.ide.eclipse.as.core.publishers, org.jboss.ide.eclipse.as.core.runtime, + org.jboss.ide.eclipse.as.core.runtime.internal, org.jboss.ide.eclipse.as.core.runtime.server, org.jboss.ide.eclipse.as.core.runtime.server.polling, org.jboss.ide.eclipse.as.core.server, Modified: branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesBuildListener.java =================================================================== --- branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesBuildListener.java 2007-06-18 16:09:10 UTC (rev 2144) +++ branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesBuildListener.java 2007-06-18 16:34:06 UTC (rev 2145) @@ -99,7 +99,7 @@ } protected static IModule[] getModule(IArchive node) { ModuleFactory factory = ServerPlugin.findModuleFactory("org.jboss.ide.eclipse.as.core.PackageModuleFactory"); - IModule mod = factory.getModule(PackageModuleFactory.getID(node)); + IModule mod = factory.findModule(PackageModuleFactory.getID(node), new NullProgressMonitor()); return new IModule[] { mod }; } protected static PackagedModuleDelegate getModuleDelegate(IArchive node) { Modified: branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java =================================================================== --- branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java 2007-06-18 16:09:10 UTC (rev 2144) +++ branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java 2007-06-18 16:34:06 UTC (rev 2145) @@ -62,8 +62,11 @@ } protected IModule getModule(String projectName) { - IModuleArtifact moduleArtifact = ServerPlugin.loadModuleArtifact(getProject(projectName)); - return moduleArtifact == null ? null : moduleArtifact.getModule(); + IModuleArtifact moduleArtifacts[] = ServerPlugin.getModuleArtifacts(getProject(projectName)); + + if (moduleArtifacts != null && moduleArtifacts.length > 0) + return moduleArtifacts[0].getModule(); + else return null; } protected IProject getProject(String projectName) {