diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/BuildRecipeImpl.java b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/BuildRecipeImpl.java
index 6e3b8144f16b..ef35a8933bf1 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/BuildRecipeImpl.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/BuildRecipeImpl.java
@@ -64,7 +64,7 @@ public class BuildRecipeImpl implements BuildRecipe {
 
   public void addFileCopyInstruction(@NotNull File file,
                                      boolean isDirectory,
-                                     @NotNull Module module,
+                                     Module module,
                                      String outputRelativePath,
                                      @Nullable PackagingFileFilter fileFilter) {
     addInstruction(new FileCopyInstructionImpl(file, isDirectory, module, DeploymentUtil.trimForwardSlashes(outputRelativePath),fileFilter));
diff --git a/java/compiler/impl/src/com/intellij/openapi/deployment/DeploymentUtilImpl.java b/java/compiler/impl/src/com/intellij/openapi/deployment/DeploymentUtilImpl.java
index f1f813c9db8c..220d6510466d 100644
--- a/java/compiler/impl/src/com/intellij/openapi/deployment/DeploymentUtilImpl.java
+++ b/java/compiler/impl/src/com/intellij/openapi/deployment/DeploymentUtilImpl.java
@@ -238,7 +238,7 @@ public class DeploymentUtilImpl extends DeploymentUtil {
 
   public final boolean addItemsRecursively(@NotNull BuildRecipe items,
                                            @NotNull File root,
-                                           @NotNull Module module,
+                                           Module module,
                                            String outputRelativePath,
                                            @Nullable PackagingFileFilter fileFilter,
                                            @Nullable String possibleBaseOutputPath) {
@@ -513,12 +513,4 @@ public class DeploymentUtilImpl extends DeploymentUtil {
   public static BuildParticipantProvider<?>[] getBuildParticipantProviders() {
     return Extensions.getExtensions(BuildParticipantProvider.EXTENSION_POINT_NAME);
   }
-
-  public static BuildParticipant[] getAllBuildParticipants(@NotNull Module module) {
-    List<BuildParticipant> participants = new ArrayList<BuildParticipant>();
-    for (BuildParticipantProvider<?> participantProvider : getBuildParticipantProviders()) {
-      participants.addAll(participantProvider.getParticipants(module));
-    }
-    return participants.toArray(new BuildParticipant[participants.size()]);
-  }
 }
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java
index ab98c50e79fb..6cb85943dc13 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java
@@ -109,7 +109,7 @@ public class ArtifactUtil {
                                                                          final boolean processSubstitutions,
                                                                          ArtifactType artifactType,
                                                                          FList<CompositePackagingElement<?>> parents, Set<PackagingElement<?>> processed) {
-    if (!processed.add(element)) {
+    if (!processor.shouldProcess(element) || !processed.add(element)) {
       return true;
     }
     if (type == null || element.getType().equals(type)) {
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PackagingElementProcessor.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PackagingElementProcessor.java
index 96970f4aa264..a0e8c3b7aacc 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PackagingElementProcessor.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PackagingElementProcessor.java
@@ -13,11 +13,14 @@ import java.util.List;
  * @author nik
  */
 public abstract class PackagingElementProcessor<E extends PackagingElement<?>> {
-
   public boolean shouldProcessSubstitution(ComplexPackagingElement<?> element) {
     return true;
   }
 
+  public boolean shouldProcess(PackagingElement<?> element) {
+    return true;
+  }
+
   public abstract boolean process(@NotNull List<CompositePackagingElement<?>> parents, @NotNull E e);
 
   protected final String getPathFromRoot(List<CompositePackagingElement<?>> parents, String separator) {
diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/make/BuildRecipe.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/make/BuildRecipe.java
index 69a7081da089..b515f80691a0 100644
--- a/java/compiler/openapi/src/com/intellij/openapi/compiler/make/BuildRecipe.java
+++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/make/BuildRecipe.java
@@ -16,7 +16,6 @@
 package com.intellij.openapi.compiler.make;
 
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.vfs.VirtualFileFilter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -31,7 +30,7 @@ public interface BuildRecipe {
   void addAll(@NotNull BuildRecipe buildRecipe);
   void addFileCopyInstruction(@NotNull File file,
                               boolean isDirectory,
-                              @NotNull Module module,
+                              Module module,
                               String outputRelativePath,
                               @Nullable PackagingFileFilter fileFilter);
 }
\ No newline at end of file
diff --git a/java/compiler/openapi/src/com/intellij/openapi/deployment/DeploymentUtil.java b/java/compiler/openapi/src/com/intellij/openapi/deployment/DeploymentUtil.java
index 2ed9535d8ead..765896f06e32 100644
--- a/java/compiler/openapi/src/com/intellij/openapi/deployment/DeploymentUtil.java
+++ b/java/compiler/openapi/src/com/intellij/openapi/deployment/DeploymentUtil.java
@@ -66,7 +66,7 @@ public abstract class DeploymentUtil {
 
   public abstract boolean addItemsRecursively(@NotNull BuildRecipe items,
                                               @NotNull File root,
-                                              @NotNull Module module,
+                                              Module module,
                                               String outputRelativePath,
                                               @Nullable PackagingFileFilter fileFilter,
                                               @Nullable String possibleBaseOutputPath);