diff --git a/plugins/org.eclipse.datatools.connectivity.oda/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.connectivity.oda/META-INF/MANIFEST.MF
index daef58e..f413d3c 100644
--- a/plugins/org.eclipse.datatools.connectivity.oda/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.connectivity.oda/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DTP Open Data Access
 Bundle-SymbolicName: org.eclipse.datatools.connectivity.oda; singleton:=true
-Bundle-Version: 3.0.0.200603141
+Bundle-Version: 3.0.0.200603161
 Bundle-ClassPath: oda.jar,
  odaconsumer-helper.jar
 Bundle-Vendor: Eclipse.org
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataSetType.java b/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataSetType.java
index 4f57b1d..0c47687 100644
--- a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataSetType.java
+++ b/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataSetType.java
@@ -1,13 +1,13 @@
 /*
  *************************************************************************
- * Copyright (c) 2004, 2005 Actuate Corporation.
+ * Copyright (c) 2004, 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *  Actuate Corporation  - initial API and implementation
+ *  Actuate Corporation - initial API and implementation
  *  
  *************************************************************************
  */
@@ -98,9 +98,9 @@
 	 * 			if there is no data type mapping for the native type code in 
 	 * 			the data set type.
 	 */
-	public DataTypeMapping getDataTypeMapping( short nativeDataTypeCode )
+	public DataTypeMapping getDataTypeMapping( int nativeDataTypeCode )
 	{
-		String typeCode = Short.toString( nativeDataTypeCode );
+		String typeCode = Integer.toString( nativeDataTypeCode );
 		return (DataTypeMapping) m_dataTypeMappings.get( typeCode );
 	}
 	
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataTypeMapping.java b/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataTypeMapping.java
index bd20ddb..9dbc992 100644
--- a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataTypeMapping.java
+++ b/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataTypeMapping.java
@@ -1,13 +1,13 @@
 /*
  *************************************************************************
- * Copyright (c) 2004, 2005 Actuate Corporation.
+ * Copyright (c) 2004, 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *  Actuate Corporation  - initial API and implementation
+ *  Actuate Corporation - initial API and implementation
  *  
  *************************************************************************
  */
@@ -26,7 +26,7 @@
  */
 public class DataTypeMapping
 {
-	private short m_nativeTypeCode;
+	private int m_nativeTypeCode;
 	private String m_nativeType;
 	private String m_odaScalarType;
 	private String[] m_alternativeDataTypes;
@@ -47,7 +47,7 @@
 		
 		try
 		{
-			m_nativeTypeCode = Short.parseShort( nativeDataTypeCode );
+			m_nativeTypeCode = Integer.parseInt( nativeDataTypeCode );
 		}
 		catch( NumberFormatException ex )
 		{
@@ -108,7 +108,7 @@
 	 * driver's ODA interface implementation.
 	 * @return	the native type code.
 	 */
-	public short getNativeTypeCode()
+	public int getNativeTypeCode()
 	{
 		return m_nativeTypeCode;
 	}