diff options
3 files changed, 11 insertions, 4 deletions
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java index ff12d458d..684762434 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java @@ -31,6 +31,7 @@ import org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyEnablement; import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities; import org.eclipse.wst.common.componentcore.internal.ComponentResource; import org.eclipse.wst.common.componentcore.internal.flat.FilterResourceParticipant; +import org.eclipse.wst.common.componentcore.internal.flat.GlobalHeirarchyParticipant; import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipant; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; @@ -261,7 +262,7 @@ public class JavaEESingleRootCallback implements SingleRootParticipantCallback { public IFlattenParticipant[] getDelegateParticipants() { List<IFlattenParticipant> participants = new ArrayList<IFlattenParticipant>(); - participants.add(new JEEHeirarchyExportParticipant()); + participants.add(new GlobalHeirarchyParticipant()); participants.add(FilterResourceParticipant.createSuffixFilterParticipant(filteredSuffixes)); participants.add(new AddClasspathLibReferencesParticipant()); participants.add(new AddClasspathLibRefsProviderParticipant()); diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JEEFlattenParticipantProvider.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JEEFlattenParticipantProvider.java index 2925e5c21..ee78a9827 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JEEFlattenParticipantProvider.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JEEFlattenParticipantProvider.java @@ -20,12 +20,12 @@ import org.eclipse.jst.common.internal.modulecore.IgnoreJavaInSourceFolderPartic import org.eclipse.jst.common.internal.modulecore.ReplaceManifestExportParticipant; import org.eclipse.jst.common.internal.modulecore.SingleRootExportParticipant; import org.eclipse.jst.j2ee.internal.J2EEConstants; -import org.eclipse.jst.j2ee.internal.common.exportmodel.JEEHeirarchyExportParticipant; import org.eclipse.jst.j2ee.internal.common.exportmodel.JavaEESingleRootCallback; import org.eclipse.wst.common.componentcore.internal.flat.AbstractFlattenParticipant; +import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel; +import org.eclipse.wst.common.componentcore.internal.flat.GlobalHeirarchyParticipant; import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipant; import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipantProvider; -import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualReference; @@ -59,7 +59,7 @@ public class JEEFlattenParticipantProvider implements if( JEESingleRootParticipant.equals(id)) return forExport ? null : new SingleRootExportParticipant(new JavaEESingleRootCallback()); if( JEEHeirarchyExportParticipant.equals(id)) - return forExport ? createExportHierarchyParticipant() : new JEEHeirarchyExportParticipant(); + return forExport ? createExportHierarchyParticipant() : new GlobalHeirarchyParticipant(); if( AddClasspathLibReferencesParticipant.equals(id)) return new AddClasspathLibReferencesParticipant(); if( AddClasspathFoldersParticipant.equals(id)) diff --git a/plugins/org.eclipse.jst.j2ee/plugin.xml b/plugins/org.eclipse.jst.j2ee/plugin.xml index 0c0ea1c6b..25f0fb61b 100644 --- a/plugins/org.eclipse.jst.j2ee/plugin.xml +++ b/plugins/org.eclipse.jst.j2ee/plugin.xml @@ -1023,4 +1023,10 @@ weight="10"> </flattenParticipantProvider> </extension> + <extension + point="org.eclipse.wst.common.modulecore.heirarchyFlattenParticipant"> + <heirarchyParticipant + class="org.eclipse.jst.j2ee.internal.common.exportmodel.JEEHeirarchyExportParticipant"> + </heirarchyParticipant> + </extension> </plugin> |