DB2 JDBC driver, DB2 feature added and DB2 plugin config fixed

contrib/drivers/plugins/com.ibm.db2.jdbc/.classpath

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="db2jcc4.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

contrib/drivers/plugins/com.ibm.db2.jdbc/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.ibm.db2.jdbc</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

contrib/drivers/plugins/com.ibm.db2.jdbc/.settings/org.eclipse.jdt.core.prefs

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

contrib/drivers/plugins/com.ibm.db2.jdbc/.settings/org.eclipse.pde.core.prefs

+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false

contrib/drivers/plugins/com.ibm.db2.jdbc/META-INF/MANIFEST.MF

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: DB2 JDBC Driver
+Bundle-SymbolicName: com.ibm.db2.jdbc;singleton:=true
+Bundle-Version: 4.16.53
+Bundle-ClassPath: db2jcc4.jar
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Vendor: IBM Corporation
+Export-Package: 
+ COM.ibm.db2.app,
+ COM.ibm.db2os390.sqlj.custom,
+ COM.ibm.db2os390.sqlj.jdbc,
+ com.ibm.db2.jcc,
+ com.ibm.db2.jcc.a,
+ com.ibm.db2.jcc.am,
+ com.ibm.db2.jcc.b,
+ com.ibm.db2.jcc.b.a,
+ com.ibm.db2.jcc.b.b,
+ com.ibm.db2.jcc.b.c,
+ com.ibm.db2.jcc.mx,
+ com.ibm.db2.jcc.mx.a,
+ com.ibm.db2.jcc.osgi,
+ com.ibm.db2.jcc.resources,
+ com.ibm.db2.jcc.sqlj,
+ com.ibm.db2.jcc.t2,
+ com.ibm.db2.jcc.t2zos,
+ com.ibm.db2.jcc.t4,
+ com.ibm.db2.jcc.uw,
+ com.ibm.db2.jcc.uw.a,
+ com.ibm.db2.jcc.uw.classloader,
+ sqlj.runtime,
+ sqlj.runtime.error,
+ sqlj.runtime.profile,
+ sqlj.runtime.profile.ref,
+ sqlj.runtime.profile.util,
+ sqlj.runtime.ref,
+ sqlj.runtime.util

contrib/drivers/plugins/com.ibm.db2.jdbc/build.properties

+source.. = src/
+output.. = bin/ 
+bin.includes = .,\
+               META-INF/,\
+               LICENSE.txt,\
+               db2jcc4.jar
+src.includes = META-INF/,\
+               LICENSE.txt,\
+               db2jcc4.jar,\
+               plugin.xml,\
+               build.properties

features/org.jkiss.dbeaver.ext.db2/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.jkiss.dbeaver.db2.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

features/org.jkiss.dbeaver.ext.db2/build.properties

+bin.includes = feature.xml,\
+               feature.properties

features/org.jkiss.dbeaver.ext.db2/feature.properties

+featureName=DBeaver DB2 Extension
+providerName=JKISS
+description=DBeaver DB2 Extension
+copyright=2013, Denis Forveille, Serge Rieder

features/org.jkiss.dbeaver.ext.db2/feature.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.jkiss.dbeaver.ext.db2"
+      label="%featureName"
+      version="1.0.0"
+      provider-name="%providerName"
+      plugin="org.jkiss.dbeaver.ext.db2">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.jkiss.dbeaver.core" version="1.0.0"/>
+   </requires>
+
+   <plugin
+         id="org.jkiss.dbeaver.ext.db2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.ibm.db2.jdbc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+</feature>

features/org.jkiss.dbeaver.standalone/feature.xml

@@ -22,13 +22,37 @@
       <update label="DBeaver Universal Database Manager" url="http://dbeaver.jkiss.org/"/>
    </url>
 
