Merge branch 'IM-333-Resume-keycloack-integration' into feature/IM-38…

…4-KEYCLOAK
integratedmodelling · May 21, 2024 · d5559a6 · d5559a6
2 parents 13e94ab + f3feb2d
commit d5559a6
Show file tree

Hide file tree

Showing 74 changed files with 2,565 additions and 2,430 deletions.
diff --git a/api/org.integratedmodelling.klab.api/src/org/integratedmodelling/kim/api/IKimProject.java b/api/org.integratedmodelling.klab.api/src/org/integratedmodelling/kim/api/IKimProject.java
@@ -9,111 +9,112 @@
 
 public interface IKimProject {
 
-    static final String KLAB_CONFIGURATION_DEFINED_WORLDVIEW_ID = "klab.defined.worldview";
-    static final String KLAB_CONFIGURATION_WORLDVIEW_ID = "klab.worldview";
-    static final String KLAB_CONFIGURATION_CLOSED_PROJECT = "klab.closed";
+	static final String KLAB_CONFIGURATION_DEFINED_WORLDVIEW_ID = "klab.defined.worldview";
+	static final String KLAB_CONFIGURATION_WORLDVIEW_ID = "klab.worldview";
+	static final String KLAB_CONFIGURATION_CLOSED_PROJECT = "klab.closed";
     static final String KLAB_CONFIGURATION_PREREQUISITES = "klab.prerequisites";
-    static final String KLAB_CONFIGURATION_PERMISSIONS = "klab.permissions";
-
-    static public final String SOURCE_FOLDER = "src";
-    static public final String DOCUMENTATION_FOLDER = "docs";
-    static public final String SCRIPT_FOLDER = "apps";
-    static public final String TESTS_FOLDER = "tests";
-    static public final String RESOURCE_FOLDER = "resources";
-
-    /**
-     * 
-     * @return
-     */
-    String getDefinedWorldview();
-
-    /**
-     * 
-     * @return
-     */
-    List<File> getSourceFiles();
-
-    /**
-     * 
-     * @param id
-     * @return
-     */
-    IKimNamespace getNamespace(String id);
-
-    /**
-     * 
-     * @return
-     */
-    IKimWorkspace getWorkspace();
-
-    /**
-     * 
-     * @return
-     */
-    String getName();
-
-    /**
-     * 
-     * @return
-     */
-    String getWorldview();
-
-    /**
-     * 
-     * @return
-     */
-    Collection<String> getRequiredProjectNames();
-
-    /**
-     * 
-     * @return
-     */
-    File getRoot();
-
-    /**
-     * 
-     * @return
-     */
-    Properties getProperties();
-
-    /**
-     * 
-     * @return
-     */
-    List<IKimNamespace> getNamespaces();
-
-    /**
-     * All the legitimate behaviors (in the source files)
-     * 
-     * @return
-     */
-    List<IKActorsBehavior> getBehaviors();
-
-    /**
-     * All the behaviors in the apps directory (which may also contain k.IM
-     * scripts). Includes apps and components but not other types of declared
-     * behavior.
-     * 
-     * @return
-     */
-    List<IKActorsBehavior> getApps();
-
-    /**
-     * All the behaviors in the tests directory (which may also contain k.IM
-     * scripts).
-     * 
-     * @return
-     */
-    List<IKActorsBehavior> getTests();
-
-    /**
-     * 
-     * @return
-     */
-    boolean isErrors();
-
-    boolean isWarnings();
-
-    boolean isOpen();
+
+	static public final String SOURCE_FOLDER = "src";
+	static public final String DOCUMENTATION_FOLDER = "docs";
+	static public final String SCRIPT_FOLDER = "apps";
+	static public final String TESTS_FOLDER = "tests";
+	static public final String RESOURCE_FOLDER = "resources";
+
+	/**
+	 * 
+	 * @return
+	 */
+	String getDefinedWorldview();
+
+	/**
+	 * 
+	 * @return
+	 */
+	List<File> getSourceFiles();
+
+	/**
+	 * 
+	 * @param id
+	 * @return
+	 */
+	IKimNamespace getNamespace(String id);
+
+	/**
+	 * 
+	 * @return
+	 */
+	IKimWorkspace getWorkspace();
+
+	/**
+	 * 
+	 * @return
+	 */
+	String getName();
+
+	/**
+	 * 
+	 * @return
+	 */
+	String getWorldview();
+
+
+	/**
+	 * 
+	 * @return
+	 */
+	Collection<String> getRequiredProjectNames();
+
+
+	/**
+	 * 
+	 * @return
+	 */
+	File getRoot();
+
+	/**
+	 * 
+	 * @return
+	 */
+	Properties getProperties();
+
+	/**
+	 * 
+	 * @return
+	 */
+	List<IKimNamespace> getNamespaces();
+
+	/**
+	 * All the legitimate behaviors (in the source files)
+	 * 
+	 * @return
+	 */
+	List<IKActorsBehavior> getBehaviors();
+
+	/**
+	 * All the behaviors in the apps directory (which may also contain k.IM
+	 * scripts). Includes apps and components but not other types of declared
+	 * behavior.
+	 * 
+	 * @return
+	 */
+	List<IKActorsBehavior> getApps();
+
+	/**
+	 * All the behaviors in the tests directory (which may also contain k.IM
+	 * scripts).
+	 * 
+	 * @return
+	 */
+	List<IKActorsBehavior> getTests();
+
+	/**
+	 * 
+	 * @return
+	 */
+	boolean isErrors();
+
+	boolean isWarnings();
+
+	boolean isOpen();
 
 }
diff --git a/...ratedmodelling.klab.api/src/org/integratedmodelling/klab/api/services/IActorsService.java b/...ratedmodelling.klab.api/src/org/integratedmodelling/klab/api/services/IActorsService.java
@@ -14,7 +14,6 @@
 import org.integratedmodelling.klab.api.auth.IActorIdentity.Reference;
 import org.integratedmodelling.klab.api.auth.IEngineUserIdentity;
 import org.integratedmodelling.klab.api.auth.IIdentity;
-import org.integratedmodelling.klab.api.auth.IUserIdentity;
 import org.integratedmodelling.klab.rest.Localization;
 
 /**
@@ -79,12 +78,6 @@ public interface IActorsService {
      */
     Collection<String> getPublicApps();
 
-    /**
-     * @param user
-     * @return
-     */
-    Collection<String> getPublicApps(IUserIdentity user);
-
     /**
      * 
      * @param type