Skip to content

Commit

Permalink
switched to io.github.moonlightsuite group
Browse files Browse the repository at this point in the history
  • Loading branch information
ennioVisco committed Jul 7, 2023
1 parent 3b4db5b commit 7c8aa6a
Show file tree
Hide file tree
Showing 430 changed files with 2,485 additions and 2,356 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
id("org.sonarqube")
}

group = "eu.quanticol.moonlight"
group = "io.github.moonlightsuite.moonlight"
version = "1.0-SNAPSHOT"
description = "MoonLight: a light-weight framework for runtime monitoring"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("eu.quanticol.java-library")
id("io.github.moonlightsuite.java-library")
`maven-publish`
}

Expand Down Expand Up @@ -40,4 +40,4 @@ publishing {
// url = if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl
// }
}
}
}
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// We collect here umbrella tasks that aggregate
// for convenience the tasks of the subprojects
plugins {
id("eu.quanticol.java-library") // For java artifacts generation
id("eu.quanticol.code-info") // for combining JaCoCo reports
id("eu.quanticol.generate-docs") // For docs generation
id("io.github.moonlightsuite.java-library") // For java artifacts generation
id("io.github.moonlightsuite.code-info") // for combining JaCoCo reports
id("io.github.moonlightsuite.generate-docs") // For docs generation
}

// == Umbrella task to publishing all publishable packages ==
Expand Down
4 changes: 2 additions & 2 deletions console/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("eu.quanticol.java-library")
id("io.github.moonlightsuite.java-library")
id("application") // plugin to add support for building a CLI application.
}

