Skip to content

Improvement to local Workbench runtime #66

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
torisalvatore wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improvement to local Workbench runtime #66

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
e5266f3
Improvement to local Workbench runtime
torisalvatore Dec 18, 2020
c8cae51
Fix getNodeFileLocalAbsolutePath to not prepend artifacts path
torisalvatore Dec 18, 2020
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
58 changes: 25 additions & 33 deletions WorkbenchProject/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,47 +16,44 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.2</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<!-- Build an executable JAR -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.2</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
<mainClass>edu.uwb.braingrid.workbenchdashboard.WorkbenchDashboard</mainClass>
</manifest>
</archive>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.1</version>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
<goal>shade</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
<shadedArtifactAttached>true</shadedArtifactAttached>
<transformers>
<transformer implementation=
"org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>edu.uwb.braingrid.workbenchdashboard.WorkbenchDashboard</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
Expand All @@ -67,11 +64,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<dependencies>
<!-- <dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>1.1.0</version>
</dependency> -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
Expand Down
17 changes: 14 additions & 3 deletions ...oject/src/main/java/edu/uwb/braingrid/workbench/provvisualizer/controller/ProVisCtrl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,9 +530,20 @@ private void initNodeEdge(String provFileURI) {

while (iter.hasNext()) {
stmt = iter.nextStatement();
if (stmt.getSubject().toString().contains("local:"))
continue;
String predicateStr = stmt.getPredicate().toString();

if (stmt.getSubject().toString().contains("local:")) {
System.out.println("Continuing on stmt subject: " + stmt.getSubject().toString());
// continue;
}
String predicateStr = stmt.getPredicate().toString();

System.out.println("iterator stmt subject: " + stmt.getSubject().toString());
System.out.println("\t\tobject: " + stmt.getObject().toString());
System.out.println("\t\tpredicate: " + stmt.getObject().toString());

// TODO: Figure out why .xml files referenced in .ttl files have invalid paths. (Default to ~/<filename>.xml instead of their actual location in the working directory.)
// TODO: Figure out why output files aren't included in the provenance data

if (predicateStr.equals(ProvUtility.RDF_TYPE)) {
String subjectStr = stmt.getSubject().toString();
String objectStr = stmt.getObject().toString();
Expand Down
3 changes: 1 addition & 2 deletions ...Project/src/main/java/edu/uwb/braingrid/workbench/provvisualizer/utility/FileUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ public static String getNodeFileLocalRelativePath(Node node){
}

public static String getNodeFileLocalAbsolutePath(Node node){
return System.getProperty("user.dir") + File.separator + ARTIFACTS_DIR + File.separator +
getNodeFileLocalRelativePath(node);
return getNodeFileLocalRelativePath(node);
}

public static List<String> fileToLines(String filename) {
Expand Down
7 changes: 4 additions & 3 deletions WorkbenchProject/src/main/java/edu/uwb/braingrid/workbenchdashboard/WorkbenchDashboard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,12 @@ public void handle(KeyEvent arg0) {

});

URL is = Resources.getResource("braingrid/color-logo.png");
Image image = new Image(is.getFile());
// URL is = Resources.getResource("braingrid/color-logo.png");
// System.out.println(is.getPath());
// Image image = new Image(is.getFile());
primaryStage.setTitle("BrainGrid Workbench");

primaryStage.getIcons().add(image);
// primaryStage.getIcons().add(image);

primaryStage.setScene(scene);
primaryStage.setMaximized(true);
Expand Down