-    <includes id="org.jkiss.dbeaver.rcp" version="0.0.0"/>
-    <includes id="org.jkiss.dbeaver.core" version="0.0.0"/>
-    <includes id="org.jkiss.dbeaver.ext.generic" version="0.0.0"/>
-    <includes id="org.jkiss.dbeaver.ext.mysql" version="0.0.0"/>
-    <includes id="org.jkiss.dbeaver.ext.oracle" version="0.0.0"/>
-    <includes id="org.jkiss.dbeaver.ext.cassandra" version="0.0.0"/>
-    <includes id="org.jkiss.dbeaver.ext.wmi" version="0.0.0"/>
+   <includes
+         id="org.jkiss.dbeaver.rcp"
+         version="0.0.0"/>
+
+   <includes
+         id="org.jkiss.dbeaver.core"
+         version="0.0.0"/>
+
+   <includes
+         id="org.jkiss.dbeaver.ext.generic"
+         version="0.0.0"/>
+
+   <includes
+         id="org.jkiss.dbeaver.ext.mysql"
+         version="0.0.0"/>
+
+   <includes
+         id="org.jkiss.dbeaver.ext.oracle"
+         version="0.0.0"/>
+
+   <includes
+         id="org.jkiss.dbeaver.ext.cassandra"
+         version="0.0.0"/>
+
+   <includes
+         id="org.jkiss.dbeaver.ext.wmi"
+         version="0.0.0"/>
+
+   <includes
+         id="org.jkiss.dbeaver.ext.db2"
+         version="0.0.0"/>
 
    <requires>
       <import plugin="org.eclipse.core.runtime"/>

plugins/org.jkiss.dbeaver.db2/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DB2 Plug-in
 Bundle-SymbolicName: org.jkiss.dbeaver.ext.db2;singleton:=true
-Bundle-Version: 0.5.0
+Bundle-Version: 1.0.0
 Bundle-Activator: org.jkiss.dbeaver.ext.db2.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text,
  org.jkiss.dbeaver.core,
  org.eclipse.ui.workbench.texteditor,
- org.jkiss.dbeaver.resources.db2
+ com.ibm.db2.jdbc
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Denis Forveille

plugins/org.jkiss.dbeaver.db2/plugin.xml

@@ -203,7 +203,7 @@
                 </folder>
             </tree>
 
-            <drivers managable="true">
+            <drivers managable="false">
                 <driver
                     id="db2"
                     label="DB2"
@@ -213,18 +213,15 @@
                     webURL="http://www-01.ibm.com/support/docview.wss?uid=swg27016878"
                     description="DB2 JCC driver">
 
-					     <file type="jar" path="drivers/db2/db2jcc4.jar" url="*"/>
-                    <file type="license" path="drivers/db2/LICENSE.txt" url="*"/>
+                    <!--<replace provider="generic" driver="db2"/>-->
                     
                     <property name="fullyMaterializeLobData" value="true"/>
                     <property name="fullyMaterializeInputStreams" value="true"/>
                     <property name="progressiveStreaming" value="2"/>
                     <property name="retrieveMessagesFromServerOnGetMessage" value="true"/>
-                    
-                    <parameter name="query-get-active-db" value="SELECT CURRENT_SCHEMA FROM SYSIBM.SYSDUMMY1"/>
-                    <parameter name="query-set-active-db" value="SET SCHEMA ?"/>
                 </driver>
             </drivers>
+
             <views>
                 <view
                     id="org.jkiss.dbeaver.ext.db2.dataSourceWizardView"

plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/DB2Resources.properties

@@ -37,8 +37,6 @@ dialog_connection_advanced_tab_tooltip=Advanced/custom driver properties
 dialog_connection_basic_tab=Basic
 dialog_connection_connection_type_group=Connection Type
 dialog_connection_custom_tab=Custom
-dialog_connection_general_tab=General
-dialog_connection_general_tab_tooltip=General connection properties
 dialog_connection_host=Host
 dialog_connection_ora_home=Client
 dialog_connection_os_authentication=OS Authentication