Index: maps/gmf.map
===================================================================
RCS file: /home/technology/org.eclipse.gmf/contributions/ibm-gmf-runtime/source/com.ibm.xtools.gmf.releng/maps/gmf.map,v
retrieving revision 1.9
diff -u -r1.9 gmf.map
--- maps/gmf.map	25 Oct 2005 18:04:30 -0000	1.9
+++ maps/gmf.map	31 Oct 2005 17:26:27 -0000
@@ -54,28 +54,11 @@
 plugin@org.eclipse.gmf.runtime.emf.ui.properties=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.ui.properties
 plugin@org.eclipse.gmf.tests.runtime.emf.ui.properties=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.emf.ui.properties
 plugin@org.eclipse.gmf.tests.runtime.emf.ui=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.emf.ui
-plugin@org.eclipse.emf.ocl=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.ocl
-plugin@org.eclipse.emf.ocl.examples.interpreter=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.ocl.examples.interpreter
-plugin@org.eclipse.emf.query.examples.ocl=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.query.examples.ocl
-plugin@org.eclipse.emf.validation.examples.ocl=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation.examples.ocl
-plugin@org.eclipse.emf.ocl.tests=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.ocl.tests
-plugin@org.eclipse.emf.query=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.query
-plugin@org.eclipse.emf.query.examples.statements=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.query.examples.statements
-plugin@org.eclipse.emf.query.ocl=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.query.ocl
-plugin@org.eclipse.emf.query.ocl.tests=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.query.ocl.tests
-plugin@org.eclipse.emf.query.tests=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.query.tests
 plugin@org.eclipse.gmf.runtime.emf.type.core=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.type.core
 plugin@org.eclipse.gmf.tests.runtime.emf.type.core=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.emf.type.core
 plugin@org.eclipse.gmf.tests.runtime.emf.type.ui=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.emf.type.ui
 plugin@org.eclipse.gmf.runtime.emf.type.ui=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.type.ui
 plugin@org.eclipse.gmf.runtime.emf.ui.transfer.providers=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.ui.transfer.providers
-plugin@org.eclipse.emf.validation=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation
-plugin@org.eclipse.emf.validation.examples.adapter=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation.examples.adapter
-plugin@org.eclipse.emf.validation.examples=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation.examples
-plugin@org.eclipse.emf.validation.ocl=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation.ocl
-plugin@org.eclipse.emf.validation.tests=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation.tests
-plugin@org.eclipse.emf.validation.ui=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation.ui
-plugin@org.eclipse.emf.validation.ui.ide=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation.ui.ide
 plugin@org.eclipse.gmf.runtime.gef.ui=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.gef.ui
 plugin@org.eclipse.gmf.tests.runtime.gef.ui=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.gef.ui
 plugin@org.eclipse.gmf.runtime.doc.isv=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/doc/org.eclipse.gmf.runtime.doc.isv
@@ -83,3 +66,20 @@
 plugin@org.eclipse.gmf.runtime.notation=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation
 plugin@org.eclipse.gmf.runtime.notation.edit=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation.edit
 plugin@org.eclipse.gmf.runtime.notation.providers=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation.providers
