You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/02/28 18:02:47 UTC
[5/5] git commit: trying to get the installer back working
Updated Branches:
refs/heads/master ee2b9fc54 -> f76727444
trying to get the installer back working
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/f7672744
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f7672744
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f7672744
Branch: refs/heads/master
Commit: f767274448ba3472c4c734ff9ff7aead81cd7a01
Parents: c755b2b
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Feb 28 18:02:13 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Feb 28 18:02:13 2013 +0100
----------------------------------------------------------------------
launchers/marmotta-installer/pom.xml | 73 ++-----
.../src/main/resources/images/bck.png | Bin 0 -> 260306 bytes
.../src/main/resources/images/lmfbck.png | Bin 260306 -> 0 bytes
.../src/main/resources/installer/standalone.xml | 64 +++----
.../Start Apache Marmotta.app/Contents/Info.plist | 35 +++
.../Contents/MacOS/run.sh | 2 +
.../macos/Start LMF Server.app/Contents/Info.plist | 35 ---
.../Start LMF Server.app/Contents/MacOS/run.sh | 2 -
.../Stop Apache Marmotta.app/Contents/Info.plist | 35 +++
.../Stop Apache Marmotta.app/Contents/MacOS/run.sh | 2 +
.../macos/Stop LMF Server.app/Contents/Info.plist | 35 ---
.../Stop LMF Server.app/Contents/MacOS/run.sh | 2 -
.../src/main/resources/panels/installerInfo.html | 21 +-
.../src/main/resources/refpacks/refine.xml | 29 ---
.../src/main/resources/tomcat/index.jsp | 168 ---------------
15 files changed, 129 insertions(+), 374 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml
index 97bc525..3faaa29 100644
--- a/launchers/marmotta-installer/pom.xml
+++ b/launchers/marmotta-installer/pom.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2013 Salzburg Research.
- ~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
@@ -36,18 +34,12 @@
<stagingDir>${project.build.directory}/installer</stagingDir>
<!-- these are replaced in installer files -->
- <TOMCAT_VERSION>7.0.35</TOMCAT_VERSION>
- <LMF_VERSION>${project.version}</LMF_VERSION>
- <LMF_ROOT>${project.basedir}/../</LMF_ROOT>
+ <TOMCAT_VERSION>7.0.37</TOMCAT_VERSION>
+ <MARMOTTA_VERSION>${project.version}</MARMOTTA_VERSION>
+ <MARMOTTA_ROOT>${project.basedir}/../../</MARMOTTA_ROOT>
</properties>
- <repositories>
- <repository>
- <id>snml</id>
- <name>Salzburg NewMediaLab Repository</name>
- <url>http://devel.kiwi-project.eu:8080/nexus/content/groups/public/</url>
- </repository>
- </repositories>
+ <!-- custom repor for the maven-download-plugin that would need to be removed -->
<pluginRepositories>
<pluginRepository>
<id>snml</id>
@@ -63,7 +55,6 @@
-->
<finalName>${project.artifactId}</finalName>
<plugins>
-
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
@@ -80,20 +71,17 @@
</build>
<dependencies>
-
<dependency>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-standalone-compiler</artifactId>
<version>${izpackVersion}</version>
</dependency>
-
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
-
</dependencies>
<profiles>
@@ -134,10 +122,6 @@
<targetPath>tomcat</targetPath>
</resource>
<resource>
- <directory>src/main/resources/refine</directory>
- <targetPath>refine</targetPath>
- </resource>
- <resource>
<directory>src/main/resources/images</directory>
<targetPath>images</targetPath>
</resource>
@@ -149,16 +133,17 @@
<directory>src/main/resources/log</directory>
<targetPath>log</targetPath>
</resource>
+ <!--
<resource>
<directory>src/main/resources/refpacks</directory>
<targetPath>refpacks</targetPath>
</resource>
+ -->
</resources>
</configuration>
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.marmotta</groupId>
<artifactId>refpack-maven-plugin</artifactId>
@@ -179,7 +164,6 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -211,11 +195,10 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>maven-download-plugin</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<executions>
<execution>
<id>download-tomcat</id>
@@ -227,52 +210,35 @@
<url>http://www.eu.apache.org/dist/tomcat/tomcat-7/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.zip</url>
<unpack>false</unpack>
<outputDirectory>${project.build.directory}</outputDirectory>
- <md5>1c7a7869d86b74dddb0a22d15f020922</md5>
- </configuration>
- </execution>
- <execution>
- <id>download-refine</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
- <url>http://devel.kiwi-project.eu:8080/nexus/content/repositories/snapshots/com/google/refine/2.6.LMF-SNAPSHOT/refine-2.6.LMF-20121029.114459-1.war</url>
- <unpack>false</unpack>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <outputFileName>refine.war</outputFileName>
- <md5>08e913ae01c7ecca1682f8175d9a1956</md5>
+ <md5>796244156a8d932c8eb75fd05ac2b31e</md5>
</configuration>
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
- <id>izpack</id>
- <phase>package</phase>
- <configuration>
- <target>
- <taskdef name="IzPack" classname="com.izforge.izpack.ant.IzPackTask" classpathref="maven.plugin.classpath" />
- <IzPack input="${stagingDir}/standalone.xml" output="${project.build.directory}/${project.artifactId}-${project.version}.jar" installerType="standard" basedir="${stagingDir}" IzPackDir="${stagingDir}/" />
- </target>
- </configuration>
+ <id>create-empty-directories</id>
+ <phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${stagingDir}/refpacks" />
+ </tasks>
+ </configuration>
</execution>
<execution>
- <id>googlecode</id>
- <phase>deploy</phase>
+ <id>izpack</id>
+ <phase>package</phase>
<configuration>
<target>
- <taskdef name="gcupload" classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask" classpathref="maven.plugin.classpath" />
- <!--suppress MavenModelInspection -->
- <gcupload projectname="lmf" username="${google.username}" password="${google.password}" filename="${project.build.directory}/lmf-installer-${project.version}.jar" targetfilename="lmf-installer-${project.version}.jar" summary="LMF ${project.version} Standalone Installer (includes Apache Tomcat, LMF, Google Refine, and Apache Stanbol)" labels="Featured, Type-Installer, OpSys-All" />
+ <taskdef name="IzPack" classname="com.izforge.izpack.ant.IzPackTask" classpathref="maven.plugin.classpath" />
+ <IzPack input="${stagingDir}/standalone.xml" output="${project.build.directory}/${project.artifactId}-${project.version}.jar" installerType="standard" basedir="${stagingDir}" IzPackDir="${stagingDir}/" />
</target>
</configuration>
<goals>
@@ -298,7 +264,6 @@
</dependency>
</dependencies>
</plugin>
-
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/src/main/resources/images/bck.png
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/images/bck.png b/launchers/marmotta-installer/src/main/resources/images/bck.png
new file mode 100755
index 0000000..c586cb0
Binary files /dev/null and b/launchers/marmotta-installer/src/main/resources/images/bck.png differ
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/src/main/resources/images/lmfbck.png
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/images/lmfbck.png b/launchers/marmotta-installer/src/main/resources/images/lmfbck.png
deleted file mode 100755
index c586cb0..0000000
Binary files a/launchers/marmotta-installer/src/main/resources/images/lmfbck.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/src/main/resources/installer/standalone.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/installer/standalone.xml b/launchers/marmotta-installer/src/main/resources/installer/standalone.xml
index d92baaf..04a2cde 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/standalone.xml
+++ b/launchers/marmotta-installer/src/main/resources/installer/standalone.xml
@@ -24,13 +24,12 @@
<variables>
<variable name="TOMCAT_VERSION" value="${TOMCAT_VERSION}"/>
- <variable name="LMF_VERSION" value="${LMF_VERSION}"/>
+ <variable name="MARMOTTA_VERSION" value="${MARMOTTA_VERSION}"/>
</variables>
<info>
- <appname>Linked Media Framework</appname>
- <appversion>${LMF_VERSION}</appversion>
- <appsubpath>LMF</appsubpath>
- <url>http://lmf.googlecode.com</url>
+ <appname>Apache Marmotta</appname>
+ <appversion>${MARMOTTA_VERSION}</appversion>
+ <url>http://marmotta.incubator.apache.org</url>
<authors>
<author name="Sebastian Schaffert" email="sebastian.schaffert@salzburgresearch.at"/>
<author name="Thomas Kurz" email="thomas.kurz@salzburgresearch.at"/>
@@ -57,8 +56,8 @@
<res src="panels/COPYING" id="LicencePanel.licence" />
<res src="shortcuts/shortcutSpec.xml" id="shortcutSpec.xml" />
<res src="shortcuts/Unix_shortcutSpec.xml" id="Unix_shortcutSpec.xml" />
- <res src="images/lmfbck.png" id="lmfbck" />
- <res src="${LMF_ROOT}/lmf-core/src/main/resources/web/public/img/logo/lmf-logo.png" id="lmflogo" />
+ <res src="images/bck.png" id="bck" />
+ <res src="${MARMOTTA_ROOT}/platform/marmotta-core/src/main/resources/web/public/img/logo/marmotta-logo.png" id="logo" />
<res src="panels/installerInfo.html" id="HTMLHelloPanel.info" />
</resources>
<panels>
@@ -73,8 +72,8 @@
</panels>
<packs>
<pack name="Apache Tomcat ${TOMCAT_VERSION}" required="yes">
- <description>Apache Tomcat ${TOMCAT_VERSION}, the application server used to run the Linked Media Framework</description>
- <file src="${LMF_ROOT}/lmf-installer/target/apache-tomcat-${TOMCAT_VERSION}.zip" targetdir="\$INSTALL_PATH" unpack="true"/>
+ <description>Apache Tomcat ${TOMCAT_VERSION}, the application server used to run Marmotta</description>
+ <file src="${MARMOTTA_ROOT}/launchers/marmotta-installer/target/apache-tomcat-${TOMCAT_VERSION}.zip" targetdir="\$INSTALL_PATH" unpack="true"/>
<file src="tomcat/server.xml" targetdir="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/conf" override="true"/>
<file src="tomcat/setenv.sh" targetdir="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/bin"/>
<file src="tomcat/setenv.bat" targetdir="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/bin"/>
@@ -84,44 +83,35 @@
<file src="images/icon_stop.png" targetdir="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/icons"/>
<file src="images/splashscreen.png" targetdir="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/icons"/>
<file src="log/catalina.out" targetdir="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/logs"/>
- <file src="${LMF_ROOT}/lmf-splash/target/lmf-splash-${LMF_VERSION}.jar" targetdir="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/lib"/>
- <file src="tomcat/index.jsp" targetdir="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/webapps/ROOT" override="true"/>
- <file src="macos/Start LMF Server.app" targetdir="\$INSTALL_PATH" os="mac" />
- <file src="images/icon_start.icns" targetdir="\$INSTALL_PATH/Start LMF Server.app/Contents/Resources" os="mac" />
- <file src="macos/Stop LMF Server.app" targetdir="\$INSTALL_PATH" os="mac" />
- <file src="images/icon_stop.icns" targetdir="\$INSTALL_PATH/Stop LMF Server.app/Contents/Resources" os="mac" />
+ <file src="${MARMOTTA_ROOT}/launchers/marmotta-splash/target/marmotta-splash-${MARMOTTA_VERSION}.jar" targetdir="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/lib"/>
+ <file src="macos/Start Apache Marmotta.app" targetdir="\$INSTALL_PATH" os="mac" />
+ <file src="images/icon_start.icns" targetdir="\$INSTALL_PATH/Start Apache Marmotta.app/Contents/Resources" os="mac" />
+ <file src="macos/Stop Apache Marmotta.app" targetdir="\$INSTALL_PATH" os="mac" />
+ <file src="images/icon_stop.icns" targetdir="\$INSTALL_PATH/Stop Apache Marmotta.app/Contents/Resources" os="mac" />
<parsable type="shell" targetfile="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/bin/setenv.sh" parse="yes"/>
<parsable type="shell" targetfile="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/bin/setenv.bat" parse="yes"/>
- <parsable type="shell" targetfile="\$INSTALL_PATH/Start LMF Server.app/Contents/MacOS/run.sh" parse="yes" os="mac"/>
- <parsable type="shell" targetfile="\$INSTALL_PATH/Stop LMF Server.app/Contents/MacOS/run.sh" parse="yes" os="mac"/>
+ <parsable type="shell" targetfile="\$INSTALL_PATH/Start Apache Marmotta.app/Contents/MacOS/run.sh" parse="yes" os="mac"/>
+ <parsable type="shell" targetfile="\$INSTALL_PATH/Stop Apache Marmotta.app/Contents/MacOS/run.sh" parse="yes" os="mac"/>
<executable targetfile="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/bin/setenv.sh" stage="never" />
<executable targetfile="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/bin/catalina.sh" stage="never" />
<executable targetfile="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/bin/startup.sh" stage="never" />
<executable targetfile="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/bin/shutdown.sh" stage="never" />
- <executable targetfile="\$INSTALL_PATH/Start LMF Server.app/Contents/MacOS/run.sh" stage="never" os="mac" />
- <executable targetfile="\$INSTALL_PATH/Stop LMF Server.app/Contents/MacOS/run.sh" stage="never" os="mac"/>
+ <executable targetfile="\$INSTALL_PATH/Start Apache Marmotta.app/Contents/MacOS/run.sh" stage="never" os="mac" />
+ <executable targetfile="\$INSTALL_PATH/Stop Apache Marmotta.app/Contents/MacOS/run.sh" stage="never" os="mac"/>
</pack>
- <refpack file="refpacks/lmf-webapp.xml" />
- <refpack file="refpacks/lmf-core.xml" />
- <refpack file="refpacks/lmf-ldcache.xml" />
- <refpack file="refpacks/lmf-ldpath.xml" />
- <refpack file="refpacks/lmf-reasoner.xml" />
- <refpack file="refpacks/lmf-skos.xml" />
- <refpack file="refpacks/lmf-search.xml" />
- <refpack file="refpacks/lmf-security.xml" />
- <refpack file="refpacks/lmf-sparql.xml" />
- <refpack file="refpacks/lmf-user.xml" />
- <refpack file="refpacks/lmf-scheduler.xml" />
- <refpack file="refpacks/lmf-social.xml" />
- <refpack file="refpacks/lmf-versioning.xml" />
- <refpack file="refpacks/lmf-enhancer.xml" />
- <refpack file="refpacks/lmf-stanbol.xml" />
- <refpack file="refpacks/lmf-geo.xml" />
- <refpack file="refpacks/lmf-demo-books.xml" />
- <refpack file="refpacks/refine.xml" />
+ <refpack file="refpacks/marmotta-webapp.xml" />
+ <refpack file="refpacks/marmotta-core.xml" />
+ <refpack file="refpacks/marmotta-ldcache.xml" />
+ <refpack file="refpacks/marmotta-ldpath.xml" />
+ <refpack file="refpacks/marmotta-reasoner.xml" />
+ <refpack file="refpacks/marmotta-security.xml" />
+ <refpack file="refpacks/marmotta-sparql.xml" />
+ <refpack file="refpacks/marmotta-user.xml" />
+ <refpack file="refpacks/marmotta-versioning.xml" />
</packs>
<!-- shortcut generation -->
<native type="izpack" name="ShellLink.dll" />
<native type="izpack" name="ShellLink_x64.dll" />
+
</installation>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/src/main/resources/macos/Start Apache Marmotta.app/Contents/Info.plist
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/macos/Start Apache Marmotta.app/Contents/Info.plist b/launchers/marmotta-installer/src/main/resources/macos/Start Apache Marmotta.app/Contents/Info.plist
new file mode 100644
index 0000000..632e5f5
--- /dev/null
+++ b/launchers/marmotta-installer/src/main/resources/macos/Start Apache Marmotta.app/Contents/Info.plist
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright (c) 2008-2012 Salzburg Research.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>CFBundleExecutable</key>
+ <string>run.sh</string>
+ <key>CFBundleIconFile</key>
+ <string>icon_start.icns</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>1.0</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+ </dict>
+</plist>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/src/main/resources/macos/Start Apache Marmotta.app/Contents/MacOS/run.sh
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/macos/Start Apache Marmotta.app/Contents/MacOS/run.sh b/launchers/marmotta-installer/src/main/resources/macos/Start Apache Marmotta.app/Contents/MacOS/run.sh
new file mode 100644
index 0000000..6f67046
--- /dev/null
+++ b/launchers/marmotta-installer/src/main/resources/macos/Start Apache Marmotta.app/Contents/MacOS/run.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+%{INSTALL_PATH}/apache-tomcat-%{TOMCAT_VERSION}/bin/startup.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/src/main/resources/macos/Start LMF Server.app/Contents/Info.plist
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/macos/Start LMF Server.app/Contents/Info.plist b/launchers/marmotta-installer/src/main/resources/macos/Start LMF Server.app/Contents/Info.plist
deleted file mode 100644
index 632e5f5..0000000
--- a/launchers/marmotta-installer/src/main/resources/macos/Start LMF Server.app/Contents/Info.plist
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ Copyright (c) 2008-2012 Salzburg Research.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
- <dict>
- <key>CFBundleExecutable</key>
- <string>run.sh</string>
- <key>CFBundleIconFile</key>
- <string>icon_start.icns</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>1.0</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>1.0</string>
- </dict>
-</plist>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/src/main/resources/macos/Start LMF Server.app/Contents/MacOS/run.sh
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/macos/Start LMF Server.app/Contents/MacOS/run.sh b/launchers/marmotta-installer/src/main/resources/macos/Start LMF Server.app/Contents/MacOS/run.sh
deleted file mode 100644
index 6f67046..0000000
--- a/launchers/marmotta-installer/src/main/resources/macos/Start LMF Server.app/Contents/MacOS/run.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-%{INSTALL_PATH}/apache-tomcat-%{TOMCAT_VERSION}/bin/startup.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/src/main/resources/macos/Stop Apache Marmotta.app/Contents/Info.plist
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/macos/Stop Apache Marmotta.app/Contents/Info.plist b/launchers/marmotta-installer/src/main/resources/macos/Stop Apache Marmotta.app/Contents/Info.plist
new file mode 100644
index 0000000..54f36ec
--- /dev/null
+++ b/launchers/marmotta-installer/src/main/resources/macos/Stop Apache Marmotta.app/Contents/Info.plist
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright (c) 2008-2012 Salzburg Research.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>CFBundleExecutable</key>
+ <string>run.sh</string>
+ <key>CFBundleIconFile</key>
+ <string>icon_stop.icns</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>1.0</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+ </dict>
+</plist>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/src/main/resources/macos/Stop Apache Marmotta.app/Contents/MacOS/run.sh
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/macos/Stop Apache Marmotta.app/Contents/MacOS/run.sh b/launchers/marmotta-installer/src/main/resources/macos/Stop Apache Marmotta.app/Contents/MacOS/run.sh
new file mode 100644
index 0000000..38c3856
--- /dev/null
+++ b/launchers/marmotta-installer/src/main/resources/macos/Stop Apache Marmotta.app/Contents/MacOS/run.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+%{INSTALL_PATH}/apache-tomcat-%{TOMCAT_VERSION}/bin/shutdown.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/src/main/resources/macos/Stop LMF Server.app/Contents/Info.plist
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/macos/Stop LMF Server.app/Contents/Info.plist b/launchers/marmotta-installer/src/main/resources/macos/Stop LMF Server.app/Contents/Info.plist
deleted file mode 100644
index 54f36ec..0000000
--- a/launchers/marmotta-installer/src/main/resources/macos/Stop LMF Server.app/Contents/Info.plist
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ Copyright (c) 2008-2012 Salzburg Research.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
- <dict>
- <key>CFBundleExecutable</key>
- <string>run.sh</string>
- <key>CFBundleIconFile</key>
- <string>icon_stop.icns</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>1.0</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>1.0</string>
- </dict>
-</plist>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/src/main/resources/macos/Stop LMF Server.app/Contents/MacOS/run.sh
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/macos/Stop LMF Server.app/Contents/MacOS/run.sh b/launchers/marmotta-installer/src/main/resources/macos/Stop LMF Server.app/Contents/MacOS/run.sh
deleted file mode 100644
index 38c3856..0000000
--- a/launchers/marmotta-installer/src/main/resources/macos/Stop LMF Server.app/Contents/MacOS/run.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-%{INSTALL_PATH}/apache-tomcat-%{TOMCAT_VERSION}/bin/shutdown.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/src/main/resources/panels/installerInfo.html
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/panels/installerInfo.html b/launchers/marmotta-installer/src/main/resources/panels/installerInfo.html
index 571c385..92cdf91 100644
--- a/launchers/marmotta-installer/src/main/resources/panels/installerInfo.html
+++ b/launchers/marmotta-installer/src/main/resources/panels/installerInfo.html
@@ -24,28 +24,25 @@
<title>LMF</title>
<style type="text/css">
html, body {
- background: #eeeeee url('lmfbck') no-repeat right top;
+ background: #eeeeee url('bck') no-repeat right top;
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
margin: 5px 30px auto 20px;
}
</style>
</head>
<body>
- <h1>Welcome to LMF ${LMF_VERSION}</h1>
+ <h1>Welcome to Apache Marmotta ${MARMOTTA_VERSION}</h1>
<h2>Installation Wizard</h2>
<p>
- The Linked Media Framework is a general purpose framework for building Linked Data and
- Semantic Web applications. LMF bundles together Apache Marmotta, Apache Stanbol, Apache
- Solr and Open Refine. It provides commonly used services linked Linked Data Server,
- Linked Data Client, SPARQL Endpoint, Semantic Search, Rule-based Reasoner, Versioning, etc.
- that can be used for building custom Semantic Web applications using e.g. the LMF Client
- Libraries available on the project website.
+ Apache Marmotta provides an open implementation of a Linked Data Platform
+ that can be used, extended, and deployed easily by organizations who want
+ to publish Linked Data or build custom applications on Linked Data.
</p>
<p>
- This wizard will guide you through a basic installation of the Linked Media Framework Server.
- It is a fully self-contained installation, meaning there are no other dependencies than Java
- itself. The installer will install Apache Tomcat ${TOMCAT_VERSION}, the LMF Web and Core modules,
- and optionally all modules that you select in the following panels.
+ This wizard will guide you through a basic installation of Apache Marmotta
+ for demonstration purposes. It is a fully self-contained installation,
+ meaning there are no other dependencies than Java itself. The installer
+ will install Apache Tomcat ${TOMCAT_VERSION} for running Marmotta.
</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/src/main/resources/refpacks/refine.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/refpacks/refine.xml b/launchers/marmotta-installer/src/main/resources/refpacks/refine.xml
deleted file mode 100644
index a4c744c..0000000
--- a/launchers/marmotta-installer/src/main/resources/refpacks/refine.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<installation version='1.0'>
- <packs>
- <pack name="OpenRefine" required="no">
- <description>OpenRefine, used for data management and converting legacy data into Linked Data.</description>
- <file src="../../target/refine.war" targetdir="$INSTALL_PATH/apache-tomcat-$TOMCAT_VERSION/webapps/refine/" unpack="true"/>
- <file src="refine/web.xml" targetdir="$INSTALL_PATH/apache-tomcat-$TOMCAT_VERSION/webapps/refine/WEB-INF/" override="true"/>
- <parsable type="shell" targetfile="$INSTALL_PATH/apache-tomcat-$TOMCAT_VERSION/webapps/refine/WEB-INF/web.xml" parse="yes"/>
- </pack>
- </packs>
-</installation>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f7672744/launchers/marmotta-installer/src/main/resources/tomcat/index.jsp
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/tomcat/index.jsp b/launchers/marmotta-installer/src/main/resources/tomcat/index.jsp
deleted file mode 100644
index cf26914..0000000
--- a/launchers/marmotta-installer/src/main/resources/tomcat/index.jsp
+++ /dev/null
@@ -1,168 +0,0 @@
-<%--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
---%>
-<html>
-
- <head>
- <title>Linked Media Framework</title>
-
- <script type="text/javascript" src="/LMF/webjars/jquery/1.8.2/jquery.min.js"></script>
-
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <meta http-equiv="Default-Style" content="blue">
- <link href="/LMF/core/public/style/javadoc.css" rel="stylesheet" type="text/css" />
- <link href="/LMF/core/public/style/style.css" rel="stylesheet" type="text/css" />
- <link href="/LMF/core/public/style/scheme/blue.css" title="blue" rel="stylesheet" type="text/css" />
- <link href="/LMF/core/public/style/scheme/dark.css" title="dark" rel="alternate stylesheet" type="text/css" />
- <link href="/LMF/core/public/img/icon/lmf.ico" rel="SHORTCUT ICON" />
-
- <style type="text/css">
- .hidden {
- display: none;
- }
- </style>
- </head>
-
- <body>
-
- <div id="wrapper">
-
- <div id="header">
- <a id="logo" href="http://localhost:8080/">
- <img src="/LMF/core/public/img/logo/lmf-logo.png">
- </a>
- </div>
-
- <div id="center" class="clear" style="margin: 2em 5em 2em 5em; width: auto;">
-
- <div id="content" style="min-height: 600px;">
-
- <h1>Welcome to the Linked Media Framework</h1>
-
- <p>
- The Linked Media Framework (LMF) is an all-in-one solution for publishing your legacy data as Linked Data,
- connecting it with the Web of Data and build fascinating applications on top. The LMF can bundle several
- applications in a single installation to make your life easier. Currently, the following applications are
- installed:
- </p>
-
- <h2>Administration</h2>
-
- <ul id="service_list">
- <li id="service_lmf" class="hidden">
- <a href="/LMF">Linked Media Framework</a> - the administration and debugging interface of the main
- LMF server. Go here to configure LMF settings and access the data you stored.
- </li>
- <li id="service_stanbol" class="hidden">
- <a href="/LMF/stanbol/config/">Apache Stanbol</a> - administration and debugging interface of the information
- extraction tool Apache Stanbol. Go here if you need to customize Stanbol settings or want to
- experiment with Stanbol.
- </li>
- <li><a href="http://code.google.com/p/lmf/wiki/TableOfContents">Documentation</a> - the complete documentation for
- the Linked Media Framework, including module descriptions, guides, and background information.</li>
- </ul>
-
-
- <h2>Applications</h2>
-
- <ul id="application_list">
- <li id="service_refine" class="hidden">
- <a href="/refine">Open Refine</a> - customized version of the data management tool Open Refine,
- including RDF and LMF extensions, preconfigured for the LMF. Go here if you want to publish legacy
- data as Linked Data.
- </li>
- <li id="application_skosjs" class="hidden">
- <a href="/LMF/skos/index.html">SKOSjs</a> - a SKOS thesaurus manager building on top of the
- Linked Media Framework. Go here to create and manage your own thesauruses or import existing
- thesauruses.
- </li>
- </ul>
-
- <h2>Demos</h2>
-
- <ul id="demo_list">
- <li id="demo_books" class="hidden">
- <a href="/LMF/demo-books/about.html">LMF Books Demo</a> - start from a legacy CSV data file and
- convert it into a Semantic Search including enriched information from the Linked Data Cloud.
- Demonstrates Linked Data Caching, Thesaurus Management, Reasoning, and Semantic Search.
- </li>
- </ul>
-
- </div>
-
- </div>
-
- <div class="clear"></div>
-
- <div id="footer">
- <div id="footer_line">
- <span>
- <a href="http://lmf.googlecode.com">LMF</a> is a project of <a href="http://www.newmedialab.at/">Salzburg NewMediaLab</a>. <br/>
- Copyright © 2013 <a href="http://www.salzburgresearch.at">Salzburg Research</a>. <br/>
- Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
- </span>
- </div>
- </div>
-
- </div>
-
- <script type="text/javascript">
- var checkService = function(uri, callback) {
- $.ajax({
- url: uri,
- type: "HEAD",
- success: callback,
- error: function(jqXHR, textStatus, errorThrown) {
-
- }
- });
- };
-
- $(document).ready(function() {
-
- checkService("/LMF",function(data) {
- $('#service_lmf').removeClass("hidden");
- });
-
- checkService("/refine",function(data) {
- $('#service_refine').removeClass("hidden");
- });
-
- checkService("/LMF/stanbol/config/entityhub",function(data) {
- $('#service_stanbol').removeClass("hidden");
- });
-
- checkService("/LMF/skos/index.html",function(data) {
- $('#application_skosjs').removeClass("hidden");
- });
-
- checkService("/LMF/demo-books/about.html",function(data) {
- $('#demo_books').removeClass("hidden");
- });
-
- checkService("/LMF/demo-social/index.gsp",function(data) {
- $('#demo_social').removeClass("hidden");
- });
-
- })
- </script>
-
- </body>
-
-</html>