Index: src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java
===================================================================
RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java,v
retrieving revision 1.62
diff -u -r1.62 IBuildPropertiesConstants.java
--- src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java	6 Dec 2010 18:17:59 -0000	1.62
+++ src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java	20 Apr 2011 23:58:13 -0000
@@ -7,6 +7,9 @@
  *
  * Contributors:
  *     IBM - Initial API and implementation
+ *     Compuware Corporation - Sebastien Angers <sebastien.angers@compuware.com> 
+ *     		- Enabled additional mirror slicingOptions in Headless PDE Build
+ *     		- https://bugs.eclipse.org/338878
  *******************************************************************************/
 package org.eclipse.pde.internal.build;
 
@@ -104,6 +107,14 @@
 	public static final String PROPERTY_P2_METADATA_REPO_NAME = "p2.metadata.repo.name"; //$NON-NLS-1$
 	public static final String PROPERTY_P2_ARTIFACT_REPO_NAME = "p2.artifact.repo.name"; //$NON-NLS-1$
 	public static final String PROPERTY_P2_GATHERING = "p2.gathering"; //$NON-NLS-1$
+	public static final String PROPERTY_P2_MIRROR_SLICING_FILTER = "p2.mirror.slicing.filter"; //$NON-NLS-1$
+	public static final String PROPERTY_P2_MIRROR_SLICING_FOLLOW_ONLY_FILTERED_REQS = "p2.mirror.slicing.followOnlyFilteredRequirements"; //$NON-NLS-1$
+	public static final String PROPERTY_P2_MIRROR_SLICING_FOLLOW_STRICT = "p2.mirror.slicing.followStrict"; //$NON-NLS-1$
+	public static final String PROPERTY_P2_MIRROR_SLICING_INCLUDE_FEATURES = "p2.mirror.slicing.includeFeatures"; //$NON-NLS-1$
+	public static final String PROPERTY_P2_MIRROR_SLICING_INCLUDE_NON_GREEDY = "p2.mirror.slicing.includeNonGreedy"; //$NON-NLS-1$
+	public static final String PROPERTY_P2_MIRROR_SLICING_INCLUDE_OPTIONAL = "p2.mirror.slicing.includeOptional"; //$NON-NLS-1$
+	public static final String PROPERTY_P2_MIRROR_SLICING_LATEST_VERSION_ONLY = "p2.mirror.slicing.latestVersionOnly"; //$NON-NLS-1$
+	public static final String PROPERTY_P2_MIRROR_SLICING_PLATFORM_FILTER = "p2.mirror.slicing.platformFilter"; //$NON-NLS-1$
 	public static final String PROPERTY_SKIP_MIRRORING = "skipMirroring"; //$NON-NLS-1$
 	public static final String PROPERTY_SKIP_DIRECTOR = "skipDirector"; //$NON-NLS-1$
 
Index: src/org/eclipse/pde/internal/build/P2ConfigScriptGenerator.java
===================================================================
RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/P2ConfigScriptGenerator.java,v
retrieving revision 1.30
diff -u -r1.30 P2ConfigScriptGenerator.java
--- src/org/eclipse/pde/internal/build/P2ConfigScriptGenerator.java	25 Aug 2010 15:59:30 -0000	1.30
+++ src/org/eclipse/pde/internal/build/P2ConfigScriptGenerator.java	20 Apr 2011 23:58:14 -0000
@@ -7,6 +7,9 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Compuware Corporation - Sebastien Angers <sebastien.angers@compuware.com> 
+ *     		- Enabled additional mirror slicingOptions in Headless PDE Build
+ *     		- https://bugs.eclipse.org/338878
  *******************************************************************************/
 
 package org.eclipse.pde.internal.build;
@@ -300,7 +303,40 @@
 		script.printStartTag("p2.mirror"); //$NON-NLS-1$
 		script.printTab();
 		script.print("\t<slicingOptions"); //$NON-NLS-1$