Expand All @@ -10,7 +10,7 @@ dependencies {

application {
// Define the main class for the application.
mainClass.set("eu.quanticol.moonlight.MoonLightConsole")
mainClass.set("io.github.moonlightsuite.moonlight.MoonLightConsole")
applicationName = "mlconsole"
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package eu.quanticol.moonlight.console;

import eu.quanticol.moonlight.*;
import eu.quanticol.moonlight.core.base.MoonLightRecord;
import eu.quanticol.moonlight.core.signal.SignalDomain;
import eu.quanticol.moonlight.core.space.LocationService;
import eu.quanticol.moonlight.domain.BooleanDomain;
import eu.quanticol.moonlight.domain.DoubleDomain;
import eu.quanticol.moonlight.offline.signal.RecordHandler;
import eu.quanticol.moonlight.offline.signal.Signal;
import eu.quanticol.moonlight.offline.signal.SpatialTemporalSignal;
import eu.quanticol.moonlight.script.MoonLightScriptLoaderException;
import eu.quanticol.moonlight.script.ScriptLoader;
import eu.quanticol.moonlight.space.GraphModel;
import eu.quanticol.moonlight.space.LocationServiceList;
package io.github.moonlightsuite.moonlight.console;

import io.github.moonlightsuite.moonlight.*;
import io.github.moonlightsuite.moonlight.core.base.MoonLightRecord;
import io.github.moonlightsuite.moonlight.core.signal.SignalDomain;
import io.github.moonlightsuite.moonlight.core.space.LocationService;
import io.github.moonlightsuite.moonlight.domain.BooleanDomain;
import io.github.moonlightsuite.moonlight.domain.DoubleDomain;
import io.github.moonlightsuite.moonlight.offline.signal.RecordHandler;
import io.github.moonlightsuite.moonlight.offline.signal.Signal;
import io.github.moonlightsuite.moonlight.offline.signal.SpatialTemporalSignal;
import io.github.moonlightsuite.moonlight.script.MoonLightScriptLoaderException;
import io.github.moonlightsuite.moonlight.script.ScriptLoader;
import io.github.moonlightsuite.moonlight.space.GraphModel;
import io.github.moonlightsuite.moonlight.space.LocationServiceList;

import java.io.FileNotFoundException;
import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion console/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
requires moonlight.script;
requires moonlight.engine;

exports eu.quanticol.moonlight.console;
exports io.github.moonlightsuite.moonlight.console;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.quanticol.moonlight.console;
package io.github.moonlightsuite.moonlight.console;

import static org.junit.jupiter.api.Assertions.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.quanticol.moonlight.console;
package io.github.moonlightsuite.moonlight.console;

import static org.junit.jupiter.api.Assertions.*;

Expand All @@ -7,22 +7,22 @@
import java.util.List;
import java.util.function.BiFunction;

import eu.quanticol.moonlight.MoonLightScript;
import eu.quanticol.moonlight.MoonLightSpatialTemporalScript;
import eu.quanticol.moonlight.SpatialTemporalScriptComponent;
import eu.quanticol.moonlight.script.MoonLightScriptLoaderException;
import eu.quanticol.moonlight.script.ScriptLoader;
import io.github.moonlightsuite.moonlight.MoonLightScript;
import io.github.moonlightsuite.moonlight.MoonLightSpatialTemporalScript;
import io.github.moonlightsuite.moonlight.SpatialTemporalScriptComponent;
import io.github.moonlightsuite.moonlight.script.MoonLightScriptLoaderException;
import io.github.moonlightsuite.moonlight.script.ScriptLoader;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import eu.quanticol.moonlight.core.io.DataHandler;
import eu.quanticol.moonlight.space.GraphModel;
import eu.quanticol.moonlight.core.space.LocationService;
import eu.quanticol.moonlight.space.LocationServiceList;
import eu.quanticol.moonlight.core.base.MoonLightRecord;
import eu.quanticol.moonlight.offline.signal.RecordHandler;
import eu.quanticol.moonlight.core.space.SpatialModel;
import eu.quanticol.moonlight.offline.signal.SpatialTemporalSignal;
import io.github.moonlightsuite.moonlight.core.io.DataHandler;
import io.github.moonlightsuite.moonlight.space.GraphModel;
import io.github.moonlightsuite.moonlight.core.space.LocationService;
import io.github.moonlightsuite.moonlight.space.LocationServiceList;
import io.github.moonlightsuite.moonlight.core.base.MoonLightRecord;
import io.github.moonlightsuite.moonlight.offline.signal.RecordHandler;
import io.github.moonlightsuite.moonlight.core.space.SpatialModel;
import io.github.moonlightsuite.moonlight.offline.signal.SpatialTemporalSignal;

class TestSensorScript {

Expand Down
8 changes: 4 additions & 4 deletions distribution_files/matlab/moonlight/matlab/MoonlightScript.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
classdef MoonlightScript
% This is a wrapper around the Java interface eu.quanticol.moonlight.MoonLightScript
%
% This is a wrapper around the Java interface io.github.moonlightsuite.moonlight.MoonLightScript
%
% This class contains all the useful methods to get monitor associated
% to formulas defined in the script. There are also methods to change
% the domain of the script on the fly.
Expand Down Expand Up @@ -31,7 +31,7 @@
else
monitor = SpatialTemporalScriptComponent(self.Script.spatialTemporal().selectSpatialTemporalComponent(formulaName));
end
end
end
function self = setBooleanDomain(self)
%setBooleanDomain set the Boolean domain to this script
self.Script.setBooleanDomain();
Expand All @@ -49,4 +49,4 @@
monitor = SpatialTemporalScriptComponent(self.Script.spatialTemporal());
end
end
end
end
10 changes: 5 additions & 5 deletions distribution_files/matlab/moonlight/matlab/ScriptLoader.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
classdef ScriptLoader
% This class contains methods to load the MoonLight scripts
% This class contains methods to load the MoonLight scripts
methods(Static)
function moonlightScript = loadFromFile(filename)
% loadFromFile load a moonLightScript from file.
Expand All @@ -8,7 +8,7 @@
% ScriptLoader.loadInnerFromFile(filename);
warning('off','all');
% moonlightScript=MoonlightScript(eval("moonlight.script.Script"+filename));
moonlightScript=MoonlightScript(eu.quanticol.moonlight.script.ScriptLoader.loadFromFile(which(filename)));
moonlightScript=MoonlightScript(io.github.moonlightsuite.moonlight.script.ScriptLoader.loadFromFile(which(filename)));
warning('on','all');
end
function moonlightScript = loadFromText(stringArray)
Expand All @@ -18,11 +18,11 @@
%
% stringArray = [
% "signal { real x; real y}",...
% "domain minmax;",...
% "domain minmax;",...
% "formula future = globally [0, 0.2] (x > y);"...
% "formula past = historically [0, 0.2] (x > y);"
% ];
moonlightScript=MoonlightScript(eu.quanticol.moonlight.script.ScriptLoader.loadFromCode(strjoin(stringArray,'\n')));
moonlightScript=MoonlightScript(io.github.moonlightsuite.moonlight.script.ScriptLoader.loadFromCode(strjoin(stringArray,'\n')));

% fileName = strcat("moonlight",extractBefore(char(java.util.UUID.randomUUID),"-"));
% monlightScriptPath=fullfile(tempdir,"moonlight",fileName+".mls");
Expand Down Expand Up @@ -66,4 +66,4 @@ function loadInnerFromText(filename,path)
warning('on','all');
end
end
end
end
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
classdef SpatialTemporalScriptComponent
% This is a wrapper around the Java class eu.quanticol.moonlight.SpatialTemporalScriptComponent
%
% This is a wrapper around the Java class io.github.moonlightsuite.moonlight.SpatialTemporalScriptComponent
%
% This class contains a method (i.e., monitor(...)) that can be used to
% monitor a specific spatial-temporal trajectory.
properties
Expand Down Expand Up @@ -45,7 +45,7 @@
javaGraphModel = self.toJavaGraphModel(graph);
javaSignal = self.toJavaSignal(values);
result=self.ScriptComponent.ScriptComponent.monitorToDoubleArrayAdjacencyList(time,javaGraphModel,time,javaSignal,parameters);
end
end
end
methods (Access = private)
function graph = toJavaGraphModel(~,diagram)
Expand Down Expand Up @@ -79,4 +79,4 @@
end
end
end
end
end
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
classdef TemporalScriptComponent
% This is a wrapper around the Java class eu.quanticol.moonlight.TemporalScriptComponent
%
% This is a wrapper around the Java class io.github.moonlightsuite.moonlight.TemporalScriptComponent
%
% This class contains a method (i.e., monitor(...)) that can be used to
% monitor a specific temporal trajectory.
properties
Expand Down Expand Up @@ -29,4 +29,4 @@
result=self.ScriptComponent.monitorToArray(time,values,parameters);
end
end
end
end
67 changes: 64 additions & 3 deletions engine/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import com.vanniktech.maven.publish.SonatypeHost

plugins {
id("eu.quanticol.java-library")
id("eu.quanticol.generate-docs")
id("eu.quanticol.publish") // for publishing the JAR online
id("io.github.moonlightsuite.java-library")
id("io.github.moonlightsuite.generate-docs")
id("io.github.moonlightsuite.publish") // for publishing the JAR online
id("com.vanniktech.maven.publish") version "0.25.2"
}

dependencies {
Expand All @@ -15,3 +18,61 @@ dependencies {
testImplementation("org.mockito:mockito-core:4.8.0")
testImplementation("org.jgrapht:jgrapht-core:1.5.1")
}


val PROJECT_VERSION = try {
providers.gradleProperty("projectVersion").get()
} catch (e: Exception) {
println("ERROR - Unable to find version: ${e.message}")
"0.1.0-SNAPSHOT"
}

val PROJECT_GROUP = providers.gradleProperty("project.group").get()

mavenPublishing {
coordinates(PROJECT_GROUP, rootProject.name, PROJECT_VERSION)

publishToMavenCentral(SonatypeHost.S01, automaticRelease = true)

signAllPublications()

pom {
name.set(rootProject.name)
description.set("MoonLight is a light-weight Java-tool for monitoring temporal, spatial and spatio-temporal properties of distributed complex systems, such as Cyber-Physical Systems and Collective Adaptive Systems.")
url.set("https://github.com/moonlightsuite/moonlight")
licenses {
license {
name.set("Apache License 2.0")
url.set("https://raw.githubusercontent.com/MoonLightSuite/MoonLight/master/LICENSE")
}
}
developers {
developer {
id.set("michele-loreti")
name.set("Michele Loreti")
email.set("[email protected]")
}
developer {
id.set("lauranenzi")
name.set("Laura Nenzi")
email.set("[email protected]")
}
developer {
id.set("ennioVisco")
name.set("Ennio Visconti")
email.set("[email protected]")
}
}
scm {
connection.set("scm:git:git://github.com/moonlightsuite/moonlight.git")
developerConnection.set("scm:git:ssh://github.com/moonlightsuite/moonlight.git")
url.set("https://github.com/moonlightsuite/moonlight")
}
}
}

afterEvaluate {
tasks.named("generateMetadataFileForMavenPublication") {
dependsOn("javaSourcesJar", "dokkaJavadocJar")
}
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package eu.quanticol.moonlight;
package io.github.moonlightsuite.moonlight;

import eu.quanticol.moonlight.domain.BooleanDomain;
import eu.quanticol.moonlight.domain.DoubleDomain;
import eu.quanticol.moonlight.core.signal.SignalDomain;
import io.github.moonlightsuite.moonlight.domain.BooleanDomain;
import io.github.moonlightsuite.moonlight.domain.DoubleDomain;
import io.github.moonlightsuite.moonlight.core.signal.SignalDomain;

public interface MoonLightScript {

Expand Down Expand Up @@ -36,4 +36,4 @@ default void setMinMaxDomain() {
}

SignalDomain<?> getMonitoringDomain();
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package eu.quanticol.moonlight;
package io.github.moonlightsuite.moonlight;

import eu.quanticol.moonlight.core.signal.SignalDomain;
import io.github.moonlightsuite.moonlight.core.signal.SignalDomain;

import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
Expand Down Expand Up @@ -93,4 +93,4 @@ public MoonLightSpatialTemporalScript spatialTemporal() {
return this;
}

}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package eu.quanticol.moonlight;
package io.github.moonlightsuite.moonlight;

import eu.quanticol.moonlight.core.signal.SignalDomain;
import io.github.moonlightsuite.moonlight.core.signal.SignalDomain;

import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.quanticol.moonlight;
package io.github.moonlightsuite.moonlight;

/**
* Used by foreign languages interfaces
Expand All @@ -12,4 +12,4 @@ public MoonLightTemporalScript getTemporalScript(MoonLightScript moonLightScript
public MoonLightSpatialTemporalScript getSpatialTemporalScript(MoonLightScript moonLightScript) {
return moonLightScript.spatialTemporal();
}
}
}
Loading

0 comments on commit 7c8aa6a

Please sign in to comment.