Author: rob.stryker(a)jboss.com Date: 2009-03-05 02:43:57 -0500 (Thu, 05 Mar 2009) New Revision: 14014 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java Log: JBIDE-3902 - checking for binary module Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java 2009-03-05 07:43:38 UTC (rev 14013) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/EarArchiveType.java 2009-03-05 07:43:57 UTC (rev 14014) @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.jst.server.core.IEnterpriseApplication; +import org.eclipse.jst.server.core.IJ2EEModule; import org.eclipse.wst.server.core.IModule; import org.jboss.ide.eclipse.archives.core.model.ArchivesModelException; import org.jboss.ide.eclipse.archives.core.model.IArchive; @@ -93,16 +94,20 @@ IModule[] childModules = earModule.getModules(); for( int i = 0; i < childModules.length; i++ ) { IModule child = childModules[i]; - IArchiveType type = ModulePackageTypeConverter.getPackageTypeFor(child); - IArchive childPack; - if( type == null ) { - childPack = createGenericIArchive(child.getProject(), null, child.getProject().getName() + JAR_EXTENSION); - } else { - if( new Path(childModules[i].getName()).segmentCount() > 1 ) - continue; - childPack = type.createDefaultConfiguration(child.getProject().getName(), new NullProgressMonitor()); + IJ2EEModule j2eeChild = (IJ2EEModule)child.loadAdapter(IJ2EEModule.class, new NullProgressMonitor()); + if( j2eeChild != null && !j2eeChild.isBinary()) { + IArchiveType type = ModulePackageTypeConverter.getPackageTypeFor(child); + IArchive childPack; + if( type == null ) { + childPack = createGenericIArchive(child.getProject(), null, child.getProject().getName() + JAR_EXTENSION); + } else { + if( new Path(childModules[i].getName()).segmentCount() > 1 ) + continue; + childPack = type.createDefaultConfiguration(child.getProject().getName(), new NullProgressMonitor()); + } + if( childPack != null ) + topLevel.addChild(childPack); } - topLevel.addChild(childPack); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java 2009-03-05 07:43:38 UTC (rev 14013) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/archivetypes/WarArchiveType.java 2009-03-05 07:43:57 UTC (rev 14014) @@ -18,12 +18,14 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jst.server.core.IJ2EEModule; import org.eclipse.jst.server.core.IWebModule; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; @@ -217,7 +219,10 @@ IModule[] childModules = webModule.getModules(); for (int i = 0; i < childModules.length; i++) { IModule child = childModules[i]; - lib.addChild(createGenericIArchive(child.getProject(), null, child.getProject().getName() + ".jar"));//$NON-NLS-1$ + IJ2EEModule j2eeChild = (IJ2EEModule)child.loadAdapter(IJ2EEModule.class, new NullProgressMonitor()); + if( j2eeChild != null && !j2eeChild.isBinary()) { + lib.addChild(createGenericIArchive(child.getProject(), null, child.getProject().getName() + ".jar"));//$NON-NLS-1$ + } } return topLevel; } catch( Exception e ) {