-		script.printAttribute("includeNonGreedy", FALSE, true); //$NON-NLS-1$
+
+		if (havePDEUIState()) {
+			// since the GUI does not provide ability to set slicingOptions, setting most common ones
+			script.printAttribute("includeNonGreedy", FALSE, true); //$NON-NLS-1$
+			script.printAttribute("includeOptional", FALSE, true); //$NON-NLS-1$
+		} else {
+			// headless PDE Build mode
+			// note that if a slicingOption has not been set in the build.properties,
+			// a default value will be set here
+			String filter = AbstractScriptGenerator.getImmutableAntProperty(PROPERTY_P2_MIRROR_SLICING_FILTER);
+			script.printAttribute("filter", filter != null ? Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_FILTER) : "", true); //$NON-NLS-1$
+
+			String followOnlyFilteredRequirements = AbstractScriptGenerator.getImmutableAntProperty(PROPERTY_P2_MIRROR_SLICING_FOLLOW_ONLY_FILTERED_REQS);
+			script.printAttribute("followOnlyFilteredRequirements", followOnlyFilteredRequirements != null ? Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_FOLLOW_ONLY_FILTERED_REQS) : "false", true); //$NON-NLS-1$
+
+			String followStrict = AbstractScriptGenerator.getImmutableAntProperty(PROPERTY_P2_MIRROR_SLICING_FOLLOW_STRICT);
+			script.printAttribute("followStrict", followStrict != null ? Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_FOLLOW_STRICT) : "false", true); //$NON-NLS-1$
+
+			String includeFeatures = AbstractScriptGenerator.getImmutableAntProperty(PROPERTY_P2_MIRROR_SLICING_INCLUDE_FEATURES);
+			script.printAttribute("includeFeatures", includeFeatures != null ? Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_INCLUDE_FEATURES) : "true", true); //$NON-NLS-1$
+
+			String includeNonGreedy = AbstractScriptGenerator.getImmutableAntProperty(PROPERTY_P2_MIRROR_SLICING_INCLUDE_NON_GREEDY);
+			script.printAttribute("includeNonGreedy", includeNonGreedy != null ? Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_INCLUDE_NON_GREEDY) : "false", true); //$NON-NLS-1$
+
+			String includeOptional = AbstractScriptGenerator.getImmutableAntProperty(PROPERTY_P2_MIRROR_SLICING_INCLUDE_OPTIONAL);
+			script.printAttribute("includeOptional", includeOptional != null ? Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_INCLUDE_OPTIONAL) : "false", true); //$NON-NLS-1$
+
+			String latestVersionOnly = AbstractScriptGenerator.getImmutableAntProperty(PROPERTY_P2_MIRROR_SLICING_LATEST_VERSION_ONLY);
+			script.printAttribute("latestVersionOnly", latestVersionOnly != null ? Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_LATEST_VERSION_ONLY) : "false", true); //$NON-NLS-1$
+
+			String platformFilter = AbstractScriptGenerator.getImmutableAntProperty(PROPERTY_P2_MIRROR_SLICING_PLATFORM_FILTER);
+			script.printAttribute("platformFilter", platformFilter != null ? Utils.getPropertyFormat(PROPERTY_P2_MIRROR_SLICING_PLATFORM_FILTER) : "", true); //$NON-NLS-1$			
+		}
+
 		script.println("/>"); //$NON-NLS-1$
 
 		script.printTab();
Index: src_ant/org/eclipse/pde/internal/build/tasks/BuildScriptGeneratorTask.java
===================================================================
RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/BuildScriptGeneratorTask.java,v
retrieving revision 1.58
diff -u -r1.58 BuildScriptGeneratorTask.java
--- src_ant/org/eclipse/pde/internal/build/tasks/BuildScriptGeneratorTask.java	7 Mar 2011 22:01:26 -0000	1.58
+++ src_ant/org/eclipse/pde/internal/build/tasks/BuildScriptGeneratorTask.java	20 Apr 2011 23:58:14 -0000
@@ -7,6 +7,9 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Compuware Corporation - Sebastien Angers <sebastien.angers@compuware.com> 
+ *     		- Enabled additional mirror slicingOptions in Headless PDE Build
+ *     		- https://bugs.eclipse.org/338878
  *******************************************************************************/
 package org.eclipse.pde.internal.build.tasks;
 
