fix for 126055 - ObjectClassDefination.getID now returns OID and not PID
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/DataParser.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/DataParser.java
index 53ba56d..3475244 100644
--- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/DataParser.java
+++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/DataParser.java
@@ -333,10 +333,10 @@
 				ObjectClassDefinitionImpl ocd = (ObjectClassDefinitionImpl) _dp_OCDs.get(designateHandler._ocdref);
 				if (ocd != null) {
 					if (designateHandler._factory_val == null) {
-						ocd.setID(designateHandler._pid_val);
+						ocd.setPID(designateHandler._pid_val);
 						ocd.setType(ObjectClassDefinitionImpl.PID);
 					} else {
-						ocd.setID(designateHandler._factory_val);
+						ocd.setPID(designateHandler._factory_val);
 						ocd.setType(ObjectClassDefinitionImpl.FPID);
 					}
 					_dp_OCDs_vector.addElement(ocd);
@@ -390,7 +390,7 @@
 				return;
 			}
 
-			_ocd = new ObjectClassDefinitionImpl(ocd_name_val, ocd_description_val, _dp_localization);
+			_ocd = new ObjectClassDefinitionImpl(ocd_name_val, ocd_description_val, _refID, _dp_localization);
 		}
 
 		public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeInformationImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeInformationImpl.java
index 02350a1..f83ae09 100644
--- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeInformationImpl.java
+++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/MetaTypeInformationImpl.java
@@ -50,7 +50,7 @@
 		Enumeration e = _allPidOCDs.elements();
 		while (e.hasMoreElements()) {
 			ObjectClassDefinitionImpl ocd = (ObjectClassDefinitionImpl) e.nextElement();
-			pids.addElement(ocd.getID());
+			pids.addElement(ocd.getPID());
 		}
 
 		String[] retvalue = new String[pids.size()];
@@ -73,7 +73,7 @@
 		Enumeration e = _allFPidOCDs.elements();
 		while (e.hasMoreElements()) {
 			ObjectClassDefinitionImpl ocd = (ObjectClassDefinitionImpl) e.nextElement();
-			fpids.addElement(ocd.getID());
+			fpids.addElement(ocd.getPID());
 		}
 
 		String[] retvalue = new String[fpids.size()];
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/ObjectClassDefinitionImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/ObjectClassDefinitionImpl.java
index 7e8b61e..0c66b3a 100644
--- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/ObjectClassDefinitionImpl.java
+++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/ObjectClassDefinitionImpl.java
@@ -31,6 +31,7 @@
 	String _name;
 	String _id;
 	String _description;
+    String _pid;
 	int _type;
 	Vector _required = new Vector(7);
 	Vector _optional = new Vector(7);
@@ -39,17 +40,18 @@
 	/*
 	 * Constructor of class ObjectClassDefinitionImpl.
 	 */
-	public ObjectClassDefinitionImpl(String name, String description, String localization) {
+	public ObjectClassDefinitionImpl(String name, String description, String id, String localization) {
 
 		this._name = name;
 		this._description = description;
+		this._id = id;
 		this._localization = localization;
 	}
 
 	/*
 	 * Constructor of class ObjectClassDefinitionImpl.
 	 */
-	public ObjectClassDefinitionImpl(String name, String id, String description, int type, String localization) {
+	public ObjectClassDefinitionImpl(String name, String description, String id, int type, String localization) {
 
 		this._name = name;
 		this._id = id;
@@ -63,7 +65,7 @@
 	 */
 	public synchronized Object clone() {
 
-		ObjectClassDefinitionImpl ocd = new ObjectClassDefinitionImpl(_name, _id, _description, _type, _localization);
+		ObjectClassDefinitionImpl ocd = new ObjectClassDefinitionImpl(_name, _description, _id, _type, _localization);
 		for (int i = 0; i < _required.size(); i++) {
 			AttributeDefinitionImpl ad = (AttributeDefinitionImpl) _required.elementAt(i);
 			ocd.addAttributeDefinition((AttributeDefinitionImpl) ad.clone(), true);
@@ -106,8 +108,12 @@
 	/*
 	 * Method to set the ID of ObjectClassDefinition.
 	 */
-	void setID(String id) {
-		this._id = id;
+	void setPID(String pid) {
+		this._pid = pid;
+	}
+	
+	String getPID() {
+		return _pid;	
 	}
 
 	/*