Merge pull request #2655 from serge-rider/2556-postgres-debug-repackage

2556 postgres debug repackage

bundles/org.jkiss.dbeaver.postgresql.debug.ui/.project → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/.project

 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.jkiss.dbeaver.postgresql.debug.ui</name>
+	<name>org.jkiss.dbeaver.ext.postgresql.debug.core</name>
 	<comment></comment>
 	<projects>
 	</projects>

bundles/org.jkiss.dbeaver.postgresql.debug.core/META-INF/MANIFEST.MF → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF

 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.jkiss.dbeaver.postgresql.debug.core;singleton:=true
+Bundle-SymbolicName: org.jkiss.dbeaver.ext.postgresql.debug.core;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.debug.core,
  org.jkiss.dbeaver.ext.postgresql
-Export-Package: org.jkiss.dbeaver.postgresql.debug.core
+Export-Package: org.jkiss.dbeaver.ext.postgresql.debug.core

bundles/org.jkiss.dbeaver.postgresql.debug.core/OSGI-INF/l10n/bundle.properties → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/OSGI-INF/l10n/bundle.properties

-#Properties file for org.jkiss.dbeaver.postgresql.debug.core
+#Properties file for org.jkiss.dbeaver.ext.postgresql.debug.core
 
 # DBeaver - Universal Database Manager
 # Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)

bundles/org.jkiss.dbeaver.postgresql.debug.core/plugin.xml → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/plugin.xml

@@ -22,10 +22,10 @@
    <extension
          point="org.eclipse.debug.core.launchConfigurationTypes">
       <launchConfigurationType
-            delegate="org.jkiss.dbeaver.postgresql.internal.debug.core.model.PgSqlLaunchDelegate"
+            delegate="org.jkiss.dbeaver.ext.postgresql.internal.debug.core.model.PgSqlLaunchDelegate"
             delegateDescription="%launchConfigurationTypes.launchConfigurationType.pgSQL.delegateDescription"
             delegateName="%launchConfigurationTypes.launchConfigurationType.pgSQL.delegateName"
-            id="org.jkiss.dbeaver.postgresql.debug.core.pgSQL"
+            id="org.jkiss.dbeaver.ext.postgresql.debug.core.pgSQL"
             modes="debug"
             name="%launchConfigurationTypes.launchConfigurationType.pgSQL.name">
       </launchConfigurationType>

bundles/org.jkiss.dbeaver.postgresql.debug.ui/pom.xml → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/pom.xml

@@ -8,7 +8,7 @@
     <version>1.0.0</version>
     <relativePath>../../</relativePath>
   </parent>
-  <artifactId>org.jkiss.dbeaver.postgresql.debug.ui</artifactId>
+  <artifactId>org.jkiss.dbeaver.ext.postgresql.debug.core</artifactId>
   <version>1.0.0</version>
   <packaging>eclipse-plugin</packaging>
 </project>

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/debug/core/PostgreSqlDebugCore.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/core/PostgreSqlDebugCore.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.debug.core;
+package org.jkiss.dbeaver.ext.postgresql.debug.core;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.runtime.CoreException;
@@ -27,17 +27,17 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.osgi.util.NLS;
 import org.jkiss.dbeaver.debug.core.DebugCore;
+import org.jkiss.dbeaver.ext.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
 import org.jkiss.dbeaver.ext.postgresql.model.PostgreDataSource;
 import org.jkiss.dbeaver.ext.postgresql.model.PostgreDatabase;
 import org.jkiss.dbeaver.ext.postgresql.model.PostgreProcedure;
 import org.jkiss.dbeaver.ext.postgresql.model.PostgreSchema;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.struct.DBSObject;
