[154169] Added adapter factory for adapting SQLObjects to IPropertySource objects.  This is disabled pending a fix to the generated property source objects.
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/META-INF/MANIFEST.MF
index 34875a7..527ede0 100644
--- a/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.connectivity.sqm.server.ui; singleton:=true
-Bundle-Version: 0.9.0.200605101
+Bundle-Version: 0.9.1.200608161
 Bundle-ClassPath: rdb.server.ui.jar
 Bundle-Activator: org.eclipse.datatools.connectivity.sqm.server.internal.ui.ServerUIPlugin
 Bundle-Vendor: %providerName
@@ -31,13 +31,15 @@
  org.eclipse.core.resources,
  org.eclipse.ui.ide,
  org.eclipse.ui,
- org.eclipse.datatools.modelbase.sql,
+ org.eclipse.datatools.modelbase.edit,
  org.eclipse.datatools.connectivity.sqm.core,
  org.eclipse.datatools.connectivity.sqm.core.ui,
  org.eclipse.datatools.modelbase.dbdefinition,
  org.eclipse.datatools.connectivity,
  org.eclipse.datatools.connectivity.ui,
  org.eclipse.ui.navigator,
- com.ibm.icu
+ com.ibm.icu,
+ org.eclipse.ui.views,
+ org.eclipse.emf.edit.ui
 Eclipse-AutoStart: true
 
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/build.properties b/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/build.properties
index 02ccd08..dde4bae 100644
--- a/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/build.properties
+++ b/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/build.properties
@@ -20,7 +20,7 @@
 
 jars.extra.classpath =
 src.dir =		src/
-plugin.version =	0.9.0.200605101
+plugin.version =	0.9.1.200608161
 javadoc.dir =		doc/api/
 download.dir =		./download/
 javac.source =		1.4
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/plugin.xml b/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/plugin.xml
index d335713..0a47b5a 100644
--- a/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/plugin.xml
+++ b/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/plugin.xml
@@ -66,4 +66,12 @@
          </enablement>
       </actionProvider>
    </extension>
+   <extension
+         point="org.eclipse.core.runtime.adapters">
+      <factory
+            adaptableType="org.eclipse.datatools.modelbase.sql.schema.SQLObject"
+            class="org.eclipse.datatools.connectivity.sqm.server.internal.ui.SQLObjectAdapterFactory">
+         <adapter type="org.eclipse.ui.views.properties.IPropertySource"/>
+      </factory>
+   </extension>
 </plugin>
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/src/org/eclipse/datatools/connectivity/sqm/server/internal/ui/SQLObjectAdapterFactory.java b/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/src/org/eclipse/datatools/connectivity/sqm/server/internal/ui/SQLObjectAdapterFactory.java
new file mode 100644
index 0000000..671a6da
--- /dev/null
+++ b/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/src/org/eclipse/datatools/connectivity/sqm/server/internal/ui/SQLObjectAdapterFactory.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2006 Sybase, Inc.
+ *
+ * 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:
+ *    rcernich - initial API and implementation
+ *******************************************************************************/ 
+package org.eclipse.datatools.connectivity.sqm.server.internal.ui;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.datatools.modelbase.sql.accesscontrol.provider.SQLAccessControlItemProviderAdapterFactory;
+import org.eclipse.datatools.modelbase.sql.constraints.provider.SQLConstraintsItemProviderAdapterFactory;
+import org.eclipse.datatools.modelbase.sql.datatypes.provider.SQLDataTypesItemProviderAdapterFactory;
+import org.eclipse.datatools.modelbase.sql.expressions.provider.SQLExpressionsItemProviderAdapterFactory;
+import org.eclipse.datatools.modelbase.sql.routines.provider.SQLRoutinesItemProviderAdapterFactory;
+import org.eclipse.datatools.modelbase.sql.schema.provider.SQLSchemaItemProviderAdapterFactory;
+import org.eclipse.datatools.modelbase.sql.statements.provider.SQLStatementsItemProviderAdapterFactory;
+import org.eclipse.datatools.modelbase.sql.tables.provider.SQLTablesItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.ui.views.properties.IPropertySource;
+
+
+public class SQLObjectAdapterFactory implements IAdapterFactory {
+	
+	private static Class[] sAdapterList = new Class[] {IPropertySource.class};
+	private static AdapterFactoryContentProvider sAdapterFactory;
+
+	public Object getAdapter(Object adaptableObject, Class adapterType) {
+		// RJC: Replace once EMF generated property adapters have been corrected.
+		//return sAdapterFactory.getPropertySource(adaptableObject);
+		return null;
+	}
+
+	public Class[] getAdapterList() {
+		return sAdapterList;
+	}
+	
+	static {
+		ComposedAdapterFactory caf = new ComposedAdapterFactory();
+		caf.addAdapterFactory(new SQLSchemaItemProviderAdapterFactory());
+		caf.addAdapterFactory(new SQLTablesItemProviderAdapterFactory());
+		caf.addAdapterFactory(new SQLRoutinesItemProviderAdapterFactory());
+		caf.addAdapterFactory(new SQLDataTypesItemProviderAdapterFactory());
+		caf.addAdapterFactory(new SQLConstraintsItemProviderAdapterFactory());
+		caf.addAdapterFactory(new SQLAccessControlItemProviderAdapterFactory());
+		caf.addAdapterFactory(new SQLExpressionsItemProviderAdapterFactory());
+		caf.addAdapterFactory(new SQLStatementsItemProviderAdapterFactory());
+		sAdapterFactory = new AdapterFactoryContentProvider(caf);
+	}
+
+}