diff --git a/org.scala-ide.sdt.aspects/cuprovider.exsd b/org.scala-ide.sdt.aspects/cuprovider.exsd
index 31c76f8e13..04052fc5c2 100644
--- a/org.scala-ide.sdt.aspects/cuprovider.exsd
+++ b/org.scala-ide.sdt.aspects/cuprovider.exsd
@@ -1,6 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
 <schema targetNamespace="scala.tools.eclipse.contribution.weaving.jdt" xmlns="http://www.w3.org/2001/XMLSchema">
+
+<!--
+ Added to the Scala plugin to fix interoperability issues between the 
+ Spring IDE and the Scala IDE. This plugin now implements the cuprovider and
+ imagedescriptorselector extension points, previously provided by the 
+ JDT weaving plugin.
+
+ Repo: git://git.eclipse.org/gitroot/ajdt/org.eclipse.ajdt.git
+ File: src/org.eclipse.contribution.weaving.jdt/schema/cuprovider.exsd
+--> 
+
 <annotation>
       <appInfo>
          <meta.schema plugin="scala.tools.eclipse.contribution.weaving.jdt" id="cuprovider" name="Compilation Unit Provider"/>
diff --git a/org.scala-ide.sdt.aspects/imagedescriptorselector.exsd b/org.scala-ide.sdt.aspects/imagedescriptorselector.exsd
index 45cc54da78..ed79901e58 100644
--- a/org.scala-ide.sdt.aspects/imagedescriptorselector.exsd
+++ b/org.scala-ide.sdt.aspects/imagedescriptorselector.exsd
@@ -1,6 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
 <schema targetNamespace="scala.tools.eclipse.contribution.weaving.jdt" xmlns="http://www.w3.org/2001/XMLSchema">
+
+<!--
+ Added to the Scala plugin to fix interoperability issues between the 
+ Spring IDE and the Scala IDE. This plugin now implements the cuprovider and
+ imagedescriptorselector extension points, previously provided by the 
+ JDT weaving plugin.
+
+ Repo: git://git.eclipse.org/gitroot/ajdt/org.eclipse.ajdt.git
+ File: src/org.eclipse.contribution.weaving.jdt/schema/imagedescriptorselector.exsd
+--> 
+
 <annotation>
       <appinfo>
          <meta.schema plugin="scala.tools.eclipse.contribution.weaving.jdt" id="imagedescriptorselector" name="Image Descriptor Selector"/>
diff --git a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/configuration/IsWovenTester.aj b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/configuration/IsWovenTester.aj
index 1f0d503c08..99546c1cee 100644
--- a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/configuration/IsWovenTester.aj
+++ b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/configuration/IsWovenTester.aj
@@ -8,6 +8,9 @@ import org.eclipse.jdt.core.ToolFactory;
  * imagedescriptorselector extension points, previously provided by the 
  * JDT weaving plugin.
  * 
+ * Repo: git://git.eclipse.org/gitroot/ajdt/org.eclipse.ajdt.git
+ * File: src/org.eclipse.contribution.weaving.jdt/src/org/eclipse/contribution/jdt/IsWovenTester.aj
+ * 
  *******************************************************************************/
 
 
diff --git a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/configuration/WeavingStateConfigurer.java b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/configuration/WeavingStateConfigurer.java
index 933b3bf1e7..13dac56ef9 100644
--- a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/configuration/WeavingStateConfigurer.java
+++ b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/configuration/WeavingStateConfigurer.java
@@ -15,6 +15,9 @@
  * imagedescriptorselector extension points, previously provided by the 
  * JDT weaving plugin.
  * 
+ * Repo: git://git.eclipse.org/gitroot/ajdt/org.eclipse.ajdt.git
+ * File: src/org.eclipse.contribution.weaving.jdt/src/org/eclipse/contribution/jdt/preferences/WeavingStateConfigurer.java
+ * 
  *******************************************************************************/
 
 package scala.tools.eclipse.contribution.weaving.jdt.configuration;
diff --git a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/cuprovider/CompilationUnitProviderAspect.aj b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/cuprovider/CompilationUnitProviderAspect.aj
index cf9dc77fbb..7971b38bdd 100644
--- a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/cuprovider/CompilationUnitProviderAspect.aj
+++ b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/cuprovider/CompilationUnitProviderAspect.aj
@@ -17,6 +17,9 @@ package scala.tools.eclipse.contribution.weaving.jdt.cuprovider;
  * imagedescriptorselector extension points, previously provided by the 
  * JDT weaving plugin.
  * 