-import org.jkiss.dbeaver.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
 
 public class PostgreSqlDebugCore {
     
-    public static final String BUNDLE_SYMBOLIC_NAME = "org.jkiss.dbeaver.postgresql.debug.core"; //$NON-NLS-1$
+    public static final String BUNDLE_SYMBOLIC_NAME = "org.jkiss.dbeaver.ext.postgresql.debug.core"; //$NON-NLS-1$
     
     public static final String MODEL_IDENTIFIER = BUNDLE_SYMBOLIC_NAME;
 

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/PostgreSqlDebugCoreMessages.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/PostgreSqlDebugCoreMessages.java

@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.core;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.core;
 
 import org.eclipse.osgi.util.NLS;
 
 public class PostgreSqlDebugCoreMessages extends NLS {
-    private static final String BUNDLE_NAME = "org.jkiss.dbeaver.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.jkiss.dbeaver.ext.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages"; //$NON-NLS-1$
     public static String PgSqlDebugController_connection_application_name;
     public static String PgSqlDebugController_e_failed_session_close;
     public static String PgSqlDebugController_e_failed_session_open;

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlDebugController.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlDebugController.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.core.model;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.core.model;
 
 import java.sql.SQLException;
 import java.util.Map;
@@ -23,6 +23,7 @@ import java.util.Map;
 import org.eclipse.osgi.util.NLS;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.debug.core.model.DatabaseDebugController;
+import org.jkiss.dbeaver.ext.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
 import org.jkiss.dbeaver.model.exec.DBCException;
 import org.jkiss.dbeaver.model.exec.DBCResultSet;
 import org.jkiss.dbeaver.model.exec.DBCSession;
@@ -30,7 +31,6 @@ import org.jkiss.dbeaver.model.exec.DBCStatementType;
 import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement;
 import org.jkiss.dbeaver.model.exec.jdbc.JDBCSession;
 import org.jkiss.dbeaver.model.exec.jdbc.JDBCStatement;
-import org.jkiss.dbeaver.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
 
 public class PgSqlDebugController extends DatabaseDebugController {
     

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlDebugTarget.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlDebugTarget.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.core.model;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.core.model;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunch;
@@ -23,8 +23,8 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.model.IProcess;
 import org.jkiss.dbeaver.debug.core.model.DatabaseDebugTarget;
 import org.jkiss.dbeaver.debug.core.model.DatabaseThread;
-import org.jkiss.dbeaver.postgresql.debug.core.PostgreSqlDebugCore;
-import org.jkiss.dbeaver.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
+import org.jkiss.dbeaver.ext.postgresql.debug.core.PostgreSqlDebugCore;
+import org.jkiss.dbeaver.ext.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
 
 public class PgSqlDebugTarget extends DatabaseDebugTarget<PgSqlDebugController> {
     

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlLaunchDelegate.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlLaunchDelegate.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.core.model;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.core.model;
 
 import java.util.Map;
 

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlThread.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlThread.java

@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.core.model;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.core.model;
 
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.osgi.util.NLS;
 import org.jkiss.dbeaver.debug.core.model.DatabaseThread;
 import org.jkiss.dbeaver.debug.core.model.IDatabaseDebugTarget;
-import org.jkiss.dbeaver.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
+import org.jkiss.dbeaver.ext.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
 
 public class PgSqlThread extends DatabaseThread {
     

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/Breakpoint.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/Breakpoint.java

-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 public interface Breakpoint {
 	

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/DebugException.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/DebugException.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 
 @SuppressWarnings("serial")

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/DebugObject.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/DebugObject.java

-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 public interface DebugObject<OBJECTID> {
 	

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/DebugSession.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/DebugSession.java

-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 import java.util.List;
 

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/SessionInfo.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/SessionInfo.java

-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 public interface SessionInfo<SESSIONID> {
 	

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/StackFrame.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/StackFrame.java

-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 public interface StackFrame {
    String getName();

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/Variable.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/Variable.java

-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 public interface Variable<T> {
 	

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/VariableType.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/VariableType.java

-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 public enum VariableType { NUMBER, TEXT, DATE, BLOB }

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/console/Debugger.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/console/Debugger.java

-package org.jkiss.dbeaver.postgresql.pldbg.console;
+package org.jkiss.dbeaver.ext.postgresql.pldbg.console;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Scanner;
 
-import org.jkiss.dbeaver.postgresql.pldbg.DebugException;
-import org.jkiss.dbeaver.postgresql.pldbg.impl.DebugManagerPostgres;
-import org.jkiss.dbeaver.postgresql.pldbg.impl.DebugObjectPostgres;
-import org.jkiss.dbeaver.postgresql.pldbg.impl.SessionInfoPostgres;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugException;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.impl.DebugManagerPostgres;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.impl.DebugObjectPostgres;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.impl.SessionInfoPostgres;
 
 @SuppressWarnings("nls")
 public class Debugger {

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/control/DebugManager.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/control/DebugManager.java

@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.jkiss.dbeaver.postgresql.pldbg.control;
+package org.jkiss.dbeaver.ext.postgresql.pldbg.control;
 
 import java.util.List;
 
-import org.jkiss.dbeaver.postgresql.pldbg.DebugException;
-import org.jkiss.dbeaver.postgresql.pldbg.DebugObject;
-import org.jkiss.dbeaver.postgresql.pldbg.DebugSession;
-import org.jkiss.dbeaver.postgresql.pldbg.SessionInfo;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugException;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugObject;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugSession;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.SessionInfo;
 
 public interface DebugManager<SESSIONID,OBJECTID> {
     SESSIONID getCurrent() throws DebugException;

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/DebugManagerPostgres.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/DebugManagerPostgres.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.jkiss.dbeaver.postgresql.pldbg.impl;
+package org.jkiss.dbeaver.ext.postgresql.pldbg.impl;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -24,9 +24,9 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jkiss.dbeaver.postgresql.pldbg.DebugException;
-import org.jkiss.dbeaver.postgresql.pldbg.DebugSession;
-import org.jkiss.dbeaver.postgresql.pldbg.control.DebugManager;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugException;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugSession;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.control.DebugManager;
 
 /**
  * @author Andrey.Hitrin

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/DebugObjectPostgres.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/DebugObjectPostgres.java

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.pldbg.impl;
+package org.jkiss.dbeaver.ext.postgresql.pldbg.impl;
 
-import org.jkiss.dbeaver.postgresql.pldbg.DebugObject;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugObject;
 
 /**
  * @author Andrey.Hitrin

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/DebugSessionPostgres.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/DebugSessionPostgres.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.pldbg.impl;
+package org.jkiss.dbeaver.ext.postgresql.pldbg.impl;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -23,11 +23,11 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jkiss.dbeaver.postgresql.pldbg.Breakpoint;
-import org.jkiss.dbeaver.postgresql.pldbg.DebugException;
-import org.jkiss.dbeaver.postgresql.pldbg.DebugSession;
-import org.jkiss.dbeaver.postgresql.pldbg.StackFrame;
-import org.jkiss.dbeaver.postgresql.pldbg.Variable;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.Breakpoint;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugException;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugSession;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.StackFrame;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.Variable;
 
 /**
  * @author Andrey.Hitrin

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/PostgresBreakpoint.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/PostgresBreakpoint.java

@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.pldbg.impl;
+package org.jkiss.dbeaver.ext.postgresql.pldbg.impl;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import org.jkiss.dbeaver.postgresql.pldbg.Breakpoint;
-import org.jkiss.dbeaver.postgresql.pldbg.DebugException;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.Breakpoint;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugException;
 
 
 /**

bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/SessionInfoPostgres.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/SessionInfoPostgres.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.jkiss.dbeaver.postgresql.pldbg.impl;
+package org.jkiss.dbeaver.ext.postgresql.pldbg.impl;
 
-import org.jkiss.dbeaver.postgresql.pldbg.SessionInfo;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.SessionInfo;
 
 /**
  * @author Andrey.Hitrin

bundles/org.jkiss.dbeaver.postgresql.debug.core/.project → plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/.project

 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.jkiss.dbeaver.postgresql.debug.core</name>
+	<name>org.jkiss.dbeaver.ext.postgresql.debug.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>

bundles/org.jkiss.dbeaver.postgresql.debug.ui/META-INF/MANIFEST.MF → plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF

 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.jkiss.dbeaver.postgresql.debug.ui;singleton:=true
+Bundle-SymbolicName: org.jkiss.dbeaver.ext.postgresql.debug.ui;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.debug.core,
  org.jkiss.dbeaver.debug.ui,
  org.jkiss.dbeaver.ext.postgresql,
- org.jkiss.dbeaver.postgresql.debug.core
+ org.jkiss.dbeaver.ext.postgresql.debug.core

bundles/org.jkiss.dbeaver.postgresql.debug.ui/OSGI-INF/l10n/bundle.properties → plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/OSGI-INF/l10n/bundle.properties

-#Properties file for org.jkiss.dbeaver.postgresql.debug.ui
+#Properties file for org.jkiss.dbeaver.ext.postgresql.debug.ui
 
 # DBeaver - Universal Database Manager
 # Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)

bundles/org.jkiss.dbeaver.postgresql.debug.ui/plugin.xml → plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/plugin.xml

@@ -21,18 +21,18 @@
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTypeImages">
       <launchConfigurationTypeImage
-            configTypeID="org.jkiss.dbeaver.postgresql.debug.core.pgSQL"
+            configTypeID="org.jkiss.dbeaver.ext.postgresql.debug.core.pgSQL"
             icon="platform:/plugin/org.jkiss.dbeaver.ext.postgresql/$nl$/icons/postgresql_icon.png"
-            id="org.jkiss.dbeaver.postgresql.debug.ui.launchConfigurationTypeImages.launchConfigurationTypeImage.pgSQL">
+            id="org.jkiss.dbeaver.ext.postgresql.debug.ui.launchConfigurationTypeImages.launchConfigurationTypeImage.pgSQL">
       </launchConfigurationTypeImage>
    </extension>
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTabGroups">
       <launchConfigurationTabGroup
-            class="org.jkiss.dbeaver.postgresql.internal.debug.ui.PgSqlLaunchConfigurationTabGroup"
+            class="org.jkiss.dbeaver.ext.postgresql.internal.debug.ui.PgSqlLaunchConfigurationTabGroup"
             description="%launchConfigurationTabGroups.launchConfigurationTabGroup.pgSQL.description"
-            id="org.jkiss.dbeaver.postgresql.debug.ui.launchConfigurationTabGroups.launchConfigurationTabGroup.pgSQL"
-            type="org.jkiss.dbeaver.postgresql.debug.core.pgSQL">
+            id="org.jkiss.dbeaver.ext.postgresql.debug.ui.launchConfigurationTabGroups.launchConfigurationTabGroup.pgSQL"
+            type="org.jkiss.dbeaver.ext.postgresql.debug.core.pgSQL">
          <launchMode
                description="%launchConfigurationTabGroups.launchConfigurationTabGroup.launchMode.pgSQL.debug.description"
                mode="debug">
@@ -42,14 +42,14 @@
    <extension
          point="org.eclipse.debug.ui.launchShortcuts">
       <shortcut
-            class="org.jkiss.dbeaver.postgresql.internal.debug.ui.PgSqlLaunchShortcut"
+            class="org.jkiss.dbeaver.ext.postgresql.internal.debug.ui.PgSqlLaunchShortcut"
             description="%launchShortcuts.shortcut.pgSQL.description"
             icon="platform:/plugin/org.jkiss.dbeaver.ext.postgresql/$nl$/icons/postgresql_icon.png"
-            id="org.jkiss.dbeaver.postgresql.debug.ui.launchShortcuts.shortcut.pgSQL"
+            id="org.jkiss.dbeaver.ext.postgresql.debug.ui.launchShortcuts.shortcut.pgSQL"
             label="%launchShortcuts.shortcut.pgSQL.label"
             modes="debug">
          <configurationType
-               id="org.jkiss.dbeaver.postgresql.debug.core.pgSQL"></configurationType>
+               id="org.jkiss.dbeaver.ext.postgresql.debug.core.pgSQL"></configurationType>
          <contextualLaunch>
             <contextLabel
                   label="%launchShortcuts.shortcut.pgSQL.label"
@@ -77,8 +77,8 @@
    <extension
          point="org.eclipse.debug.ui.debugModelPresentations">
       <debugModelPresentation
-            class="org.jkiss.dbeaver.postgresql.internal.debug.ui.PgSqlDebugModelPresentation"
-            id="org.jkiss.dbeaver.postgresql.debug.core">
+            class="org.jkiss.dbeaver.ext.postgresql.internal.debug.ui.PgSqlDebugModelPresentation"
+            id="org.jkiss.dbeaver.ext.postgresql.debug.core">
       </debugModelPresentation>
    </extension>
 

bundles/org.jkiss.dbeaver.postgresql.debug.core/pom.xml → plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/pom.xml

@@ -8,7 +8,7 @@
     <version>1.0.0</version>
     <relativePath>../../</relativePath>
   </parent>
-  <artifactId>org.jkiss.dbeaver.postgresql.debug.core</artifactId>
+  <artifactId>org.jkiss.dbeaver.ext.postgresql.debug.ui</artifactId>
   <version>1.0.0</version>
   <packaging>eclipse-plugin</packaging>
 </project>

bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/debug/ui/PostgreSqlDebugUi.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/debug/ui/PostgreSqlDebugUi.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.debug.ui;
+package org.jkiss.dbeaver.ext.postgresql.debug.ui;
 
 public class PostgreSqlDebugUi {
 
-    public static final String BUNDLE_SYMBOLIC_NAME = "org.jkiss.dbeaver.postgresql.debug.ui"; //$NON-NLS-1$
+    public static final String BUNDLE_SYMBOLIC_NAME = "org.jkiss.dbeaver.ext.postgresql.debug.ui"; //$NON-NLS-1$
 
 }

bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlDebugModelPresentation.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlDebugModelPresentation.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.ui;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.ui;
 
 import org.eclipse.debug.core.model.IValue;
 import org.eclipse.debug.ui.IValueDetailListener;

bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlLaunchConfigurationTabGroup.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlLaunchConfigurationTabGroup.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.ui;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.ui;
 
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
 import org.eclipse.debug.ui.CommonTab;

bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlLaunchShortcut.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlLaunchShortcut.java

@@ -15,16 +15,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.ui;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.ui;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.jkiss.dbeaver.debug.core.DebugCore;
 import org.jkiss.dbeaver.debug.ui.LaunchShortcut;
+import org.jkiss.dbeaver.ext.postgresql.debug.core.PostgreSqlDebugCore;
 import org.jkiss.dbeaver.ext.postgresql.model.PostgreProcedure;
 import org.jkiss.dbeaver.model.struct.DBSObject;
-import org.jkiss.dbeaver.postgresql.debug.core.PostgreSqlDebugCore;
 
 public class PgSqlLaunchShortcut extends LaunchShortcut {
 

bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlTab.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlTab.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.ui;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.ui;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Text;
 import org.jkiss.dbeaver.debug.ui.DatabaseTab;
 import org.jkiss.dbeaver.ext.postgresql.PostgreActivator;
-import org.jkiss.dbeaver.postgresql.debug.core.PostgreSqlDebugCore;
+import org.jkiss.dbeaver.ext.postgresql.debug.core.PostgreSqlDebugCore;
 import org.jkiss.dbeaver.ui.UIUtils;
 
 public class PgSqlTab extends DatabaseTab {

bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PostgreSqlDebugUiMessages.java → plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PostgreSqlDebugUiMessages.java

@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.ui;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.ui;
 
 import org.eclipse.osgi.util.NLS;
 
 public class PostgreSqlDebugUiMessages extends NLS {
 
-    private static final String BUNDLE_NAME = "org.jkiss.dbeaver.postgresql.internal.debug.ui.PostgreSqlDebugUiMessages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.jkiss.dbeaver.ext.postgresql.internal.debug.ui.PostgreSqlDebugUiMessages"; //$NON-NLS-1$
     
     public static String PgSqlLaunchShortcut_e_editor_empty;
     public static String PgSqlLaunchShortcut_e_selection_empty;

pom.xml

@@ -28,8 +28,8 @@
         <module>plugins/org.jkiss.dbeaver.core</module>
         <module>plugins/org.jkiss.dbeaver.ui</module>
 
-        <module>bundles/org.jkiss.dbeaver.debug.core</module>
-        <module>bundles/org.jkiss.dbeaver.debug.ui</module>
+        <module>plugins/org.jkiss.dbeaver.debug.core</module>
+        <module>plugins/org.jkiss.dbeaver.debug.ui</module>
 
         <module>plugins/org.jkiss.dbeaver.core.application</module>
         <module>plugins/org.jkiss.dbeaver.core.eclipse</module>
@@ -51,8 +51,8 @@
         <module>plugins/org.jkiss.dbeaver.ext.phoenix</module>
 
         <module>plugins/org.jkiss.dbeaver.ext.postgresql</module>
-        <module>bundles/org.jkiss.dbeaver.postgresql.debug.core</module>
-        <module>bundles/org.jkiss.dbeaver.postgresql.debug.ui</module>
+        <module>plugins/org.jkiss.dbeaver.ext.postgresql.debug.core</module>
+        <module>plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui</module>
 
         <module>plugins/org.jkiss.dbeaver.ext.sqlite</module>
         <module>plugins/org.jkiss.dbeaver.ext.vertica</module>