Adjust aspectBindings to ecj-refactoring / plug-in split
diff --git a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/plugin.xml b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/plugin.xml
index be26593..88ddd51 100644
--- a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/plugin.xml
+++ b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/plugin.xml
@@ -18,9 +18,22 @@
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"
                superclass="org.eclipse.objectteams.otdt.internal.compiler.adaptor.CompilationThreadWatcher"/>
          <team
-               activation="NONE"
-               class="org.eclipse.objectteams.otdt.internal.compiler.adaptor.CompilationThreadWatcher"
-               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"/>
+               activation="ALL_THREADS"
+               class="org.eclipse.objectteams.otdt.internal.compiler.adaptor.CheckUniqueCallinCapture"
+               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
+         </team>
+      </aspectBinding>
+      <aspectBinding
+            icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/calloutbinding_obj.gif">
+         <basePlugin
+               icon="platform:/plugin/org.eclipse.pde.ui/icons/obj16/plugin_obj.png"
+               id="org.eclipse.jdt.core.compiler.batch">
+         </basePlugin>
+         <team
+               activation="ALL_THREADS"
+               class="org.eclipse.objectteams.otdt.internal.compiler.adaptor.AdaptorActivator"
+               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
+         </team>
          <team
                activation="NONE"
                class="org.eclipse.objectteams.otdt.internal.compiler.adaptor.BaseImportChecker"
@@ -28,23 +41,28 @@
                superclass="org.eclipse.objectteams.otdt.internal.compiler.adaptor.CompilationThreadWatcher"/>
          <team
                activation="NONE"
-               class="org.eclipse.objectteams.otdt.internal.compiler.adaptor.RoleReuseGuard"
+               class="org.eclipse.objectteams.otdt.internal.compiler.adaptor.BuildManager"
+               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"
+               superclass="org.eclipse.objectteams.otdt.internal.compiler.adaptor.CompilationThreadWatcher">
+         </team>
+         <team
+               activation="NONE"
+               class="org.eclipse.objectteams.otdt.internal.compiler.adaptor.CheckUniqueCallinCapture$Batch"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
          </team>
          <team
                activation="NONE"
+               class="org.eclipse.objectteams.otdt.internal.compiler.adaptor.CompilationThreadWatcher"
+               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"/>
+         <team
+               activation="NONE"
                class="org.eclipse.objectteams.otdt.internal.compiler.adaptor.PlainProjectWatcher"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"
                superclass="org.eclipse.objectteams.otdt.internal.compiler.adaptor.CompilationThreadWatcher">
          </team>
          <team
-               activation="ALL_THREADS"
-               class="org.eclipse.objectteams.otdt.internal.compiler.adaptor.CheckUniqueCallinCapture"
-               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
-         </team>
-         <team
                activation="NONE"
-               class="org.eclipse.objectteams.otdt.internal.compiler.adaptor.CheckUniqueCallinCapture$Batch"
+               class="org.eclipse.objectteams.otdt.internal.compiler.adaptor.RoleReuseGuard"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
          </team>
       </aspectBinding>
diff --git a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/src/org/eclipse/objectteams/otdt/internal/compiler/adaptor/BuildManager.java b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/src/org/eclipse/objectteams/otdt/internal/compiler/adaptor/BuildManager.java
index 3f00ba1..9b6dad6 100644
--- a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/src/org/eclipse/objectteams/otdt/internal/compiler/adaptor/BuildManager.java
+++ b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/src/org/eclipse/objectteams/otdt/internal/compiler/adaptor/BuildManager.java
@@ -53,6 +53,7 @@
  * This Team observes the build/compile process and advises the IncrementalImageBuilder, 
  * when and what to recompile due to OT-specific dependencies.
  * 
+ * @role ImageBuilder
  * @author stephan
  * @version $Id: BuildManager.java 23451 2010-02-04 20:33:32Z stephan $
  */