+plugin@org.eclipse.emf.ocl=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/ocl/plugins/org.eclipse.emf.ocl
+plugin@org.eclipse.emf.ocl.examples.interpreter=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/ocl/examples/org.eclipse.emf.ocl.examples.interpreter
+plugin@org.eclipse.emf.ocl.tests=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/ocl/test/org.eclipse.emf.ocl.tests
+plugin@org.eclipse.emf.query=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/query/plugins/org.eclipse.emf.query
+plugin@org.eclipse.emf.query.ocl=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/query/plugins/org.eclipse.emf.query.ocl
+plugin@org.eclipse.emf.query.examples.ocl=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/query/examples/org.eclipse.emf.query.examples.ocl
+plugin@org.eclipse.emf.query.examples.statements=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/query/examples/org.eclipse.emf.query.examples.statements
+plugin@org.eclipse.emf.query.ocl.tests=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/query/test/org.eclipse.emf.query.ocl.tests
+plugin@org.eclipse.emf.query.tests=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/query/test/org.eclipse.emf.query.tests
+plugin@org.eclipse.emf.validation=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/validation/plugins/org.eclipse.emf.validation
+plugin@org.eclipse.emf.validation.ocl=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/validation/plugins/org.eclipse.emf.validation.ocl
+plugin@org.eclipse.emf.validation.ui=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/validation/plugins/org.eclipse.emf.validation.ui
+plugin@org.eclipse.emf.validation.ui.ide=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/validation/plugins/org.eclipse.emf.validation.ui.ide
+plugin@org.eclipse.emf.validation.examples.adapter=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/validation/examples/org.eclipse.emf.validation.examples.adapter
+plugin@org.eclipse.emf.validation.examples.ocl=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/validation/examples/org.eclipse.emf.validation.examples.ocl
+plugin@org.eclipse.emf.validation.examples=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/validation/examples/org.eclipse.emf.validation.examples
+plugin@org.eclipse.emf.validation.tests=HEAD,:pserver:dev.eclipse.org:/home/technology,,org.eclipse.emft/validation/test/org.eclipse.emf.validation.tests
Index: psf/gmf.psf
===================================================================
RCS file: /home/technology/org.eclipse.gmf/contributions/ibm-gmf-runtime/source/com.ibm.xtools.gmf.releng/psf/gmf.psf,v
retrieving revision 1.10
diff -u -r1.10 gmf.psf
--- psf/gmf.psf	25 Oct 2005 18:04:30 -0000	1.10
+++ psf/gmf.psf	31 Oct 2005 17:26:27 -0000
@@ -57,28 +57,11 @@
 		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.ui.properties,org.eclipse.gmf.runtime.emf.ui.properties"/>
 		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.emf.ui.properties,org.eclipse.gmf.tests.runtime.emf.ui.properties"/>
 		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.emf.ui,org.eclipse.gmf.tests.runtime.emf.ui"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.ocl,org.eclipse.emf.ocl"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.ocl.examples.interpreter,org.eclipse.emf.ocl.examples.interpreter"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.query.examples.ocl,org.eclipse.emf.query.examples.ocl"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation.examples.ocl,org.eclipse.emf.validation.examples.ocl"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.ocl.tests,org.eclipse.emf.ocl.tests"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.query,org.eclipse.emf.query"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.query.examples.statements,org.eclipse.emf.query.examples.statements"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.query.ocl,org.eclipse.emf.query.ocl"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.query.ocl.tests,org.eclipse.emf.query.ocl.tests"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.query.tests,org.eclipse.emf.query.tests"/>
 		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.type.core,org.eclipse.gmf.runtime.emf.type.core"/>
 		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.emf.type.core,org.eclipse.gmf.tests.runtime.emf.type.core"/>
 		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.emf.type.ui,org.eclipse.gmf.tests.runtime.emf.type.ui"/>
 		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.type.ui,org.eclipse.gmf.runtime.emf.type.ui"/>
 		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.ui.transfer.providers,org.eclipse.gmf.runtime.emf.ui.transfer.providers"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation,org.eclipse.emf.validation"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation.examples.adapter,org.eclipse.emf.validation.examples.adapter"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation.examples,org.eclipse.emf.validation.examples"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation.ocl,org.eclipse.emf.validation.ocl"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation.tests,org.eclipse.emf.validation.tests"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation.ui,org.eclipse.emf.validation.ui"/>
-		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/contributions/emft/org.eclipse.emf.validation.ui.ide,org.eclipse.emf.validation.ui.ide"/>
 		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.gef.ui,org.eclipse.gmf.runtime.gef.ui"/>
 		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.gef.ui,org.eclipse.gmf.tests.runtime.gef.ui"/>
 		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/doc/org.eclipse.gmf.runtime.doc.isv,org.eclipse.gmf.runtime.doc.isv"/>
@@ -86,5 +69,22 @@
 		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation,org.eclipse.gmf.runtime.notation"/>
 		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation.edit,org.eclipse.gmf.runtime.notation.edit"/>
 		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation.providers,org.eclipse.gmf.runtime.notation.providers"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/ocl/plugins/org.eclipse.emf.ocl,org.eclipse.emf.ocl"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/ocl/examples/org.eclipse.emf.ocl.examples.interpreter,org.eclipse.emf.ocl.examples.interpreter"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/ocl/test/org.eclipse.emf.ocl.tests,org.eclipse.emf.ocl.tests"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/query/plugins/org.eclipse.emf.query,org.eclipse.emf.query"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/query/plugins/org.eclipse.emf.query.ocl,org.eclipse.emf.query.ocl"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/query/examples/org.eclipse.emf.query.examples.ocl,org.eclipse.emf.query.examples.ocl"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/query/examples/org.eclipse.emf.query.examples.statements,org.eclipse.emf.query.examples.statements"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/query/test/org.eclipse.emf.query.ocl.tests,org.eclipse.emf.query.ocl.tests"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/query/test/org.eclipse.emf.query.tests,org.eclipse.emf.query.tests"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/validation/plugins/org.eclipse.emf.validation,org.eclipse.emf.validation"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/validation/plugins/org.eclipse.emf.validation.ocl,org.eclipse.emf.validation.ocl"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/validation/plugins/org.eclipse.emf.validation.ui,org.eclipse.emf.validation.ui"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/validation/plugins/org.eclipse.emf.validation.ui.ide,org.eclipse.emf.validation.ui.ide"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/validation/examples/org.eclipse.emf.validation.examples.adapter,org.eclipse.emf.validation.examples.adapter"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/validation/examples/org.eclipse.emf.validation.examples.ocl,org.eclipse.emf.validation.examples.ocl"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/validation/examples/org.eclipse.emf.validation.examples,org.eclipse.emf.validation.examples"/>
+		<project reference="1.0,:pserver:dev.eclipse.org:/home/technology,org.eclipse.emft/validation/test/org.eclipse.emf.validation.tests,org.eclipse.emf.validation.tests"/>
 	</provider>
 </psf>