+ * Repo: git://git.eclipse.org/gitroot/ajdt/org.eclipse.ajdt.git
+ * File: src/org.eclipse.contribution.weaving.jdt/src/org/eclipse/contribution/jdt/cuprovider/CompilationUnitProviderAspect.aj
+ * 
  *******************************************************************************/
 
 
diff --git a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/cuprovider/CompilationUnitProviderRegistry.java b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/cuprovider/CompilationUnitProviderRegistry.java
index b0d9b78e97..c68b7b3fc7 100644
--- a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/cuprovider/CompilationUnitProviderRegistry.java
+++ b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/cuprovider/CompilationUnitProviderRegistry.java
@@ -17,6 +17,9 @@
  * imagedescriptorselector extension points, previously provided by the 
  * JDT weaving plugin.
  * 
+ * Repo: git://git.eclipse.org/gitroot/ajdt/org.eclipse.ajdt.git
+ * File: src/org.eclipse.contribution.weaving.jdt/src/org/eclipse/contribution/jdt/cuprovider/CompilationUnitProviderRegistry.java
+ * 
  *******************************************************************************/
 
 
diff --git a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/cuprovider/ICompilationUnitProvider.java b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/cuprovider/ICompilationUnitProvider.java
index f58df4f969..5d22a30913 100644
--- a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/cuprovider/ICompilationUnitProvider.java
+++ b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/cuprovider/ICompilationUnitProvider.java
@@ -17,6 +17,9 @@
  * imagedescriptorselector extension points, previously provided by the 
  * JDT weaving plugin.
  * 
+ * Repo: git://git.eclipse.org/gitroot/ajdt/org.eclipse.ajdt.git
+ * File: src/org.eclipse.contribution.weaving.jdt/src/org/eclipse/contribution/jdt/cuprovider/ICompilationUnitProvider.java
+ * 
  *******************************************************************************/
 
 
diff --git a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/imagedescriptor/IImageDescriptorSelector.java b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/imagedescriptor/IImageDescriptorSelector.java
index c6b826d313..f87f5863dc 100644
--- a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/imagedescriptor/IImageDescriptorSelector.java
+++ b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/imagedescriptor/IImageDescriptorSelector.java
@@ -17,6 +17,9 @@
  * imagedescriptorselector extension points, previously provided by the 
  * JDT weaving plugin.
  * 
+ * Repo: git://git.eclipse.org/gitroot/ajdt/org.eclipse.ajdt.git
+ * File: src/org.eclipse.contribution.weaving.jdt/src/org/eclipse/contribution/jdt/imagedescriptor/IImageDescriptorSelector.java
+ * 
  *******************************************************************************/
 
 
diff --git a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/imagedescriptor/ImageDescriptorSelectorAspect.aj b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/imagedescriptor/ImageDescriptorSelectorAspect.aj
index 56522296b3..dfa1a08059 100644
--- a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/imagedescriptor/ImageDescriptorSelectorAspect.aj
+++ b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/imagedescriptor/ImageDescriptorSelectorAspect.aj
@@ -17,6 +17,9 @@ package scala.tools.eclipse.contribution.weaving.jdt.imagedescriptor;
  * imagedescriptorselector extension points, previously provided by the 
  * JDT weaving plugin.
  * 
+ * Repo: git://git.eclipse.org/gitroot/ajdt/org.eclipse.ajdt.git
+ * File: src/org.eclipse.contribution.weaving.jdt/src/org/eclipse/contribution/jdt/imagedescriptor/ImageDescriptorSelectorAspect.aj
+ * 
  *******************************************************************************/
 
 
diff --git a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/imagedescriptor/ImageDescriptorSelectorRegistry.java b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/imagedescriptor/ImageDescriptorSelectorRegistry.java
index 9827f7f8c3..126b793391 100644
--- a/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/imagedescriptor/ImageDescriptorSelectorRegistry.java
+++ b/org.scala-ide.sdt.aspects/src/scala/tools/eclipse/contribution/weaving/jdt/imagedescriptor/ImageDescriptorSelectorRegistry.java
@@ -17,6 +17,9 @@
  * imagedescriptorselector extension points, previously provided by the 
  * JDT weaving plugin.
  * 
+ * Repo: git://git.eclipse.org/gitroot/ajdt/org.eclipse.ajdt.git
+ * File: src/org.eclipse.contribution.weaving.jdt/src/org/eclipse/contribution/jdt/imagedescriptor/ImageDescriptorSelectorRegistry.java
+ * 
  *******************************************************************************/
 
 import java.util.HashSet;