Skip to content

Commit

Permalink
Merge branch 'IM-457-Merge-develop-in-IM-384' into IM-459-New-Configu…
Browse files Browse the repository at this point in the history 
…re-keycloak-in-remote-engine
  • Loading branch information
@kristinaBc3
kristinaBc3 committed Nov 25, 2024
2 parents cd371e2 + 50b1603 commit 2c80e8f
Show file tree
Hide file tree
Showing 404 changed files with 593 additions and 754 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
cache: 'maven'
- name: Build with maven
run: |
Expand Down
1 change: 1 addition & 0 deletions .mvn/jvm.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-Djava.net.preferIPv4Stack=true
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ pipeline {
}
steps {
configFileProvider([configFile(fileId: '1f5f24a2-9839-4194-b2ad-0613279f9fba', variable: 'MAVEN_SETTINGS_XML')]) {
sh './mvnw --settings $MAVEN_SETTINGS_XML deploy -pl :api -DskipTests'
sh './mvnw --settings $MAVEN_SETTINGS_XML deploy -pl org.integratedmodelling:org.integratedmodelling.klab.api -DskipTests'
}
}
}
Expand Down
32 changes: 32 additions & 0 deletions ...lling.klab.api/src/org/integratedmodelling/klab/rest/RemoteUserAuthenticationRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,38 @@
public class RemoteUserAuthenticationRequest extends UserAuthenticationRequest {

private String token;

/**
* @return the token
*/
public String getToken() {
return token;
}
/**
* @param token the token to set
*/
public void setToken(String token) {
this.token = token;
}

@Override
public int hashCode() {
final int prime = 31;
int result = super.hashCode();
result = prime * result + Objects.hash(token);
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (!super.equals(obj))
return false;
if (getClass() != obj.getClass())
return false;
RemoteUserAuthenticationRequest other = (RemoteUserAuthenticationRequest) obj;
return Objects.equals(token, other.token);
}

@Override
public String toString() {
Expand Down
9 changes: 6 additions & 3 deletions ...edmodelling.klab.api/src/org/integratedmodelling/klab/rest/UserAuthenticationRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@

public class UserAuthenticationRequest {

private String username;
private boolean remote = false;
private String username;

private boolean remote = false;
private boolean remote = false;

public String getUsername() {
return username;
}

public void setUsername(String username) {
this.username = username;
}

public boolean isRemote() {
return remote;
Expand Down
6 changes: 3 additions & 3 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<execute></execute>
</action>
</pluginExecution>
</pluginExecutions>
Expand All @@ -193,8 +193,8 @@
</build>
<repositories>
<repository>
<id>eclipse-2022-09</id>
<url>https://download.eclipse.org/releases/2022-09/</url>
<id>eclipse-2024-09</id>
<url>https://download.eclipse.org/releases/2024-09/</url>
<layout>p2</layout>
</repository>
<repository>
Expand Down
6 changes: 3 additions & 3 deletions client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<execute></execute>
</action>
</pluginExecution>
</pluginExecutions>
Expand All @@ -193,8 +193,8 @@
</build>
<repositories>
<repository>
<id>eclipse-2022-09</id>
<url>https://download.eclipse.org/releases/2022-09/</url>
<id>eclipse-2024-09</id>
<url>https://download.eclipse.org/releases/2024-09/</url>
<layout>p2</layout>
</repository>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion ...tats/src/test/java/org/integratedmodelling/klab/node/controllers/AcceptanceTestUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public static String getSessionTokenForDefaultAdministrator(int port) throws URI
URI uri = new URI(baseUrl);
HttpHeaders headers = new HttpHeaders();
UserAuthenticationRequest auth= new UserAuthenticationRequest();
auth.setPassword("password");

auth.setUsername("system");
HttpEntity<?> request = new HttpEntity<>(auth, headers);
RestTemplate restTemplate = new RestTemplate();
Expand Down
20 changes: 11 additions & 9 deletions ...rg.integratedmodelling.klab.ide.platform/org.integratedmodelling.klab.ide.platform.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,26 @@
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.19.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xpand" version="0.0.0"/>
<unit id="org.eclipse.xtend" version="0.0.0"/>
<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2022-09/"/>
<repository location="https://download.eclipse.org/releases/2024-09/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
<unit id="javax.annotation" version="0.0.0"/>
<unit id="javax.inject" version="0.0.0"/>
<unit id="ch.qos.logback.classic" version="0.0.0"/>
<unit id="ch.qos.logback.core" version="0.0.0"/>
<unit id="ch.qos.logback.slf4j" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.36.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="https://download.eclipse.org/nebula/releases/2.6.0"/>
Expand All @@ -33,13 +38,10 @@
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="0.0.0"/>
<!-- <unit id="org.eclipse.egit.mylyn.feature.group" version="0.0.0"/> -->
<unit id="org.eclipse.egit.source.feature.group" version="0.0.0"/>
<!--<unit id="org.eclipse.egit.ui.smartimport" version="0.0.0"/>-->
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.lfs.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.pgm.feature.group" version="0.0.0"/>
<!--<unit id="org.eclipse.jgit.pgm.source.feature.group" version="0.0.0"/>-->
<unit id="org.eclipse.jgit.source.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/egit/updates-6.3/"/>
</location>
Expand Down
4 changes: 4 additions & 0 deletions ide/org.integratedmodelling.klab.ide.repository/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
<rootFolder>kmodeler</rootFolder>
</product>
</products>
<formats>
<linux>zip</linux>
<macosx>zip</macosx>
</formats>
</configuration>
<executions>
<execution>
Expand Down
6 changes: 3 additions & 3 deletions ide/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<execute></execute>
</action>
</pluginExecution>
</pluginExecutions>
Expand All @@ -200,8 +200,8 @@
</build>
<repositories>
<repository>
<id>eclipse-2022-09</id>
<url>https://download.eclipse.org/releases/2022-09/</url>
<id>eclipse-2024-09</id>
<url>https://download.eclipse.org/releases/2024-09/</url>
<layout>p2</layout>
</repository>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion ...ing.kactors.ide/src-gen/org/integratedmodelling/kactors/ide/AbstractKactorsIdeModule.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.33.0
* generated by Xtext 2.36.0
*/
package org.integratedmodelling.kactors.ide;

Expand Down
2 changes: 1 addition & 1 deletion ...rs.ide/src-gen/org/integratedmodelling/kactors/ide/contentassist/antlr/KactorsParser.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.33.0
* generated by Xtext 2.36.0
*/
package org.integratedmodelling.kactors.ide.contentassist.antlr;

Expand Down
2 changes: 1 addition & 1 deletion ...ntegratedmodelling/kactors/ide/contentassist/antlr/PartialKactorsContentAssistParser.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.33.0
* generated by Xtext 2.36.0
*/
package org.integratedmodelling.kactors.ide.contentassist.antlr;

Expand Down
2 changes: 1 addition & 1 deletion ...rc-gen/org/integratedmodelling/kactors/ide/contentassist/antlr/internal/InternalKactors.g
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.33.0
* generated by Xtext 2.36.0
*/
grammar InternalKactors;

Expand Down
7 changes: 3 additions & 4 deletions kactors/org.integratedmodelling.kactors.target/org.integratedmodelling.kactors.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2022-09"/>
<repository location="https://download.eclipse.org/releases/2024-09"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.19.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.generator.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.36.0/"/>
</location>
</locations>
</target>
21 changes: 0 additions & 21 deletions kactors/org.integratedmodelling.kactors.tests/.classpath
View file

This file was deleted.

40 changes: 0 additions & 40 deletions kactors/org.integratedmodelling.kactors.tests/.project
View file

This file was deleted.

2 changes: 0 additions & 2 deletions kactors/org.integratedmodelling.kactors.tests/.settings/org.eclipse.core.resources.prefs
View file

This file was deleted.

10 changes: 0 additions & 10 deletions kactors/org.integratedmodelling.kactors.tests/.settings/org.eclipse.jdt.core.prefs
View file

This file was deleted.

7 changes: 0 additions & 7 deletions kactors/org.integratedmodelling.kactors.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
View file

This file was deleted.

14 changes: 0 additions & 14 deletions kactors/org.integratedmodelling.kactors.tests/META-INF/MANIFEST.MF
View file

This file was deleted.

6 changes: 0 additions & 6 deletions kactors/org.integratedmodelling.kactors.tests/build.properties
View file

This file was deleted.

21 changes: 0 additions & 21 deletions kactors/org.integratedmodelling.kactors.tests/pom.xml
View file

This file was deleted.

Empty file removed kactors/org.integratedmodelling.kactors.tests/src-gen/.keep
View file
Empty file.
Loading

0 comments on commit 2c80e8f

Please sign in to comment.