@@ -124,6 +127,38 @@
 		if (Boolean.valueOf(value).booleanValue())
 			properties.put(IBuildPropertiesConstants.PROPERTY_P2_GATHERING, "true"); //$NON-NLS-1$ 
 
+		value = getProject().getProperty(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_FILTER);
+		if (value != null)
+			properties.put(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_FILTER, value);
+
+		value = getProject().getProperty(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_FOLLOW_ONLY_FILTERED_REQS);
+		if (value != null)
+			properties.put(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_FOLLOW_ONLY_FILTERED_REQS, value);
+
+		value = getProject().getProperty(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_FOLLOW_STRICT);
+		if (value != null)
+			properties.put(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_FOLLOW_STRICT, value);
+
+		value = getProject().getProperty(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_INCLUDE_FEATURES);
+		if (value != null)
+			properties.put(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_INCLUDE_FEATURES, value);
+
+		value = getProject().getProperty(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_INCLUDE_NON_GREEDY);
+		if (value != null)
+			properties.put(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_INCLUDE_NON_GREEDY, value);
+
+		value = getProject().getProperty(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_INCLUDE_OPTIONAL);
+		if (value != null)
+			properties.put(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_INCLUDE_OPTIONAL, value);
+
+		value = getProject().getProperty(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_LATEST_VERSION_ONLY);
+		if (value != null)
+			properties.put(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_LATEST_VERSION_ONLY, value);
+
+		value = getProject().getProperty(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_PLATFORM_FILTER);
+		if (value != null)
+			properties.put(IBuildPropertiesConstants.PROPERTY_P2_MIRROR_SLICING_PLATFORM_FILTER, value);
+
 		value = getProject().getProperty(IBuildPropertiesConstants.PROPERTY_SUPPRESS_RESOLUTION_ERRORS);
 		if (Boolean.valueOf(value).booleanValue())
 			properties.put(IBuildPropertiesConstants.PROPERTY_SUPPRESS_RESOLUTION_ERRORS, "true"); //$NON-NLS-1$ 
Index: templates/headless-build/build.properties
===================================================================
RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/templates/headless-build/build.properties,v
retrieving revision 1.24
diff -u -r1.24 build.properties
--- templates/headless-build/build.properties	7 Mar 2011 22:01:25 -0000	1.24
+++ templates/headless-build/build.properties	20 Apr 2011 23:58:14 -0000
@@ -7,6 +7,9 @@
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
+#     Compuware Corporation - Sebastien Angers <sebastien.angers@compuware.com> 
+#     	- Enabled additional mirror slicingOptions in Headless PDE Build
+#     	- https://bugs.eclipse.org/338878
 ###############################################################################
 #####################
 # Parameters describing how and where to execute the build.
@@ -117,6 +120,20 @@
 #Control the creation of a file containing the version included in each configuration - on by default 
 #generateVersionsLists=false
 
+############ REPO MIRROR SLICING CONTROL ############
+
+# Default values for the slicingOptions of the p2.mirror Ant target used to generate the p2 repo (buildRepo)
+# Note that the default values set here are different from the default values for p2.mirror's slicingOptions
+# since they are specific to the PDE Build p2.mirror Ant target.
+p2.mirror.slicing.filter=
+p2.mirror.slicing.followOnlyFilteredRequirements=false
+p2.mirror.slicing.followStrict=false
+p2.mirror.slicing.includeFeatures=true
+p2.mirror.slicing.includeNonGreedy=false
+p2.mirror.slicing.includeOptional=false
+p2.mirror.slicing.platformFilter=
+p2.mirror.slicing.latestVersionOnly=false
+
 ############## SOURCE BUNDLE CONTROL ################
 # Set this property to have source bundles created and output into build repository.
 # This does NOT put them in the build output (e.g., product) itself.