Index: META-INF/MANIFEST.MF
===================================================================
--- META-INF/MANIFEST.MF	(revision 517)
+++ META-INF/MANIFEST.MF	(revision 636)
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.eclipse.ajdt.ui; singleton:=true
 Bundle-Version: 1.6.3.20090122141228
 Bundle-Activator: org.eclipse.ajdt.ui.AspectJUIPlugin
-Bundle-Vendor: %providerName
+Bundle-Vendor: CROZ
 Bundle-Localization: plugin
 Export-Package: org.eclipse.ajdt.internal.builder;x-friends:="org.eclipse.ajdt.ui.tests,
  org.eclipse.ajdt.mylyn.ui",
Index: .project
===================================================================
--- .project	(revision 517)
+++ .project	(revision 636)
@@ -6,7 +6,7 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>org.eclipse.ajdt.core.ajbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -22,6 +22,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.ajdt.ui.ajnature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
Index: src/org/eclipse/ajdt/internal/core/exports/FeatureExportOperation.java
===================================================================
--- src/org/eclipse/ajdt/internal/core/exports/FeatureExportOperation.java	(revision 517)
+++ src/org/eclipse/ajdt/internal/core/exports/FeatureExportOperation.java	(revision 636)
@@ -357,8 +357,8 @@
 
 	private String[] getBuildExecutionTargets() {
 		if (fInfo.exportSource)
-			return new String[] {"build.jars", "build.sources"}; //$NON-NLS-1$ //$NON-NLS-2$ 
-		return new String[] {"build.jars"}; //$NON-NLS-1$ 
+			return new String[] {"build.jars", "build.sources"}; //$NON-NLS-1$ //$NON-NLS-2$
+		return new String[] {"build.jars"}; //$NON-NLS-1$
 	}
 
 	/**
@@ -363,7 +363,7 @@
 
 	/**
 	 * Execute the script at the given location.
-	 * 
+	 *
 	 * @param location the script to run
 	 * @param targets the targets in the script to run, use <code>null</code> to run all
 	 * @param properties map of user properties
@@ -447,7 +447,7 @@
 					fAntBuildProperties.put(id, BuildUtilities.getBootClasspath(id));
 			}
 			fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_FAIL_ON_ERROR, "false"); //$NON-NLS-1$
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_DEBUG_INFO, "on"); //$NON-NLS-1$ 
+			fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_DEBUG_INFO, "on"); //$NON-NLS-1$
 			fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_VERBOSE, "false"); //$NON-NLS-1$
 
 			Preferences pref = JavaCore.getPlugin().getPluginPreferences();
@@ -488,7 +488,7 @@
 	/**
 	* Adds the necessary properties to invoke the p2 metadata generator.  This method will
 	* be called when creating the ant build properties map.
-	* 
+	*
 	* @param map the map to add generator properties to
 	*/
 	protected void setP2MetaDataProperties(Map map) {
@@ -574,6 +574,11 @@
 		generator.setStateExtraData(TargetPlatformHelper.getBundleClasspaths(TargetPlatformHelper.getPDEState()), TargetPlatformHelper.getPatchMap(TargetPlatformHelper.getPDEState()));
 		AbstractScriptGenerator.setForceUpdateJar(false);
 		AbstractScriptGenerator.setEmbeddedSource(fInfo.exportSource);
+
+		// iloncar: allowbinarycycles
+		Properties properties = new Properties();
+		properties.put(IBuildPropertiesConstants.PROPERTY_ALLOW_BINARY_CYCLES, Boolean.toString(fInfo.allowBinaryCycles));
+		generator.setImmutableAntProperties(properties);
 	}
 
 	protected State getState(String os, String ws, String arch) {
@@ -590,7 +595,7 @@
 			Dictionary properties = dictionaries[i];
 			properties.put("osgi.os", os); //$NON-NLS-1$
 			properties.put("osgi.ws", ws); //$NON-NLS-1$
-			properties.put("osgi.arch", arch); //$NON-NLS-1$			
+			properties.put("osgi.arch", arch); //$NON-NLS-1$
 		}
 		fStateCopy.resolve(false);
 		return fStateCopy;
@@ -755,7 +760,7 @@
 					if (shouldAddPlugin(bundle, environment)) {
 						Element plugin = doc.createElement("plugin"); //$NON-NLS-1$
 						plugin.setAttribute("id", bundle.getSymbolicName()); //$NON-NLS-1$
-						plugin.setAttribute("version", bundle.getVersion().toString()); //$NON-NLS-1$ 
+						plugin.setAttribute("version", bundle.getVersion().toString()); //$NON-NLS-1$
 						setAdditionalAttributes(plugin, bundle);
 						root.appendChild(plugin);
 					}