Merge branch 'fix/166' into webspoon-8.3

HiromuHota · Jul 19, 2019 · 01cf760 · 01cf760
2 parents 69dac8b + 728f669
commit 01cf760
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -44,6 +44,7 @@ pipeline {
                     paths+=(`find plugins/engine-configuration/ui/target | grep -E "pdi-engine-configuration-ui-$dist(-sources)?\\.jar"`)
                     paths+=(`find plugins/file-open-save/core/target | grep -E "file-open-save-core-$dist(-sources)?\\.jar"`)
                     paths+=(`find plugins/get-fields/core/target | grep -E "get-fields-core-$dist(-sources)?\\.jar"`)
+                    paths+=(`find plugins/connections/ui/target | grep -E "connections-ui-$dist(-sources)?\\.jar"`)
 
                     for path in ${paths[@]}
                     do

diff --git a/plugins/connections/pom.xml b/plugins/connections/pom.xml
@@ -34,6 +34,7 @@
     <cxf.karaf.version>3.0.13</cxf.karaf.version>
     <requirejs-text.version>2.0.10</requirejs-text.version>
     <require-css.version>0.1.8</require-css.version>
+    <dojo.version>1.9.2</dojo.version>
     <angular-i18n.version>1.5.6</angular-i18n.version>
     <swt.version>4.6</swt.version>
     <dependency.javax.servlet-api.version>3.0.1</dependency.javax.servlet-api.version>

diff --git a/...s/connections/ui/src/main/java/org/pentaho/di/connections/ui/dialog/ConnectionDialog.java b/...s/connections/ui/src/main/java/org/pentaho/di/connections/ui/dialog/ConnectionDialog.java
@@ -41,7 +41,6 @@
  */
 public class ConnectionDialog extends ThinDialog {
 
-  private static final Image LOGO = GUIResource.getInstance().getImageLogoSmall();
   private static final String OSGI_SERVICE_PORT = "OSGI_SERVICE_PORT";
   private static final int OPTIONS = SWT.APPLICATION_MODAL | SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX;
   private static final String THIN_CLIENT_HOST = "THIN_CLIENT_HOST";
@@ -68,7 +67,7 @@ public void open( String title, String connectionName ) {
       clientPath.append( "#/intro" );
     }
     super.createDialog( title, getRepoURL( clientPath.toString() ),
-      OPTIONS, LOGO );
+      OPTIONS, GUIResource.getInstance().getImageLogoSmall() );
     super.dialog.setMinimumSize( 545, 458 );
 
     new BrowserFunction( browser, "close" ) {
@@ -131,7 +130,7 @@ private static String getRepoURL( String path ) {
       host = LOCALHOST;
       port = getOsgiServicePort();
     }
-    return "http://" + host + ":" + port + path;
+    return System.getProperty( "KETTLE_CONTEXT_PATH" ) + "/osgi" + path;
   }
 
   private static String getKettleProperty( String propertyName ) {

diff --git a/...ons/ui/src/main/java/org/pentaho/di/connections/ui/tree/ConnectionPopupMenuExtension.java b/...ons/ui/src/main/java/org/pentaho/di/connections/ui/tree/ConnectionPopupMenuExtension.java
@@ -50,8 +50,6 @@ public class ConnectionPopupMenuExtension implements ExtensionPointInterface {
   private static final Class<?> PKG = ConnectionPopupMenuExtension.class;
 
   private Supplier<Spoon> spoonSupplier = Spoon::getInstance;
-  private Menu rootMenu;
-  private Menu itemMenu;
   private ConnectionDelegate vfsConnectionDelegate;
   private ConnectionTreeItem vfsConnectionTreeItem;
 
@@ -83,8 +81,7 @@ public ConnectionPopupMenuExtension( ConnectionDelegate connectionDelegate ) {
   }
 
   private Menu createRootPopupMenu( Tree tree ) {
-    if ( rootMenu == null ) {
-      rootMenu = new Menu( tree );
+    Menu rootMenu = new Menu( tree );
       MenuItem menuItem = new MenuItem( rootMenu, SWT.NONE );
       menuItem.setText( BaseMessages.getString( PKG, "VFSConnectionPopupMenuExtension.MenuItem.New" ) );
       menuItem.addSelectionListener( new SelectionAdapter() {
@@ -93,13 +90,11 @@ public void widgetSelected( SelectionEvent selectionEvent ) {
           vfsConnectionDelegate.openDialog();
         }
       } );
-    }
     return rootMenu;
   }
 
   private Menu createItemPopupMenu( Tree tree ) {
-    if ( itemMenu == null ) {
-      itemMenu = new Menu( tree );
+    Menu itemMenu = new Menu( tree );
       MenuItem editMenuItem = new MenuItem( itemMenu, SWT.NONE );
       editMenuItem.setText( BaseMessages.getString( PKG, "VFSConnectionPopupMenuExtension.MenuItem.Edit" ) );
       editMenuItem.addSelectionListener( new SelectionAdapter() {
@@ -115,7 +110,6 @@ private Menu createItemPopupMenu( Tree tree ) {
           vfsConnectionDelegate.delete( vfsConnectionTreeItem.getLabel() );
         }
       } );
-    }
     return itemMenu;
   }
 }

diff --git a/plugins/connections/ui/src/main/resources-filtered/app/index.html b/plugins/connections/ui/src/main/resources-filtered/app/index.html
@@ -6,8 +6,8 @@
   <title>VFS Connection Dialog</title>
   <!-- Requesting webcontext.js one level above to workaround the filter on PDI issue (BACKLOG-17885) -->
   <!-- Remove '../' when not needed -->
-  <link rel="stylesheet" type="text/css" href="/@pentaho/di-core-ui@${project.version}/css/fonts/opensans/style.css">
-  <link rel="stylesheet" type="text/css" href="/@pentaho/di-core-ui@${project.version}/css/global.css">
+  <link rel="stylesheet" type="text/css" href="../../@pentaho/di-core-ui@${project.version}/css/fonts/opensans/style.css">
+  <link rel="stylesheet" type="text/css" href="../../@pentaho/di-core-ui@${project.version}/css/global.css">
   <script type="text/javascript" src="../webcontext.js?requireJsOnly=true"></script>
   <link rel="stylesheet" type="text/css" href="css/index.css">
   <script>
@@ -17,9 +17,10 @@
       // overrides just for this app
       require.config({
         paths: {
-          "pentaho": "/@pentaho/di-core-ui@${project.version}/pentaho",
-          "css": "/require-css@${require-css.version}/css",
-          "text": "/requirejs-text@${requirejs-text.version}/text"
+          "pentaho": "../../@pentaho/di-core-ui@${project.version}/pentaho",
+          "css": "../../require-css@${require-css.version}/css",
+          "text": "../../requirejs-text@${requirejs-text.version}/text",
+          "dojo": "../../dojo@${dojo.version}"
         }
       });
 

diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -47,6 +47,7 @@
         <module>get-fields/core</module>
         <module>repositories/core</module>
         <module>engine-configuration/ui</module>
+        <module>connections/ui</module>
       </modules>
     </profile>