Skip to content

Commit

Permalink
- altibase, tibero 디비를 기본으로 데이터베이스로 사용할 수 있도록 수정.
Browse files Browse the repository at this point in the history
- altibase 드라이버를 기본으로탑재
- 데이터베이스 수정, 삭제 버튼을 명시적으로 추가.
  • Loading branch information
hangum committed Mar 3, 2020
1 parent 14cf158 commit f188746
Show file tree
Hide file tree
Showing 15 changed files with 104 additions and 10 deletions.
1 change: 1 addition & 0 deletions com.hangum.tadpole.application.start/bin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.class
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
<booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>
<stringAttribute key="pde.version" value="3.3"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="target_bundles" value="com.hangum.tadpole.ace.editor.core@default:default,com.hangum.tadpole.cipher.core@default:default,com.hangum.tadpole.cipher.old.core@default:default,com.hangum.tadpole.commons.admin.core@default:default,com.hangum.tadpole.db.dynamodb.core@default:default,com.hangum.tadpole.manager.core@default:default,com.hangum.tadpole.mongodb.core.ext@default:default,com.hangum.tadpole.rdb.core.ext@default:default,com.ibm.icu@default:default,com.tadpole.common.define.core@default:default,com.tadpolehub.db.ldap.core@default:default,javax.servlet@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.addons.chart@default:default,org.eclipse.rap.draw2d.compatibility@default:default,org.eclipse.rap.draw2d@default:default,org.eclipse.rap.filedialog@default:default,org.eclipse.rap.fileupload@default:default,org.eclipse.rap.gef@default:default,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.nebula.jface.gridviewer@default:default,org.eclipse.rap.nebula.widgets.grid@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt.testfixture@default:default,org.eclipse.rap.rwt@default:default,org.eclipse.rap.ui.views@default:default,org.eclipse.rap.ui.workbench@default:default,org.eclipse.rap.ui@default:default,org.hamcrest.core@default:default,org.junit@default:default"/>
<stringAttribute key="target_bundles" value="com.hangum.tadpole.ace.editor.core@default:default,com.hangum.tadpole.cipher.core@default:default,com.hangum.tadpole.cipher.old.core@default:default,com.hangum.tadpole.commons.admin.core@default:default,com.hangum.tadpole.db.dynamodb.core@default:default,com.hangum.tadpole.manager.core@default:default,com.hangum.tadpole.mongodb.core.ext@default:default,com.hangum.tadpole.rdb.core.ext@default:default,com.ibm.icu@default:default,com.tadpolehub.db.ldap.core@default:default,javax.servlet@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.addons.chart@default:default,org.eclipse.rap.draw2d.compatibility@default:default,org.eclipse.rap.draw2d@default:default,org.eclipse.rap.filedialog@default:default,org.eclipse.rap.fileupload@default:default,org.eclipse.rap.gef@default:default,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.nebula.jface.gridviewer@default:default,org.eclipse.rap.nebula.widgets.grid@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt.testfixture@default:default,org.eclipse.rap.rwt@default:default,org.eclipse.rap.ui.views@default:default,org.eclipse.rap.ui.workbench@default:default,org.eclipse.rap.ui@default:default,org.hamcrest.core@default:default,org.junit@default:default"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<stringAttribute key="workspace_bundles" value="com.hangum.tadpole.application.initialize.core@default:default,com.hangum.tadpole.application@default:default,com.hangum.tadpole.applicattion.start@default:default,com.hangum.tadpole.commons.csv.core@default:default,com.hangum.tadpole.commons.excel.core@default:default,com.hangum.tadpole.commons.libs@default:default,com.hangum.tadpole.commons.otp.core@default:default,com.hangum.tadpole.commons.otp.google.core@default:default,com.hangum.tadpole.commons.utils.zip@default:default,com.hangum.tadpole.commons.utils@default:default,com.hangum.tadpole.engine@default:default,com.hangum.tadpole.ext.appm.basic.core@default:default,com.hangum.tadpole.ext.appm.core@default:default,com.hangum.tadpole.help.core@default:default,com.hangum.tadpole.hive.core@default:default,com.hangum.tadpole.importexport.db@default:default,com.hangum.tadpole.login.basic.core@default:default,com.hangum.tadpole.login.core@default:default,com.hangum.tadpole.mongodb.core@default:default,com.hangum.tadpole.mongodb.erd.core@default:default,com.hangum.tadpole.mongodb.model@default:default,com.hangum.tadpole.monitoring.core@default:default,com.hangum.tadpole.preference@default:default,com.hangum.tadpole.rdb.core@default:default,com.hangum.tadpole.rdb.erd.core@default:default,com.hangum.tadpole.rdb.model@default:default,com.hangum.tadpole.sendgrid.core@default:default,com.hangum.tadpole.sql.format.core@default:default,com.hangum.tadpole.sql.parser@default:default,org.eclipse.rap.design.example@default:default"/>
<stringAttribute key="workspace_bundles" value="com.hangum.tadpole.application.initialize.core@default:default,com.hangum.tadpole.application@default:default,com.hangum.tadpole.applicattion.start@default:default,com.hangum.tadpole.commons.csv.core@default:default,com.hangum.tadpole.commons.excel.core@default:default,com.hangum.tadpole.commons.libs@default:default,com.hangum.tadpole.commons.otp.core@default:default,com.hangum.tadpole.commons.otp.google.core@default:default,com.hangum.tadpole.commons.utils.zip@default:default,com.hangum.tadpole.commons.utils@default:default,com.hangum.tadpole.engine@default:default,com.hangum.tadpole.ext.appm.basic.core@default:default,com.hangum.tadpole.ext.appm.core@default:default,com.hangum.tadpole.help.core@default:default,com.hangum.tadpole.hive.core@default:default,com.hangum.tadpole.importexport.db@default:default,com.hangum.tadpole.login.basic.core@default:default,com.hangum.tadpole.login.core@default:default,com.hangum.tadpole.mongodb.core@default:default,com.hangum.tadpole.mongodb.erd.core@default:default,com.hangum.tadpole.mongodb.model@default:default,com.hangum.tadpole.monitoring.core@default:default,com.hangum.tadpole.preference@default:default,com.hangum.tadpole.rdb.core@default:default,com.hangum.tadpole.rdb.erd.core@default:default,com.hangum.tadpole.rdb.model@default:default,com.hangum.tadpole.sendgrid.core@default:default,com.hangum.tadpole.sql.format.core@default:default,com.hangum.tadpole.sql.parser@default:default,com.tadpole.common.define.core@default:default,org.eclipse.rap.design.example@default:default"/>
</launchConfiguration>
5 changes: 5 additions & 0 deletions com.hangum.tadpole.engine/.classpath
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="libs/driver/altibase/Altibase.jar"/>
<classpathentry exported="true" kind="lib" path="libs/driver/altibase/Altibase6_5.jar"/>
<classpathentry exported="true" kind="lib" path="libs/driver/oracle/ojdbc6.jar"/>
<classpathentry exported="true" kind="lib" path="libs/driver/oracle/orai18n.jar"/>
<classpathentry exported="true" kind="lib" path="libs/driver/mssql/mssql-jdbc-7.2.2.jre8.jar"/>
<classpathentry exported="true" kind="lib" path="libs/driver/mysql/mysql-connector-java-5.1.46.jar"/>
<classpathentry exported="true" kind="lib" path="libs/driver/mariadb/mariadb-java-client-2.2.1.jar"/>
<classpathentry exported="true" kind="lib" path="libs/driver/pgsql/postgresql-9.4-1204.jdbc41.jar"/>
Expand Down
7 changes: 6 additions & 1 deletion com.hangum.tadpole.engine/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ Bundle-ClassPath: libs/ibatis-2.3.4.726-patched-tadpole.jar,
libs/dbutils/commons-dbutils-1.6.jar,
.,
libs/driver/mysql/mysql-connector-java-5.1.46.jar,
libs/driver/altibase/Altibase.jar,
libs/driver/altibase/Altibase6_5.jar,
libs/driver/cubrid/JDBC-9.3.0.0206-cubrid.jar,
libs/driver/sqlite/sqlite-jdbc-3.7.2.jar,
libs/apache/joda-time-2.3.jar,
Expand All @@ -37,7 +39,10 @@ Bundle-ClassPath: libs/ibatis-2.3.4.726-patched-tadpole.jar,
libs/driver/mongo/mongodb-driver-async-3.4.2.jar,
libs/driver/mongo/mongodb-driver-core-3.4.2.jar,
libs/driver/pgsql/postgresql-9.4-1204.jdbc41.jar,
libs/driver/mariadb/mariadb-java-client-2.2.1.jar
libs/driver/mariadb/mariadb-java-client-2.2.1.jar,
libs/driver/mssql/mssql-jdbc-7.2.2.jre8.jar,
libs/driver/oracle/ojdbc6.jar,
libs/driver/oracle/orai18n.jar
Export-Package:
com.hangum.tadpole.db.metadata,
com.hangum.tadpole.db.metadata.constants,
Expand Down
7 changes: 6 additions & 1 deletion com.hangum.tadpole.engine/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,9 @@ bin.includes = META-INF/,\
libs/driver/mongo/mongodb-driver-core-3.4.2.jar,\
libs/driver/pgsql/postgresql-9.4-1204.jdbc41.jar,\
libs/driver/mariadb/mariadb-java-client-2.2.1.jar,\
libs/driver/mysql/mysql-connector-java-5.1.46.jar
libs/driver/mysql/mysql-connector-java-5.1.46.jar,\
libs/driver/mssql/mssql-jdbc-7.2.2.jre8.jar,\
libs/driver/oracle/ojdbc6.jar,\
libs/driver/oracle/orai18n.jar,\
libs/driver/altibase/Altibase.jar,\
libs/driver/altibase/Altibase6_5.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public class AdminPreferenceDefine {
* Define Tadpole Support DB
*/
public static final String TADPOLE_SUPPORT_DB = _PREFIX + "TADPOLE_SUPPORT_DB";
public static final String TADPOLE_SUPPORT_DB_VALUE = "MariaDB,MongoDB,MSSQL,MySQL,Oracle,PostgreSQL,Tibero,Elasticsearch";
public static final String TADPOLE_SUPPORT_DB_VALUE = "MariaDB,MongoDB,MSSQL,MySQL,Oracle,PostgreSQL,Tibero,Elasticsearch,Altibase";

/**
* 디비연결시 사용자에게 묻기.
Expand Down
28 changes: 26 additions & 2 deletions com.hangum.tadpole.rdb.core/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,33 @@
id="com.hangum.tadpole.rdb.core.objectContribution.connection"
objectClass="com.hangum.tadpole.engine.query.dao.system.UserDBDAO">
<action
class="com.hangum.tadpole.rdb.core.actions.connections.DisconnectDBAction"
icon="resources/icons/delete_database.png"
class="com.hangum.tadpole.rdb.core.actions.connections.DeleteDBAction"
icon="resources/icons/delete-database.png"
id="com.hangum.tadpole.rdb.core.action2"
label="데이터베이스 연결 삭제"
menubarPath="menu.admin/groupAdminSeparator2">
<enablement>
<objectClass
name="com.hangum.tadpole.engine.query.dao.system.UserDBDAO">
</objectClass>
</enablement>
</action>
<action
class="com.hangum.tadpole.rdb.core.actions.connections.ModifyDBConnectionInfoAction"
icon="resources/icons/modify_database.png"
id="com.hangum.tadpole.rdb.core.action1"
label="데이터베이스 연결 수정"
menubarPath="menu.admin/groupAdminSeparator2">
<enablement>
<objectClass
name="com.hangum.tadpole.engine.query.dao.system.UserDBDAO">
</objectClass>
</enablement>
</action>
<action
class="com.hangum.tadpole.rdb.core.actions.connections.DisconnectDBAction"
icon="resources/icons/session_delete_database.png"
id="com.hangum.tadpole.rdb.core.action.sessionDisconnect"
label="%action.label.23"
menubarPath="menu.admin/groupAdminSeparator2">
<enablement>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/*******************************************************************************
* Copyright (c) 2020 hangum.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Lesser Public License v2.1
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*
* Contributors:
* hangum - initial API and implementation
******************************************************************************/
package com.hangum.tadpole.rdb.core.actions.connections;

import org.apache.log4j.Logger;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart;

import com.hangum.tadpole.engine.query.dao.system.UserDBDAO;
import com.hangum.tadpole.rdb.core.dialog.dbconnect.ModifyDBDialog;

/**
* 데이터베이스 연결 수정 액션
*
* @author hangum
*/
public class ModifyDBConnectionInfoAction implements IViewActionDelegate {
private static final Logger logger = Logger.getLogger(ModifyDBConnectionInfoAction.class);

private IStructuredSelection sel;

public ModifyDBConnectionInfoAction() {
super();
}

@Override
public void run(IAction action) {
final UserDBDAO userDB = (UserDBDAO)sel.getFirstElement();

ModifyDBDialog dialog = new ModifyDBDialog(null, userDB);
dialog.open();
}

@Override
public void selectionChanged(IAction action, ISelection selection) {
sel = (IStructuredSelection)selection;
}

@Override
public void init(IViewPart view) {
}

}
1 change: 1 addition & 0 deletions com.hangum.tadpole.rdb.erd.core/bin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.class
5 changes: 2 additions & 3 deletions targetProject/AllInOne.target
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="AllInOne" sequenceNumber="9">
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="AllInOne" sequenceNumber="9">
<locations>
<location path="${project_loc:/targetProject}/ext" type="Directory"/>
<location path="${project_loc:/targetProject}/AllInOnev2.0.0" type="Directory"/>
</locations>
</target>
</target>

0 comments on commit f188746

Please sign in to comment.