Adapt webSpoon to 7.1 (repositories-plugin)

HiromuHota · May 23, 2017 · 5b14e57 · 5b14e57
1 parent 6b9694c
commit 5b14e57
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/assembly/WEB-INF/web.xml b/assembly/WEB-INF/web.xml
@@ -72,6 +72,10 @@
     <servlet-name>reverseProxy</servlet-name>
     <servlet-class>org.pentaho.di.ui.spoon.WebSpoonProxyServlet</servlet-class>
   </servlet>
+  <servlet-mapping>
+    <servlet-name>reverseProxy</servlet-name>
+    <url-pattern>/cxf/*</url-pattern>
+  </servlet-mapping>
   <servlet-mapping>
     <servlet-name>reverseProxy</servlet-name>
     <url-pattern>/repositories/*</url-pattern>

diff --git a/...itories-plugin-core/src/main/java/org/pentaho/di/ui/repo/RepositoryConnectController.java b/...itories-plugin-core/src/main/java/org/pentaho/di/ui/repo/RepositoryConnectController.java
@@ -416,10 +416,6 @@ public void save() {
     }
   }
 
-  private Spoon getSpoon() {
-    return Spoon.getInstance();
-  }
-
   @SuppressWarnings( "unchecked" )
   private Repository wrapWithRepositoryTimeoutHandler( ReconnectableRepository repository ) {
     List<Class<?>> repositoryIntrerfaces = ClassUtils.getAllInterfaces( repository.getClass() );

diff --git a/plugins/repositories-plugin/repositories-plugin-core/src/main/resources/web/js/services.js b/plugins/repositories-plugin/repositories-plugin-core/src/main/resources/web/js/services.js
@@ -27,7 +27,9 @@ define( [
 
       repoConnectionApp.service("repositoriesService", function($http) {
 
-        this.baseUrl = "/cxf/repositories";
+//      this.baseUrl = "/cxf/repositories";
+        // Add context path
+        this.baseUrl = window.location.pathname.substring( 0, window.location.pathname.indexOf( "/", 2 ) ) + "/cxf/repositories";
 
         this.login = function(username, password)
         {