Refactor this example to use org.eclipse.objectteams names (src and .project).

21 files changed, 56 insertions, 56 deletions

diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/.project b/othersrc/otdt-examples/OTSample-ordersystem-src/.project
index 76279e97e..a4389445e 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/.project
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/.project
@@ -6,13 +6,13 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.objectteams.otdt.builder.OTJBuilder</name>
+			<name>org.eclipse.objectteams.otdt.builder.OTJBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.objectteams.otdt.OTJavaNature</nature>
+		<nature>org.eclipse.objectteams.otdt.OTJavaNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/Intro0.html b/othersrc/otdt-examples/OTSample-ordersystem-src/Intro0.html
index f37851b6e..c372b7828 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/Intro0.html
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/Intro0.html
@@ -65,7 +65,7 @@ See the individual class comments for details.
 In order to see the full functionality enter the following information to the launch configuration:
 <table padding=3 border=1>
 <tr><td colspan=2><b>Tab <img src="images/class_public.gif"> Main</b>
-<tr><td>Main class<td><code>org.objectteams.samples.ordersystem.gui.GUITest</code>
+<tr><td>Main class<td><code>org.eclipse.objectteams.samples.ordersystem.gui.GUITest</code>
 <tr><td colspan=2><b>Tab <img src="images/team_obj.gif"> Team Activation</b>
 <tr><td>Add:	<td><code>ModelAdapterTeam</code><br />
 				    <code>ControllerAdapterTeam</code><br />
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/Main.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/Main.java
index 9db247fb6..ff80fd9b3 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/Main.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/Main.java
@@ -14,12 +14,12 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem;
+package org.eclipse.objectteams.samples.ordersystem;
 
