Skip to content

Commit fe3328a

Browse files
gouttegdgouttegd
authored
Merge pull request #1095 from gouttegd/release-5.6.0-new-launcher
Use universal launcher for 5.6.0
2 parents 7ea4dc4 + b9d9531 commit fe3328a

File tree

21 files changed

+73
-101
lines changed

21 files changed

+73
-101
lines changed

Diff for: ‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>edu.stanford.protege</groupId>
55
<artifactId>protege-parent</artifactId>
6-
<version>5.6.0-beta-1-SNAPSHOT</version>
6+
<version>5.6.0-beta-2-SNAPSHOT</version>
77
<packaging>pom</packaging>
88

99
<name>protege-parent</name>

Diff for: ‎protege-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>edu.stanford.protege</groupId>
77
<artifactId>protege-parent</artifactId>
8-
<version>5.6.0-beta-1-SNAPSHOT</version>
8+
<version>5.6.0-beta-2-SNAPSHOT</version>
99
<relativePath>../</relativePath>
1010
</parent>
1111

Diff for: ‎protege-desktop/pom.xml

+1-57
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>edu.stanford.protege</groupId>
66
<artifactId>protege-parent</artifactId>
7-
<version>5.6.0-beta-1-SNAPSHOT</version>
7+
<version>5.6.0-beta-2-SNAPSHOT</version>
88
<relativePath>../</relativePath>
99
</parent>
1010

@@ -145,62 +145,6 @@
145145
</execution>
146146
</executions>
147147
</plugin>
148-
<plugin>
149-
<groupId>com.akathist.maven.plugins.launch4j</groupId>
150-
<artifactId>launch4j-maven-plugin</artifactId>
151-
<version>2.1.3</version>
152-
<executions>
153-
<execution>
154-
<configuration>
155-
<headerType>gui</headerType>
156-
<outfile>target/Protege.exe</outfile>
157-
<dontWrapJar>true</dontWrapJar>
158-
<jar>bin/protege-launcher.jar</jar>
159-
<errTitle>Protege</errTitle>
160-
<icon>src/main/resources/app/Protege.ico</icon>
161-
<stayAlive>true</stayAlive>
162-
<chdir>.</chdir>
163-
<classPath>
164-
<mainClass>org.protege.osgi.framework.Launcher</mainClass>
165-
<addDependencies>false</addDependencies>
166-
<preCp>bundles/guava.jar;bundles/logback-classic.jar;bundles/logback-core.jar;bundles/slf4j-api.jar;bundles/glassfish-corba-orb.jar;bin/org.apache.felix.main.jar;bin/maven-artifact.jar;bin/protege-launcher.jar</preCp>
167-
</classPath>
168-
<jre>
169-
<path>jre</path>
170-
<minVersion>11.0.1</minVersion>
171-
<bundledJreAsFallback>false</bundledJreAsFallback>
172-
<bundledJre64Bit>true</bundledJre64Bit>
173-
<!-- <initialHeapSize>${conf.mem.xms}</initialHeapSize> -->
174-
<!-- <maxHeapSize>${conf.mem.xmx}</maxHeapSize> -->
175-
<opts>
176-
<!-- <opt>-Xss${conf.mem.xss}M</opt> -->
177-
<opt>${conf.extra.args}</opt>
178-
<opt>-DentityExpansionLimit=100000000</opt>
179-
<opt>-Dlogback.configurationFile=conf/logback-win.xml</opt>
180-
<opt>-Dfile.encoding=utf-8</opt>
181-
<opt>-Dorg.protege.plugin.dir=plugins</opt>
182-
</opts>
183-
</jre>
184-
<versionInfo>
185-
<fileVersion>5.0.0.0</fileVersion>
186-
<txtFileVersion>Protégé ${project.version}</txtFileVersion>
187-
<fileDescription>Protégé Ontology Editor</fileDescription>
188-
<copyright>Stanford University</copyright>
189-
<productVersion>5.0.0.0</productVersion>
190-
<txtProductVersion>Protégé ${project.version}</txtProductVersion>
191-
<productName>Protégé</productName>
192-
<internalName>Protege</internalName>
193-
<originalFilename>Protege.exe</originalFilename>
194-
</versionInfo>
195-
</configuration>
196-
<phase>package</phase>
197-
<goals>
198-
<goal>launch4j</goal>
199-
</goals>
200-
</execution>
201-
</executions>
202-
</plugin>
203-
204148

205149
<plugin>
206150
<artifactId>maven-assembly-plugin</artifactId>

Diff for: ‎protege-desktop/src/main/assembly/dependency-sets.xml

+2-10
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,11 @@
22
<dependencySets>
33

44
<dependencySet>
5-
<outputDirectory>bin</outputDirectory>
5+
<outputDirectory>bundles</outputDirectory>
66
<includes>
77
<include>edu.stanford.protege:protege-launcher:jar</include>
88
<include>org.apache.felix:org.apache.felix.main:jar</include>
99
<include>org.apache.maven:maven-artifact</include>
10-
</includes>
11-
<useStrictFiltering>true</useStrictFiltering>
12-
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
13-
</dependencySet>
14-
15-
<dependencySet>
16-
<outputDirectory>bundles</outputDirectory>
17-
<includes>
1810
<include>edu.stanford.protege:protege-common:jar</include>
1911
<include>edu.stanford.protege:protege-editor-core:jar</include>
2012
<include>org.eclipse.equinox:org.eclipse.equinox.registry:jar</include>
@@ -57,4 +49,4 @@
5749
</dependencySet>
5850

5951
</dependencySets>
60-
</component>
52+
</component>

Diff for: ‎protege-desktop/src/main/assembly/protege-linux.xml

+12-1
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,22 @@
2222
<outputDirectory>.</outputDirectory>
2323
<fileMode>0755</fileMode>
2424
<directoryMode>0755</directoryMode>
25-
<filtered>true</filtered>
25+
<excludes>
26+
<exclude>run.sh</exclude>
27+
</excludes>
2628
</fileSet>
2729

2830
</fileSets>
2931

32+
<files>
33+
<file>
34+
<source>src/main/env/linux/run.sh</source>
35+
<outputDirectory>.</outputDirectory>
36+
<fileMode>0755</fileMode>
37+
<filtered>true</filtered>
38+
</file>
39+
</files>
40+
3041
<dependencySets>
3142

3243
<dependencySet>

Diff for: ‎protege-desktop/src/main/assembly/protege-os-x.xml

+12-8
Original file line numberDiff line numberDiff line change
@@ -99,23 +99,27 @@
9999
<directory>src/main/resources</directory>
100100
<outputDirectory>${osx.bundle.name}/Contents</outputDirectory>
101101
<includes>
102-
<include>conf/*</include>
102+
<include>conf/**</include>
103103
</includes>
104104
</fileSet>
105105

106106

107107
<fileSet>
108-
<directory>src/main/env/os-x/bundle-resources</directory>
108+
<directory>src/main/env/os-x</directory>
109109
<outputDirectory>${osx.bundle.name}/Contents/</outputDirectory>
110+
<excludes>
111+
<exclude>Info.plist</exclude>
112+
</excludes>
110113
</fileSet>
111114

112-
<!-- This is done separately in order to use resource filtering to incorporate version info -->
113-
<fileSet>
114-
<directory>src/main/env/os-x/bundle-info</directory>
115+
</fileSets>
116+
117+
<files>
118+
<file>
119+
<source>src/main/env/os-x/Info.plist</source>
115120
<outputDirectory>${osx.bundle.name}/Contents/</outputDirectory>
116121
<filtered>true</filtered>
117-
</fileSet>
118-
119-
</fileSets>
122+
</file>
123+
</files>
120124

121125
</assembly>

Diff for: ‎protege-desktop/src/main/assembly/protege-win.xml

+11-9
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,21 @@
2222
<outputDirectory>.</outputDirectory>
2323
<fileMode>0755</fileMode>
2424
<directoryMode>0755</directoryMode>
25-
<filtered>true</filtered>
25+
<excludes>
26+
<exclude>run.bat</exclude>
27+
</excludes>
2628
</fileSet>
2729

28-
<fileSet>
29-
<directory>target</directory>
30+
</fileSets>
31+
32+
<files>
33+
<file>
34+
<source>src/main/env/win/run.bat</source>
3035
<outputDirectory>.</outputDirectory>
3136
<fileMode>0755</fileMode>
32-
<includes>
33-
<include>Protege.exe</include>
34-
</includes>
35-
</fileSet>
36-
37-
</fileSets>
37+
<filtered>true</filtered>
38+
</file>
39+
</files>
3840

3941
<dependencySets>
4042

Diff for: ‎protege-desktop/src/main/env/linux/protege

18.3 KB
Binary file not shown.

Diff for: ‎protege-desktop/src/main/env/linux/run.sh

+10-4
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,29 @@ done
99
cd "$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1010

1111
conf_file=
12-
if [ -f "$HOME/.protege/conf/jvm.conf" ]; then
13-
conf_file="$HOME/.protege/conf/jvm.conf"
12+
if [ -f "$HOME/.Protege/conf/jvm.conf" ]; then
13+
conf_file="$HOME/.Protege/conf/jvm.conf"
1414
elif [ -f conf/jvm.conf ]; then
1515
conf_file=conf/jvm.conf
1616
fi
1717

1818
EXTRA_JVM_OPTIONS=
19+
EFFECTIVE_JAVA_HOME=
1920
if [ -n "$conf_file" ]; then
2021
EXTRA_JVM_OPTIONS=$(sed -n 's/^max_heap_size=/-Xmx/p; s/^min_heap_size=/-Xms/p; s/^stack_size=/-Xss/p; s/^append=//p;' "$conf_file" | tr '\n' ' ')
22+
EFFECTIVE_JAVA_HOME=$(sed -n 's/^java_home=//p' "$conf_file")
2123
fi
2224

23-
jre/bin/java \
25+
[ -z "$EFFECTIVE_JAVA_HOME" ] && EFFECTIVE_JAVA_HOME="$PROTEGE_JAVA_HOME"
26+
[ -z "$EFFECTIVE_JAVA_HOME" -a ! -d jre ] && EFFECTIVE_JAVA_HOME="$JAVA_HOME"
27+
[ -z "$EFFECTIVE_JAVA_HOME" ] && EFFECTIVE_JAVA_HOME="jre"
28+
29+
$EFFECTIVE_JAVA_HOME/bin/java \
2430
-DentityExpansionLimit=100000000 \
2531
-Dlogback.configurationFile=conf/logback.xml \
2632
-Dfile.encoding=UTF-8 \
2733
${conf.extra.args} \
28-
-classpath bundles/guava.jar:bundles/logback-classic.jar:bundles/logback-core.jar:bundles/slf4j-api.jar:bundles/glassfish-corba-orb.jar:bin/org.apache.felix.main.jar:bin/maven-artifact.jar:bin/protege-launcher.jar \
34+
-classpath bundles/guava.jar:bundles/logback-classic.jar:bundles/logback-core.jar:bundles/slf4j-api.jar:bundles/glassfish-corba-orb.jar:bundles/org.apache.felix.main.jar:bundles/maven-artifact.jar:bundles/protege-launcher.jar \
2935
$CMD_OPTIONS $EXTRA_JVM_OPTIONS org.protege.osgi.framework.Launcher $1
3036

3137

Diff for: ‎protege-desktop/src/main/env/os-x/bundle-info/Info.plist renamed to ‎protege-desktop/src/main/env/os-x/Info.plist

File renamed without changes.

Diff for: ‎protege-desktop/src/main/env/os-x/MacOS/protege

84.4 KB
Binary file not shown.

Diff for: ‎protege-desktop/src/main/env/os-x/bundle-resources/Resources/Protege.icns renamed to ‎protege-desktop/src/main/env/os-x/Resources/Protege.icns

File renamed without changes.

Diff for: ‎protege-desktop/src/main/env/os-x/bundle-resources/MacOS/protege

-132 KB
Binary file not shown.

Diff for: ‎protege-desktop/src/main/env/platform-independent/run.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
setlocal
22
cd /d %~dp0
3-
java ${conf.extra.args} -DentityExpansionLimit=100000000 -Dlogback.configurationFile=conf/logback-win.xml -Dfile.encoding=utf-8 -Dorg.protege.plugin.dir=plugins -classpath bundles/guava.jar;bundles/logback-classic.jar;bundles/logback-core.jar;bundles/slf4j-api.jar;bundles/glassfish-corba-orb.jar;bin/org.apache.felix.main.jar;bin/maven-artifact.jar;bin/protege-launcher.jar org.protege.osgi.framework.Launcher %1
3+
java ${conf.extra.args} -DentityExpansionLimit=100000000 -Dlogback.configurationFile=conf/logback-win.xml -Dfile.encoding=utf-8 -Dorg.protege.plugin.dir=plugins -classpath bundles/guava.jar;bundles/logback-classic.jar;bundles/logback-core.jar;bundles/slf4j-api.jar;bundles/glassfish-corba-orb.jar;bundles/org.apache.felix.main.jar;bundles/maven-artifact.jar;bundles/protege-launcher.jar org.protege.osgi.framework.Launcher %1

Diff for: ‎protege-desktop/src/main/env/platform-independent/run.sh

+11-4
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,29 @@ done
99
cd "$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1010

1111
conf_file=
12-
if [ -f "$HOME/.protege/conf/jvm.conf" ]; then
13-
conf_file="$HOME/.protege/conf/jvm.conf"
12+
if [ -f "$HOME/.Protege/conf/jvm.conf" ]; then
13+
conf_file="$HOME/.Protege/conf/jvm.conf"
1414
elif [ -f conf/jvm.conf ]; then
1515
conf_file=conf/jvm.conf
1616
fi
1717

1818
EXTRA_JVM_OPTIONS=
19+
EFFECTIVE_JAVA_HOME=
1920
if [ -n "$conf_file" ]; then
2021
EXTRA_JVM_OPTIONS=$(sed -n 's/^max_heap_size=/-Xmx/p; s/^min_heap_size=/-Xms/p; s/^stack_size=/-Xss/p; s/^append=//p;' "$conf_file" | tr '\n' ' ')
22+
EFFECTIVE_JAVA_HOME=$(sed -n 's/^java_home=//p' "$conf_file")
2123
fi
2224

23-
java -Dlogback.configurationFile=conf/logback.xml \
25+
[ -z "$EFFECTIVE_JAVA_HOME" ] && EFFECTIVE_JAVA_HOME="$PROTEGE_JAVA_HOME"
26+
[ -z "$EFFECTIVE_JAVA_HOME" -a ! -d jre ] && EFFECTIVE_JAVA_HOME="$JAVA_HOME"
27+
[ -z "$EFFECTIVE_JAVA_HOME" ] && EFFECTIVE_JAVA_HOME="jre"
28+
29+
$EFFECTIVE_JAVA_HOME/bin/java \
2430
-DentityExpansionLimit=100000000 \
31+
-Dlogback.configurationFile=conf/logback.xml \
2532
-Dfile.encoding=UTF-8 \
2633
${conf.extra.args} \
27-
-classpath bundles/guava.jar:bundles/logback-classic.jar:bundles/logback-core.jar:bundles/slf4j-api.jar:bundles/glassfish-corba-orb.jar:bin/org.apache.felix.main.jar:bin/maven-artifact.jar:bin/protege-launcher.jar \
34+
-classpath bundles/guava.jar:bundles/logback-classic.jar:bundles/logback-core.jar:bundles/slf4j-api.jar:bundles/glassfish-corba-orb.jar:bundles/org.apache.felix.main.jar:bundles/maven-artifact.jar:bundles/protege-launcher.jar \
2835
$CMD_OPTIONS $EXTRA_JVM_OPTIONS org.protege.osgi.framework.Launcher $1
2936

3037

Diff for: ‎protege-desktop/src/main/env/win/Protege.exe

146 KB
Binary file not shown.

Diff for: ‎protege-desktop/src/main/env/win/Protege.l4j.ini

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
# Uncomment the following line to set the maximal heap size to 8GB
1+
# The preferred way to pass Java options to Protege is to use the
2+
# conf/jvm.conf file. The present file is ignored when conf/jvm.conf
3+
# is present.
4+
# To use this file, delete or rename the conf/jvm.conf file, then
5+
# append Java options below, one per line.
6+
# For example, to set the maximal heap size to 8GB, uncomment the
7+
# following line:
28
#-Xmx8G

Diff for: ‎protege-desktop/src/main/env/win/run.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
setlocal
22
cd /d %~dp0
3-
jre\bin\java ${conf.extra.args} -DentityExpansionLimit=100000000 -Dlogback.configurationFile=conf/logback-win.xml -Dfile.encoding=utf-8 -Dorg.protege.plugin.dir=plugins -classpath bundles/guava.jar;bundles/logback-classic.jar;bundles/logback-core.jar;bundles/slf4j-api.jar;bundles/glassfish-corba-orb.jar;bin/org.apache.felix.main.jar;bin/maven-artifact.jar;bin/protege-launcher.jar org.protege.osgi.framework.Launcher %1
3+
jre\bin\java ${conf.extra.args} -DentityExpansionLimit=100000000 -Dlogback.configurationFile=conf/logback-win.xml -Dfile.encoding=utf-8 -Dorg.protege.plugin.dir=plugins -classpath bundles/guava.jar;bundles/logback-classic.jar;bundles/logback-core.jar;bundles/slf4j-api.jar;bundles/glassfish-corba-orb.jar;bundles/org.apache.felix.main.jar;bundles/maven-artifact.jar;bundles/protege-launcher.jar org.protege.osgi.framework.Launcher %1

Diff for: ‎protege-editor-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>edu.stanford.protege</groupId>
77
<artifactId>protege-parent</artifactId>
8-
<version>5.6.0-beta-1-SNAPSHOT</version>
8+
<version>5.6.0-beta-2-SNAPSHOT</version>
99
<relativePath>../</relativePath>
1010
</parent>
1111

Diff for: ‎protege-editor-owl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>edu.stanford.protege</groupId>
77
<artifactId>protege-parent</artifactId>
8-
<version>5.6.0-beta-1-SNAPSHOT</version>
8+
<version>5.6.0-beta-2-SNAPSHOT</version>
99
<relativePath>../</relativePath>
1010
</parent>
1111

Diff for: ‎protege-launcher/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>edu.stanford.protege</groupId>
77
<artifactId>protege-parent</artifactId>
8-
<version>5.6.0-beta-1-SNAPSHOT</version>
8+
<version>5.6.0-beta-2-SNAPSHOT</version>
99
<relativePath>../</relativePath>
1010
</parent>
1111

0 commit comments

Comments
 (0)