Author: rob.stryker(a)jboss.com
Date: 2007-07-24 18:40:17 -0400 (Tue, 24 Jul 2007)
New Revision: 2641
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/WarArchiveType.java
Log:
Fixed JBIDE-568
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java 2007-07-24
17:43:33 UTC (rev 2640)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java 2007-07-24
22:40:17 UTC (rev 2641)
@@ -112,12 +112,6 @@
jar.setExploded(false);
}
jar.setName(packageName);
-
- IArchiveFileSet classes = ArchiveNodeFactory.createFileset();
- classes.setIncludesPattern("**/*");
- classes.setSourcePath(sourceContainer.getFullPath());
- classes.setInWorkspace(true);
- jar.addChild(classes);
return jar;
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/WarArchiveType.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/WarArchiveType.java 2007-07-24
17:43:33 UTC (rev 2640)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/WarArchiveType.java 2007-07-24
22:40:17 UTC (rev 2641)
@@ -167,9 +167,10 @@
// add lib folder so we can add libraries
IArchiveFolder webinf = addFolder(project, topLevel, WEBINF);
IArchiveFolder lib = addFolder(project, webinf, LIB);
-
+ IArchiveFolder classes = addFolder(project, webinf, CLASSES);
+
addFileset(project, topLevel, new
Path(project.getName()).append(WEBCONTENT).toOSString(), null);
-
+ addClassesFileset(project, classes);
// package each child and add to lib folder
IWebModule webModule = (IWebModule)mod.loadAdapter(IWebModule.class, monitor);