-import org.objectteams.samples.ordersystem.data.*;
-import org.objectteams.samples.ordersystem.order.StockOrder;
-import org.objectteams.samples.ordersystem.reservation.StockReservations;
-import org.objectteams.samples.ordersystem.store.*;
+import org.eclipse.objectteams.samples.ordersystem.data.*;
+import org.eclipse.objectteams.samples.ordersystem.order.StockOrder;
+import org.eclipse.objectteams.samples.ordersystem.reservation.StockReservations;
+import org.eclipse.objectteams.samples.ordersystem.store.*;
 
 /**
  * Object Teams features demonstrated by this example:
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/data/Address.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/data/Address.java
index 5ee64712a..1e99bd803 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/data/Address.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/data/Address.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.data;
+package org.eclipse.objectteams.samples.ordersystem.data;
 
 /**
  * @author Dehla
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/data/Customer.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/data/Customer.java
index 2f3c0a7d3..a778e88f4 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/data/Customer.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/data/Customer.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.data;
+package org.eclipse.objectteams.samples.ordersystem.data;
 
 /**
  * @author Dehla
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/AbstractTableModelTemplate.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/AbstractTableModelTemplate.java
index 36e027949..9c9d12a43 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/AbstractTableModelTemplate.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/AbstractTableModelTemplate.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.gui;
+package org.eclipse.objectteams.samples.ordersystem.gui;
 
 import java.util.Vector;
 
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/ButtonListLayout.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/ButtonListLayout.java
index 3fc5492df..2c88d736b 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/ButtonListLayout.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/ButtonListLayout.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.gui;
+package org.eclipse.objectteams.samples.ordersystem.gui;
 
 import java.awt.Component;
 import java.awt.Container;
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/ControllerAdapterTeam.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/ControllerAdapterTeam.java
index c3b908486..b5e857de9 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/ControllerAdapterTeam.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/ControllerAdapterTeam.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.gui;
+package org.eclipse.objectteams.samples.ordersystem.gui;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -23,11 +23,11 @@ import java.util.Vector;
 import javax.swing.JButton;
 import javax.swing.JTable;
 
+import org.eclipse.objectteams.samples.ordersystem.data.Customer;
+import org.eclipse.objectteams.samples.ordersystem.order.StockOrder;
+import org.eclipse.objectteams.samples.ordersystem.store.StockItem;
+import org.eclipse.objectteams.samples.ordersystem.store.Storage;
 import org.objectteams.Team;
-import org.objectteams.samples.ordersystem.data.Customer;
-import org.objectteams.samples.ordersystem.order.StockOrder;
-import org.objectteams.samples.ordersystem.store.StockItem;
-import org.objectteams.samples.ordersystem.store.Storage;
 
 /**
  * @author Dehla Sokenou
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/GUIAdapterTeam.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/GUIAdapterTeam.java
index 50098d739..567033075 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/GUIAdapterTeam.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/GUIAdapterTeam.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.gui;
+package org.eclipse.objectteams.samples.ordersystem.gui;
 
 import java.awt.Container;
 import java.awt.Dimension;
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/GUITest.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/GUITest.java
index fade166fd..704a8e413 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/GUITest.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/GUITest.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.gui;
+package org.eclipse.objectteams.samples.ordersystem.gui;
 
 
 public class GUITest {
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/InputDialog.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/InputDialog.java
index 0287391ee..783203ad5 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/InputDialog.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/InputDialog.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.gui;
+package org.eclipse.objectteams.samples.ordersystem.gui;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -38,10 +38,10 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 
-import org.objectteams.samples.ordersystem.data.Address;
-import org.objectteams.samples.ordersystem.data.Customer;
-import org.objectteams.samples.ordersystem.order.StockOrder;
-import org.objectteams.samples.ordersystem.store.StockItem;
+import org.eclipse.objectteams.samples.ordersystem.data.Address;
+import org.eclipse.objectteams.samples.ordersystem.data.Customer;
+import org.eclipse.objectteams.samples.ordersystem.order.StockOrder;
+import org.eclipse.objectteams.samples.ordersystem.store.StockItem;
 
 
 
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/ModelAdapterTeam.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/ModelAdapterTeam.java
index 6a251d2de..069b7a2a8 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/ModelAdapterTeam.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/ModelAdapterTeam.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.gui;
+package org.eclipse.objectteams.samples.ordersystem.gui;
 
 import java.awt.Component;
 import java.util.HashMap;
@@ -28,15 +28,15 @@ import javax.swing.table.AbstractTableModel;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableColumn;
 
+import org.eclipse.objectteams.samples.ordersystem.data.Address;
+import org.eclipse.objectteams.samples.ordersystem.data.Customer;
+import org.eclipse.objectteams.samples.ordersystem.order.StockOrder;
+import org.eclipse.objectteams.samples.ordersystem.reservation.Reservations;
+import org.eclipse.objectteams.samples.ordersystem.store.StockItem;
 import org.objectteams.Team;
-import org.objectteams.samples.ordersystem.data.Address;
-import org.objectteams.samples.ordersystem.order.StockOrder;
-import org.objectteams.samples.ordersystem.reservation.Reservations;
-import org.objectteams.samples.ordersystem.store.StockItem;
 
-import org.objectteams.samples.ordersystem.data.Customer;
-import base org.objectteams.samples.ordersystem.reservation.StockReservations;
-import base org.objectteams.samples.ordersystem.store.Storage;
+import base org.eclipse.objectteams.samples.ordersystem.reservation.StockReservations;
+import base org.eclipse.objectteams.samples.ordersystem.store.Storage;
 
 
 
@@ -319,7 +319,7 @@ public team class ModelAdapterTeam {
                                    };
         
         /**
-         * @see org.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getColumnNames()
+         * @see org.eclipse.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getColumnNames()
          */
         protected String[] getColumnNames() {
             return columnNames;
@@ -346,7 +346,7 @@ public team class ModelAdapterTeam {
         }
         
         /**
-         * @see org.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getElements()
+         * @see org.eclipse.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getElements()
          */
         // Note: abstract method is implemented using callout binding:
         @SuppressWarnings("decapsulation")
@@ -376,14 +376,14 @@ public team class ModelAdapterTeam {
         protected Vector<Customer> elements = new Vector<Customer>();
         
         /**
-         * @see org.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getColumnNames()
+         * @see org.eclipse.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getColumnNames()
          */
         protected String[] getColumnNames() {
             return columnNames;
         }
 
         /**
-         * @see org.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getValueAt(int, int)
+         * @see org.eclipse.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getValueAt(int, int)
          */
         public Object getValueAt(int aRowIndex, int aColumnIndex) {
             Vector<Customer> tempElements = getElements();
@@ -408,7 +408,7 @@ public team class ModelAdapterTeam {
         }
         
         /**
-         * @see org.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getElements()
+         * @see org.eclipse.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getElements()
          */
         public Vector<Customer> getElements() {
             return elements;
@@ -474,21 +474,21 @@ public team class ModelAdapterTeam {
 		ReservationAdapter theInstance() -> StockReservations theInstance();		
         
         /**
-         * @see org.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getColumnNames()
+         * @see org.eclipse.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getColumnNames()
          */
         protected String[] getColumnNames() {
             return columnNames;
         }
 
         /**
-         * @see org.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getElements()
+         * @see org.eclipse.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getElements()
          */
         public Vector<StockItem> getElements() {
 			return getStorageAdapter().getElements();
         }
 
         /**
-         * @see org.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getValueAt(int, int)
+         * @see org.eclipse.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getValueAt(int, int)
          */
         public Object getValueAt(int aRowIndex, int aColumnIndex) {
             Vector<StockItem> tempElements = getElements();
@@ -536,21 +536,21 @@ public team class ModelAdapterTeam {
            };
         
         /**
-         * @see org.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getColumnNames()
+         * @see org.eclipse.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getColumnNames()
          */
         protected String[] getColumnNames() {
             return columnNames;
         }
         
         /**
-         * @see org.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getElements()
+         * @see org.eclipse.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getElements()
          */
         public Vector<StockOrder> getElements() {
             return elements;
         }
 
         /**
-         * @see org.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getValueAt(int, int)
+         * @see org.eclipse.objectteams.samples.ordersystem.gui.AbstractTableModelTemplate#getValueAt(int, int)
          */
         public Object getValueAt(int aRowIndex, int aColumnIndex) {
             return getElements().elementAt(aRowIndex).toString();
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/OrderSystemMainFrame.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/OrderSystemMainFrame.java
index 9e4a43664..2422420e1 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/OrderSystemMainFrame.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/OrderSystemMainFrame.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.gui;
+package org.eclipse.objectteams.samples.ordersystem.gui;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/Tab.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/Tab.java
index ee585a8a1..93605387b 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/gui/Tab.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/gui/Tab.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.gui;
+package org.eclipse.objectteams.samples.ordersystem.gui;
 
 /**
  * Enum representing actual foreground tab.
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/order/Order.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/order/Order.java
index ed02175db..a4482903a 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/order/Order.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/order/Order.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.order;
+package org.eclipse.objectteams.samples.ordersystem.order;
 
 import java.util.LinkedList;
 import java.util.Iterator;
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/order/StockOrder.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/order/StockOrder.java
index 96cb3c971..e7ec103dd 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/order/StockOrder.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/order/StockOrder.java
@@ -14,13 +14,13 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.order;
+package org.eclipse.objectteams.samples.ordersystem.order;
 
-import org.objectteams.samples.ordersystem.reservation.StockReservations;
+import org.eclipse.objectteams.samples.ordersystem.reservation.StockReservations;
 
-import base org.objectteams.samples.ordersystem.data.Customer;
-import base org.objectteams.samples.ordersystem.data.Address;
-import base org.objectteams.samples.ordersystem.store.StockItem;
+import base org.eclipse.objectteams.samples.ordersystem.data.Customer;
+import base org.eclipse.objectteams.samples.ordersystem.data.Address;
+import base org.eclipse.objectteams.samples.ordersystem.store.StockItem;
 
 /**
  * The team <code>StockOrder</code> is a specialization of the <code>Order</code>. 
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/reservation/Reservations.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/reservation/Reservations.java
index aaeb72117..63513e919 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/reservation/Reservations.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/reservation/Reservations.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.reservation;
+package org.eclipse.objectteams.samples.ordersystem.reservation;
 
 /**
  * This is a team implementation for a simple reservation system.
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/reservation/StockReservations.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/reservation/StockReservations.java
index 2f885abd7..a801daf08 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/reservation/StockReservations.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/reservation/StockReservations.java
@@ -14,9 +14,9 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.reservation;
+package org.eclipse.objectteams.samples.ordersystem.reservation;
 
-import base org.objectteams.samples.ordersystem.store.StockItem;
+import base org.eclipse.objectteams.samples.ordersystem.store.StockItem;
 
 /**
  * Team class <code>StockReservations</code> extends the abstract team class <code>Reservations</code>
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/store/StockItem.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/store/StockItem.java
index 59c8edb30..e25e868bf 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/store/StockItem.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/store/StockItem.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.store;
+package org.eclipse.objectteams.samples.ordersystem.store;
 
 /**
  * This is a simple implementation of a stock item. It contains the name of the item,
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/store/Storage.java b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/store/Storage.java
index e6066719e..521e87154 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/objectteams/samples/ordersystem/store/Storage.java
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/src/org/eclipse/objectteams/samples/ordersystem/store/Storage.java
@@ -14,7 +14,7 @@
  * Contributors:
  * 	  Technical University Berlin - Initial API and implementation
  **********************************************************************/
-package org.objectteams.samples.ordersystem.store;
+package org.eclipse.objectteams.samples.ordersystem.store;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/plugins/org.eclipse.objectteams.otdt.samples/samples/ordersystem.zip b/plugins/org.eclipse.objectteams.otdt.samples/samples/ordersystem.zip
index 53395162a..69974db73 100644
--- a/plugins/org.eclipse.objectteams.otdt.samples/samples/ordersystem.zip
+++ b/plugins/org.eclipse.objectteams.otdt.samples/samples/ordersystem.zip