Skip to content

Orangeft4cs functions path #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GwenaelLM wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Orangeft4cs functions path #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b83a554
Update OperationFunction.java
GwenaelLM Dec 20, 2022
bb8f679
Update OperationGroovy.java
GwenaelLM Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/main/java/com/devoteam/srit/xmlloader/core/operations/basic/OperationFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ else if (file != null && name == null) {
}

public static void importFile(String file, URI relativeTo) throws Exception {

// Solve user_home value
if (file.contains("[user_home]")) {
String userHome = System.getProperty("user.home");
file = file.replace("[user_home]", userHome);
}

// parse the xml file
XMLDocument scenarioDocument = Cache.getXMLDocument(relativeTo.resolve(file), URIFactory.newURI("../conf/schemas/scenario.xsd"));

Expand Down
6 changes: 6 additions & 0 deletions src/main/java/com/devoteam/srit/xmlloader/core/operations/basic/OperationGroovy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ public Operation execute(Runner runner) throws Exception {
// retrieve the list of groovy files to load
String groovyFiles = getRootElement().attributeValue("name");

// Solve user_home value
if (groovyFiles.contains("[user_home]")) {
String userHome = System.getProperty("user.home");
groovyFiles = groovyFiles.replace("[user_home]", userHome);
}

// retrieve the groovy operation script source
String scriptSource = getRootElement().getText();

Expand Down