Skip to content
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

Ms hedgehog start up #150

Merged
merged 63 commits into from
Mar 14, 2023
Merged

Ms hedgehog start up #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
2dc9eda
added windows specific options to the pom
Fim-84 Jun 10, 2022
d38ab49
Merge branch 'master' of github.com:unigrid-project/janus-java
Fim-84 Jun 10, 2022
0858838
MS: Created a WIP launcher using update4j
Fim-84 Jun 21, 2022
3a20c46
MS: Made a launcher service in janus
Fim-84 Jun 21, 2022
90bf0e8
MS: providing the service to update4j
Fim-84 Jun 21, 2022
f42a4a9
MS: Added a way for the launcher to start the wallet
Fim-84 Jun 21, 2022
53e0b6a
MS: Added update4j as dependency
Fim-84 Jun 21, 2022
4d99e24
MS: Started work on update check in the wallet
Fim-84 Jun 21, 2022
3d471e6
MS: fixed conflicts
Fim-84 Jun 21, 2022
66a7d98
MS: fixed conflicts
Fim-84 Jun 21, 2022
7b2061c
fixed conflicts
Fim-84 Jul 7, 2022
b140a48
fixed conflics
Fim-84 Jul 8, 2022
86ca089
MS: started work on thread for restart of application
Fim-84 Aug 8, 2022
f5a37aa
fixed conflicts
Fim-84 Aug 8, 2022
8bb22cf
MS: added a class for github jason. app restart on update detected. d…
Fim-84 Aug 11, 2022
2d005dc
MS: fixed conflicts
Fim-84 Aug 18, 2022
66482ea
MS: fixed conflicts
Fim-84 Aug 31, 2022
bfaca6a
misc
Fim-84 Sep 1, 2022
7877715
MS: fixed conflicts
Fim-84 Sep 2, 2022
4728aee
Merge branch 'master' of github.com:unigrid-project/janus-java
Fim-84 Sep 6, 2022
63d930b
MS: checkstyle cleanup
Fim-84 Sep 6, 2022
7318824
Merge branch 'master' of github.com:unigrid-project/janus-java
Fim-84 Sep 9, 2022
ba11512
Merge branch 'master' of github.com:unigrid-project/janus-java
Fim-84 Sep 9, 2022
8001eb2
misc
Fim-84 Sep 9, 2022
f1c2c52
MS: started adding a tray icon
Fim-84 Sep 12, 2022
2f27f3a
MS: fixed conflicts
Fim-84 Sep 14, 2022
90da13e
MS: fixed conflicts
Fim-84 Sep 20, 2022
cdd1b4a
MS: repairing pom for test
Fim-84 Sep 20, 2022
4e6914b
misc
Fim-84 Sep 20, 2022
6d2c248
misc
Fim-84 Sep 20, 2022
2197f02
ms: chenges in pom
Fim-84 Sep 20, 2022
de141cd
ms: fixed test
Fim-84 Sep 20, 2022
ab0d528
Ms realse changes (#116)
Fim-84 Sep 21, 2022
1c23373
fixed test and updated config
Fim-84 Sep 21, 2022
a647214
Merge branch 'master' of github.com:unigrid-project/janus-java
Fim-84 Sep 21, 2022
c41f883
MS: removed old project UpdateBootstrap so we dont work in the wrong …
Fim-84 Sep 21, 2022
c9690bf
Tt update wallet config (#118)
timnhanta Sep 22, 2022
cc1dd58
dixed conflicts
Fim-84 Sep 22, 2022
6a7e94c
Merge branch 'master' of github.com:unigrid-project/janus-java
Fim-84 Sep 22, 2022
e178bc7
fixed conflicts
Fim-84 Sep 23, 2022
f36b411
fixed a bug in update wallet
Fim-84 Sep 23, 2022
c7cf8f4
fixed conflicts
Fim-84 Sep 28, 2022
7af43f7
Fixed conflicts
Fim-84 Sep 28, 2022
4ca4cfe
MS: misc
Fim-84 Oct 3, 2022
88782f9
MS: removed force update of bootstrap on close for now
Fim-84 Oct 4, 2022
c175738
MS: fixed conflits
Fim-84 Oct 7, 2022
407fe1d
MS: changed the copied value for the grid node to include index
Fim-84 Oct 7, 2022
1d08309
Merge branch 'master' of github.com:unigrid-project/janus-java
Fim-84 Oct 10, 2022
7bef9f0
Merge branch 'master' of github.com:unigrid-project/janus-java
Fim-84 Oct 14, 2022
9e4f90a
Merge branch 'master' of github.com:unigrid-project/janus-java
Fim-84 Dec 5, 2022
d47afc4
MS: Added functions to start hedgehog befor unigridd and add hadgehog…
Fim-84 Feb 7, 2023
3e14d03
MS: changed hedgehog starting commands to the new standard
Fim-84 Feb 14, 2023
c6247a9
MS: Added testnet as an starting option when starting from commandlin…
Fim-84 Feb 14, 2023
9571f05
MS: dont need to look for unigrid.conf in the test net folder
Fim-84 Feb 14, 2023
8b7bb56
MS: uppdated config to handel hedgehog naming and version.
Fim-84 Mar 1, 2023
e579be6
MS: fixed a bug when debugservice was talking to the GUI when it was …
Fim-84 Mar 3, 2023
a83f9aa
MS: Refactoring of updateWallet
Fim-84 Mar 9, 2023
e0b8a28
MS: changed URL for hedgehog git to the correct one
Fim-84 Mar 10, 2023
1efe637
Merge branch 'master' of github.com:unigrid-project/janus-java
Fim-84 Mar 10, 2023
397b9c8
MS: fixed bug and fixed issues in merge
Fim-84 Mar 14, 2023
25c0e06
MS: version change
Fim-84 Mar 14, 2023
ad4cfa7
MS: changed hedgehog url to make build go throu. change when hedgehog…
Fim-84 Mar 14, 2023
d05a291
MS: misc
Fim-84 Mar 14, 2023
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
309 changes: 159 additions & 150 deletions bootstrap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,153 +1,162 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>parent</artifactId>
<groupId>org.unigrid.janus</groupId>
<version>1.0.11-SNAPSHOT</version>
</parent>
<version>1.0.9-SNAPSHOT</version>
<groupId>org.unigrid</groupId>
<artifactId>bootstrap</artifactId>
<name>Unigrid Janus Bootstrap</name>
<packaging>jar</packaging>
<properties>
<mainClass>org.unigrid.bootstrap.App</mainClass>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>17-ea+7</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
<version>17-ea+7</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>17-ea+7</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-media</artifactId>
<version>17-ea+7</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-swing</artifactId>
<version>17-ea+7</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-swing</artifactId>
<version>17-ea+7</version>
</dependency>
<dependency>
<groupId>org.update4j</groupId>
<artifactId>update4j</artifactId>
<version>1.5.9</version>
</dependency>
<dependency>
<groupId>io.sentry</groupId>
<artifactId>sentry</artifactId>
<version>6.4.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
<version>1.49</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.jqwik</groupId>
<artifactId>jqwik</artifactId>
<version>1.6.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolvedbinary.j8fu</groupId>
<artifactId>j8fu</artifactId>
<version>1.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<version>4.0.3.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.2.0</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<configuration>
<mainClass>org.unigrid.bootstrap.App</mainClass>
<commandlineArgs>test=true</commandlineArgs>
</configuration>
<executions>
<execution>
<id>default-cli</id>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
-javaagent:"${settings.localRepository}"/org/jmockit/jmockit/1.49/jmockit-1.49.jar
-Dcoverage-classes=loaded
--add-opens org.unigrid.bootstrap/org.unigrid.bootstrap=ALL-UNNAMED
--add-exports org.unigrid.bootstrap/org.unigrid.bootstrap.jqwik=ALL-UNNAMED
</argLine>

</configuration>
</plugin>
<!--<plugin>
<groupId>org.tentackle</groupId>
<artifactId>tentackle-jlink-maven-plugin</artifactId>
<configuration>
<mainClass>${mainClass}</mainClass>
<stripDebug>true</stripDebug>
<excludeModules>jdk.jfr</excludeModules>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jpackage</goal>
</goals>
</execution>
</executions>
</plugin>-->
</plugins>
</build>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>parent</artifactId>
<groupId>org.unigrid.janus</groupId>
<version>1.0.11-SNAPSHOT</version>
</parent>
<groupId>org.unigrid</groupId>
<artifactId>bootstrap</artifactId>
<name>Unigrid Janus Bootstrap</name>
<version>1.0.10-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<mainClass>org.unigrid.bootstrap.App</mainClass>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>17-ea+7</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
<version>17-ea+7</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>17-ea+7</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-media</artifactId>
<version>17-ea+7</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-swing</artifactId>
<version>17-ea+7</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-swing</artifactId>
<version>17-ea+7</version>
</dependency>
<dependency>
<groupId>org.update4j</groupId>
<artifactId>update4j</artifactId>
<version>1.5.9</version>
</dependency>
<dependency>
<groupId>io.sentry</groupId>
<artifactId>sentry</artifactId>
<version>6.4.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
<version>1.49</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.jqwik</groupId>
<artifactId>jqwik</artifactId>
<version>1.6.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.evolvedbinary.j8fu</groupId>
<artifactId>j8fu</artifactId>
<version>1.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<version>4.0.3.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.2.0</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<configuration>
<mainClass>org.unigrid.bootstrap.App</mainClass>
<commandlineArgs>test=true</commandlineArgs>
</configuration>
<executions>
<execution>
<id>default-cli</id>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
-javaagent:"${settings.localRepository}"/org/jmockit/jmockit/1.49/jmockit-1.49.jar
-Dcoverage-classes=loaded
--add-opens org.unigrid.bootstrap/org.unigrid.bootstrap=ALL-UNNAMED
--add-exports org.unigrid.bootstrap/org.unigrid.bootstrap.jqwik=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
<!--<plugin>
<groupId>org.tentackle</groupId>
<artifactId>tentackle-jlink-maven-plugin</artifactId>
<configuration>
<mainClass>${mainClass}</mainClass>
<stripDebug>true</stripDebug>
<excludeModules>jdk.jfr</excludeModules>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jpackage</goal>
</goals>
</execution>
</executions>
</plugin>-->
</plugins>
<!--<resources>
<resource>
<directory>src/main/resources-filtered</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
</resource>
</resources>-->
</build>
</project>
19 changes: 13 additions & 6 deletions bootstrap/src/main/java/org/unigrid/bootstrap/UpdateView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ public Stage getStage() {
public void setConfig(Configuration config, Stage primaryStage, Map<String, String> input, HostServices hostServices) {
this.config = config;
this.primaryStage = primaryStage;
Properties myProperties = new Properties();
final Properties properties = new Properties();

try {
myProperties.load(App.class.getResourceAsStream("application.properties"));
bootstrapVersion = Objects.requireNonNull((String) myProperties.get("proj.ver")).replace("-SNAPSHOT", "");
properties.load(getClass().getResourceAsStream("application.properties"));
bootstrapVersion = Objects.requireNonNull(properties.getProperty("proj.ver"));
System.out.println("bootstrap version: " + bootstrapVersion);
} catch (IOException e) {
System.out.println(e.getMessage());
Expand Down Expand Up @@ -284,7 +284,7 @@ private boolean daemonDirExists() {
String onlineFileName = "";
System.out.println("is this working!!!!");
for (FileMetadata file : files) {
if (!file.isModulepath()) {
if (!file.getPath().getFileName().toString().contains("unigrid")) {
String s = file.getUri().toString();
String[] arr = s.split("/");
onlineFileName = arr[arr.length - 1];
Expand All @@ -304,7 +304,8 @@ private void untarDaemonLinux() {
String untarName = "";

for (FileMetadata file : files) {
if (!file.isModulepath()) {
if (file.getPath().toString().contains(".tar.gz")) {
System.out.println(file.getPath().toString());
String s = file.getUri().toString();
String[] arr = s.split("/");
untarName = arr[arr.length - 1];
Expand All @@ -323,7 +324,13 @@ private void untarDaemonLinux() {
if (a.isDirectory()) {
File[] unigrid = a.listFiles();
for (File b : unigrid) {
if (b == null || !b.exists()) {
break;
}
File[] bintar = b.listFiles();
if (bintar == null || bintar.length < 1) {
break;
}
for (File file : bintar) {
file.delete();
}
Expand Down Expand Up @@ -389,7 +396,7 @@ private void unzipDaemonWindows() {
String untarName = "";

for (FileMetadata file : files) {
if (!file.isModulepath()) {
if (file.getPath().toString().contains(".zip")) {
String s = file.getUri().toString();
String[] arr = s.split("/");
untarName = arr[arr.length - 1];
Expand Down
2 changes: 1 addition & 1 deletion checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>

<module name="FinalClass"/>
<!--<module name="FinalClass"/>-->
<module name="InterfaceIsType"/>
<module name="VisibilityModifier"/>

Expand Down
Loading