Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
org.etsi.osl.osom
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSL
code
org.etsi.osl.osom
Commits
baff373d
Commit
baff373d
authored
1 year ago
by
tranoris
Browse files
Options
Downloads
Patches
Plain Diff
Fix for
#16
parent
25e4c2c8
No related branches found
No related tags found
1 merge request
!12
Merging 2024Q2_RC into main, creating 2024Q2 Release
Pipeline
#4424
passed
1 year ago
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/etsi/osl/osom/lcm/LCMRulesExecutor.java
+4
-5
4 additions, 5 deletions
src/main/java/org/etsi/osl/osom/lcm/LCMRulesExecutor.java
with
4 additions
and
5 deletions
src/main/java/org/etsi/osl/osom/lcm/LCMRulesExecutor.java
+
4
−
5
View file @
baff373d
...
...
@@ -6,7 +6,6 @@ import java.lang.reflect.InvocationTargetException;
import
java.lang.reflect.Method
;
import
java.net.URL
;
import
java.net.URLClassLoader
;
import
java.net.URLDecoder
;
import
java.nio.file.Files
;
import
java.nio.file.Path
;
import
java.nio.file.Paths
;
...
...
@@ -22,6 +21,7 @@ import javax.tools.ToolProvider;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.etsi.osl.tmf.lcm.model.LCMRuleSpecification
;
import
org.springframework.boot.system.ApplicationHome
;
/**
* @author ctranoris
...
...
@@ -163,13 +163,12 @@ public class LCMRulesExecutor {
* This is the location of the jar inside the running container
*/
String
jarpath
=
new
File
(
ClassLoader
.
getSystemClassLoader
().
getResource
(
"."
).
getPath
()).
getAbsolutePath
();
File
classesJar
=
new
File
(
jarpath
);
//File classesJar = new File("/opt/openslice/lib/org.etsi.osl.osom-1.2.0-SNAPSHOT.jar");
ApplicationHome
home
=
new
ApplicationHome
(
LCMRulesExecutor
.
class
);
File
classesJar
=
home
.
getSource
();
if
(
classesJar
.
exists
()
)
{
optionList
.
addAll
(
Arrays
.
asList
(
"-classpath"
,
classesJar
.
getAbsoluteFile
().
toString
()
));
}
logger
.
debug
(
"
jarpath = "
+
jarpath
);
logger
.
debug
(
"
classesJar = "
+
classesJar
);
logger
.
debug
(
"optionList = "
+
optionList
.
toString
());
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment