Rejigged distribution

- Changed directory structure
- Removed some felix jars (that aren’t used)
- Removed felix source
- Split scripts into separate directories (to target specific platforms
in the build)
Esse commit está contido em:
Matthew Horridge
2015-03-16 16:05:08 -07:00
commit 04b4c3e0c0
28 arquivos alterados com 14 adições e 344 exclusões
@@ -1,86 +0,0 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>app</id>
<formats>
<format>dir</format>
</formats>
<baseDirectory>Protege.app</baseDirectory>
<fileSets>
<fileSet>
<outputDirectory>.</outputDirectory>
<includes>
<include>**</include>
</includes>
<directory>src/main/config/distributions/Protege.app</directory>
</fileSet>
<fileSet>
<outputDirectory>Contents/Resources/Java</outputDirectory>
<includes>
<include>*</include>
</includes>
<directory>src/main/config/distributions/felix/bin</directory>
</fileSet>
<fileSet>
<outputDirectory>Contents/Resources/Java/bundle</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
<directory>src/main/config/distributions/common</directory>
</fileSet>
<fileSet>
<outputDirectory>Contents/Resources/Java/bundle</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
<directory>src/main/config/distributions/felix/bundles</directory>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>Contents/Resources/Java</outputDirectory>
<includes>
<include>edu.stanford.protege:ProtegeLauncher:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
<dependencySet>
<outputDirectory>Contents/Resources/Java/bundle</outputDirectory>
<includes>
<include>edu.stanford.protege:org.protege.common:jar</include>
<include>edu.stanford.protege:org.protege.editor.core.application:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
<dependencySet>
<outputDirectory>Contents/Resources/Java/plugins</outputDirectory>
<includes>
<include>net.sourceforge.owlapi:owlapi-osgidistribution:jar</include>
<include>edu.stanford.protege:ca.uvic.cs.chisel.cajun:jar</include>
<include>edu.stanford.protege:org.coode.dlquery:jar</include>
<include>edu.stanford.protege:org.coode.owlviz:jar</include>
<include>edu.stanford.protege:org.protege.editor.owl:jar</include>
<include>edu.stanford.protege:org.protege.editor.owl.codegeneration:jar</include>
<include>edu.stanford.protege:org.protege.editor.owl.diff:jar</include>
<include>edu.stanford.protege:org.protege.editor.owl.rdf:jar</include>
<include>edu.stanford.protege:org.protege.explanation:jar</include>
<include>edu.stanford.protege:org.protege.integration.hermit:jar</include>
<include>edu.stanford.protege:org.protege.ontograf:jar</include>
<include>edu.stanford.protege:org.protege.owl.diff:jar</include>
<include>edu.stanford.protege:org.protege.owl.rdf:jar</include>
<include>com.google.guava:guava:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
</dependencySets>
</assembly>
@@ -9,57 +9,40 @@
<baseDirectory>Protege-${project.version}</baseDirectory>
<fileSets>
<fileSet>
<directory>src/main/felix</directory>
<outputDirectory>.</outputDirectory>
<includes>
<include>*</include>
<include>**/*</include>
</includes>
<excludes>
<exclude>run.command</exclude>
<exclude>run.sh</exclude>
</excludes>
<directory>src/main/config/distributions/felix</directory>
</fileSet>
<fileSet>
<outputDirectory>bin</outputDirectory>
<directory>src/main/logging</directory>
<outputDirectory>.</outputDirectory>
<includes>
<include>*</include>
<include>**/*</include>
</includes>
<directory>src/main/config/distributions/felix/bin</directory>
</fileSet>
<fileSet>
<outputDirectory>bundles</outputDirectory>
<includes>
<include>org.apache.felix.bundlerepository-1.4.2.jar</include>
</includes>
<directory>src/main/config/distributions/felix/bundles</directory>
</fileSet>
<fileSet>
<outputDirectory>bundles</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
<directory>src/main/config/distributions/common</directory>
</fileSet>
</fileSets>
<files>
<file>
<source>src/main/config/distributions/felix/run.sh</source>
<source>src/main/scripts/nix/run.sh</source>
<outputDirectory>.</outputDirectory>
<fileMode>744</fileMode>
</file>
<file>
<source>src/main/config/distributions/felix/run.command</source>
<source>src/main/scripts/osx/run.command</source>
<outputDirectory>.</outputDirectory>
<fileMode>744</fileMode>
</file>
<file>
<source>src/main/config/distributions/Protege.app/Contents/Resources/Protege.icns</source>
<source>src/main/scripts/win/run.bat</source>
<outputDirectory>.</outputDirectory>
<fileMode>744</fileMode>
</file>
</files>
@@ -1,71 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleAllowMixedLocalizations</key>
<string>true</string>
<key>CFBundleShortVersionString</key>
<string>@shortVersion@</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>owl</string>
</array>
<key>CFBundleTypeName</key>
<string>OWL Ontology</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
</array>
<key>CFBundleExecutable</key>
<string>JavaApplicationStub</string>
<key>CFBundleIconFile</key>
<string>Protege</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Protege</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>100.0</string>
<key>Java</key>
<dict>
<key>ClassPath</key>
<string>Contents/Resources/Java/felix.jar:Contents/Resources/Java/ProtegeLauncher.jar</string>
<key>JVMVersion</key>
<string>1.5+</string>
<key>MainClass</key>
<string>org.protege.osgi.framework.Launcher</string>
<key>Properties</key>
<dict>
<key>org.protege.launch.config</key>
<string>Contents/Resources/config.xml</string>
<key>com.apple.mrj.application.growbox.intrudes</key>
<string>true</string>
<key>apple.laf.useScreenMenuBar</key>
<string>true</string>
<key>file.encoding</key>
<string>UTF-8</string>
<key>log4j.configuration</key>
<string>file:Contents/Resources/log4j.xml</string>
<key>entityExpansionLimit</key>
<string>100000000</string>
</dict>
<key>VMOptions</key>
<array>
<string>-server</string>
<string>-Xms250M</string>
<string>-Xmx500M</string>
</array>
<key>WorkingDirectory</key>
<string>$APP_PACKAGE</string>
</dict>
</dict>
</plist>
@@ -1,42 +0,0 @@
<?xml version = "1.0" encoding = "UTF-8"?>
<launch>
<systemProperties>
<property name="org.protege.plugin.dir" value="Contents/Resources/Java/plugins"/>
</systemProperties>
<frameworkProperties>
<property name="org.osgi.framework.bootdelegation" value="sun.*,com.sun.*,apple.*,com.apple.*"/>
<property name="org.osgi.framework.system.packages.extra"
value="javax.xml.parsers,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers"/>
<property name="org.osgi.framework.storage.clean"
value="onFirstInit"/>
</frameworkProperties>
<bundles>
<search path="Contents/Resources/Java/bundle"/>
<search path="${user.home}/.Protege/bundles"/>
<bundle name="org.protege.common.jar"/>
</bundles>
<bundles verbose = "true">
<search path="Contents/Resources/Java/bundle"/>
<search path="${user.home}/.Protege/bundles"/>
<bundle name="org.eclipse.equinox.common.jar"/>
<bundle name="org.eclipse.equinox.supplement.jar"/>
</bundles>
<bundles verbose = "true">
<search path="Contents/Resources/Java/bundle"/>
<search path="${user.home}/.Protege/bundles"/>
<bundle name="org.eclipse.equinox.registry.jar"/>
<bundle name="org.protege.jaxb.jar"/>
<bundle name="org.protege.editor.core.application.jar"/>
<bundle name="org.apache.felix.configadmin.jar"/>
<bundle name="org.apache.felix.scr.jar"/>
</bundles>
<bundles>
<search path="Contents/Resources/Java/plugins"/>
<search path="${user.home}/.Protege/plugins"/>
</bundles>
</launch>
@@ -1,40 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
<appender name="console" class="org.apache.log4j.ConsoleAppender">
<param name="Threshold" value="INFO"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%m%n"/>
</layout>
</appender>
<appender name="file"
class="org.protege.common.log.ProtegeRotatingAppender">
<param name="rotationCount" value="7"/>
<param name="directory" value="logs"/>
<param name="relativeFile" value="protege-%u.log"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%-5p %m %2C[%t]%n"/>
</layout>
</appender>
<category name="org.mindswap.pellet">
<priority value="error"/>
</category>
<!-- fear not, there is not too much here and it will be
useful for a bit -->
<category name="org.protege.editor.core.ProtegeApplication">
<priority value="debug"/>
</category>
<root>
<priority value ="info" />
<appender-ref ref="console" />
<appender-ref ref="file" />
</root>
</log4j:configuration>
@@ -1,8 +0,0 @@
protege.osgi=${protege.home}/Contents/Resources/Java/felix.jar
bundlor=${protege.home}/Contents/Resources/Java/bundlor.jar
dev.tools=${protege.home}/Contents/Resources/Java/dev-tools.jar
protege.common=${protege.home}/Contents/Resources/Java/bundle
protege.plugins=${protege.home}/Contents/Resources/Java/plugins
protege.launcher=${protege.home}/Contents/Resources/Java/ProtegeLauncher.jar
run.config=${protege.home}/Contents/Resources/config.xml
@@ -1,50 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
<appender name="console" class="org.apache.log4j.ConsoleAppender">
<param name="Threshold" value="INFO"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%m%n"/>
</layout>
</appender>
<appender name="file"
class="org.protege.common.log.ProtegeRotatingAppender">
<param name="rotationCount" value="7"/>
<param name="directory" value="logs"/>
<param name="relativeFile" value="protege-%u.log"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%-5p %m %2C[%t]%n"/>
</layout>
</appender>
<category name="org.mindswap.pellet">
<priority value="error"/>
</category>
<!-- fear not, there is not too much here and it will be
useful for a bit -->
<category name="org.protege.editor.core.ProtegeApplication">
<priority value="debug"/>
</category>
<root>
<priority value ="info" />
<appender-ref ref="console" />
<appender-ref ref="file" />
</root>
<!-- To debug automatic updates and commits from client
<category name="org.protege.owl.server.connection.servlet.ServletClientConnection">
<priority value="debug"/>
</category>
<category name="org.protege.editor.owl.client.ClientOntologyBuilder">
<priority value="debug"/>
</category>
-->
</log4j:configuration>
@@ -1,10 +0,0 @@
#!/bin/sh
java \
-classpath Contents/Resources/Java/felix.jar:Contents/Resources/Java/ProtegeLauncher.jar \
-Dorg.protege.launch.config=Contents/Resources/config.xml \
-Dfile.encoding=UTF-8 -Dlog4j.configuration=file:Contents/Resources/log4j.xml \
-Dcom.apple.mrj.application.growbox.intrudes=true \
-DentityExpansionLimit=1000000 \
-Xmx5G -Xms1G \
org.protege.osgi.framework.Launcher
@@ -1,7 +0,0 @@
protege.osgi=${protege.home}/bin/felix.jar
bundlor=${protege.home}/bin/bundlor.jar
dev.tools=${protege.home}/bin/dev-tools.jar
protege.launcher=${protege.home}/bin/ProtegeLauncher.jar
protege.common=${protege.home}/bundles
protege.plugins=${protege.home}/plugins
@@ -32,8 +32,6 @@
<bundle name="org.eclipse.equinox.registry.jar"/>
<bundle name="org.protege.jaxb.jar"/>
<bundle name="org.protege.editor.core.application.jar"/>
<bundle name="org.apache.felix.configadmin.jar"/>
<bundle name="org.apache.felix.scr.jar"/>
</bundles>
<bundles>
<search path="plugins"/>
@@ -1,3 +1,7 @@
cd "$(dirname "$0")"
CMD_OPTIONS="-Dapple.laf.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=Protege -Xdock:name=Protege -Xdock:icon=Protege.icns" sh run.sh