Bug 406518 - migrate OT/Equinox to the standard OSGi WeavingHook
- avoid source names ('.') of nested teams
diff --git a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/plugin.xml b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/plugin.xml
index 57c0d97..147a3f8 100644
--- a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/plugin.xml
+++ b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/plugin.xml
@@ -44,7 +44,7 @@
          </team>
          <team
                activation="NONE"
-               class="org.eclipse.objectteams.otdt.internal.compiler.adaptor.CheckUniqueCallinCapture.Batch"
+               class="org.eclipse.objectteams.otdt.internal.compiler.adaptor.CheckUniqueCallinCapture$Batch"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
          </team>
       </aspectBinding>
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.xml b/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.xml
index 0e46720..e5c93be 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.xml
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.xml
@@ -134,7 +134,7 @@
         </team>
         <team
               activation="NONE"
-              class="org.eclipse.objectteams.otdt.internal.ui.assist.CompletionAdaptor.CreateMethodMappingCompletionProposal"
+              class="org.eclipse.objectteams.otdt.internal.ui.assist.CompletionAdaptor$CreateMethodMappingCompletionProposal"
               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
         </team>
         <team
@@ -198,7 +198,7 @@
         </team>
         <team
               activation="NONE"
-              class="org.eclipse.objectteams.otdt.internal.ui.viewsupport.MarkerViewAdaptor.MarkersViewLifeCycle.MarkersView"
+              class="org.eclipse.objectteams.otdt.internal.ui.viewsupport.MarkerViewAdaptor$MarkersViewLifeCycle$MarkersView"
               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
         </team>
      </aspectBinding>
diff --git a/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.xml b/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.xml
index 6f75a3e..aae5a9e 100644
--- a/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.xml
+++ b/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.xml
@@ -15,7 +15,7 @@
          </team>
          <team
                activation="NONE"
-               class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.RenameAdaptor.OTNodeAdjustments"
+               class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.RenameAdaptor$OTNodeAdjustments"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
          </team>
          <team
@@ -45,7 +45,7 @@
          </team>
          <team
                activation="NONE"
-               class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.pullup.PullUpAdaptor.PullUpRefactoringProcessorRole"
+               class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.pullup.PullUpAdaptor$PullUpRefactoringProcessorRole"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
          </team>
          <team
@@ -85,7 +85,7 @@
          </team>
          <team
                activation="NONE"
-               class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.ExtractInterfaceAdaptor.Processor"
+               class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.ExtractInterfaceAdaptor$Processor"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
          </team>
          <team
@@ -95,7 +95,7 @@
          </team>
          <team
                activation="NONE"
-               class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.ReorgAdaptor.BaseImporting"
+               class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.ReorgAdaptor$BaseImporting"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
          </team>
       </aspectBinding>
@@ -107,12 +107,12 @@
          </basePlugin>
          <team
                activation="NONE"
-               class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.MoveAdaptor.MoveCU"
+               class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.MoveAdaptor$MoveCU"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
          </team>
          <team
                activation="NONE"
-               class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.pullup.PullUpAdaptor.Visibility"
+               class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.pullup.PullUpAdaptor$Visibility"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
          </team>
       </aspectBinding>
diff --git a/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
index 01c4170..9b40b0a 100644
--- a/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.samples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.objectteams.otdt.samples;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Activator: org.eclipse.objectteams.otdt.internal.samples.OTSamplesPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.objectteams.otdt.samples/plugin.xml b/plugins/org.eclipse.objectteams.otdt.samples/plugin.xml
index 564ccc2..0cabce0 100644
--- a/plugins/org.eclipse.objectteams.otdt.samples/plugin.xml
+++ b/plugins/org.eclipse.objectteams.otdt.samples/plugin.xml
@@ -167,7 +167,7 @@
          <team class="org.eclipse.objectteams.otdt.internal.samples.SamplesAdapter"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"
                activation="ALL_THREADS"/>
-         <team class="org.eclipse.objectteams.otdt.internal.samples.SamplesAdapter.SampleWizardAdapter"
+         <team class="org.eclipse.objectteams.otdt.internal.samples.SamplesAdapter$SampleWizardAdapter"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"
                activation="NONE"/>
       </aspectBinding>
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index 9fdcf1c..31bb222 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -36,7 +36,7 @@
 plugin@org.eclipse.objectteams.otdt.debug.adaptor,2.2.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.debug.adaptor,tag=builds/201305210612

 plugin@org.eclipse.objectteams.otdt.refactoring,2.3.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.refactoring

 plugin@org.eclipse.objectteams.otdt.pde.ui,2.2.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.pde.ui,tag=builds/201305210612

-plugin@org.eclipse.objectteams.otdt.samples,2.2.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.samples,tag=builds/201305210612

+plugin@org.eclipse.objectteams.otdt.samples,2.3.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.samples

 

 !** Consume BCEL from Orbit: **!

 plugin@org.apache.bcel,5.2.0=p2IU,id=org.apache.bcel,version=5.2.0.v201005080400,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository