Updated Branches: refs/heads/develop 86d1a4004 -> 5f1c39cd8
MARMOTTA-318: added startup/shutdown scripts to the INSTALL_DIR for the installer Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/31420377 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/31420377 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/31420377 Branch: refs/heads/develop Commit: 3142037703b6a8ae8b7b11ff9658b21c3154aa95 Parents: 86d1a40 Author: Jakob Frank <[email protected]> Authored: Tue Jan 7 17:03:32 2014 +0100 Committer: Jakob Frank <[email protected]> Committed: Tue Jan 7 18:16:09 2014 +0100 ---------------------------------------------------------------------- launchers/marmotta-installer/assembly.xml | 8 +------ launchers/marmotta-installer/pom.xml | 4 ++++ .../src/main/resources/installer/standalone.xml | 8 +++++++ .../src/main/resources/unix/shutdown.sh | 24 ++++++++++++++++++++ .../src/main/resources/unix/startup.sh | 24 ++++++++++++++++++++ 5 files changed, 61 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/31420377/launchers/marmotta-installer/assembly.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-installer/assembly.xml b/launchers/marmotta-installer/assembly.xml index 0e8fa6e..d097f07 100644 --- a/launchers/marmotta-installer/assembly.xml +++ b/launchers/marmotta-installer/assembly.xml @@ -48,15 +48,9 @@ <fileMode>0644</fileMode> </file> <file> - <source>${project.basedir}/../../DISCLAIMER.txt</source> - <outputDirectory>/</outputDirectory> - <fileMode>0644</fileMode> - <filtered>true</filtered> - </file> - <file> <source>${project.build.directory}/marmotta-installer-${project.version}.jar</source> <outputDirectory>/</outputDirectory> <fileMode>0644</fileMode> </file> </files> -</assembly> \ No newline at end of file +</assembly> http://git-wip-us.apache.org/repos/asf/marmotta/blob/31420377/launchers/marmotta-installer/pom.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml index 037e0aa..1840233 100644 --- a/launchers/marmotta-installer/pom.xml +++ b/launchers/marmotta-installer/pom.xml @@ -129,6 +129,10 @@ <targetPath>macos</targetPath> </resource> <resource> + <directory>src/main/resources/unix</directory> + <targetPath>unix</targetPath> + </resource> + <resource> <directory>src/main/resources/log</directory> <targetPath>log</targetPath> </resource> http://git-wip-us.apache.org/repos/asf/marmotta/blob/31420377/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 6b8c004..804163f 100644 --- a/launchers/marmotta-installer/src/main/resources/installer/standalone.xml +++ b/launchers/marmotta-installer/src/main/resources/installer/standalone.xml @@ -89,20 +89,28 @@ <file src="tomcat/index.jsp" targetdir="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/webapps/ROOT" override="true" /> <file src="log/catalina.out" targetdir="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/logs" /> <file src="lib/marmotta-splash-${MARMOTTA_VERSION}.jar" targetdir="\$INSTALL_PATH/apache-tomcat-${TOMCAT_VERSION}/lib" /> + <!-- macos specific --> <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" /> + <!-- linux specific --> + <file src="unix/startup.sh" targetdir="\$INSTALL_PATH/" os="unix" /> + <file src="unix/shutdown.sh" targetdir="\$INSTALL_PATH/" os="unix" /> <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 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" /> + <parsable type="shell" targetfile="\$INSTALL_PATH/startup.sh" parse="yes" os="unix" /> + <parsable type="shell" targetfile="\$INSTALL_PATH/shutdown.sh" parse="yes" os="unix" /> <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 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" /> + <executable targetfile="\$INSTALL_PATH/startup.sh" stage="never" os="unix" /> + <executable targetfile="\$INSTALL_PATH/shutdown.sh" stage="never" os="unix" /> </pack> <refpack file="refpacks/marmotta-webapp.xml" /> <refpack file="refpacks/marmotta-core.xml" /> http://git-wip-us.apache.org/repos/asf/marmotta/blob/31420377/launchers/marmotta-installer/src/main/resources/unix/shutdown.sh ---------------------------------------------------------------------- diff --git a/launchers/marmotta-installer/src/main/resources/unix/shutdown.sh b/launchers/marmotta-installer/src/main/resources/unix/shutdown.sh new file mode 100644 index 0000000..e207c81 --- /dev/null +++ b/launchers/marmotta-installer/src/main/resources/unix/shutdown.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# +# 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. +# +# ----------------------------------------------------------------------------- +# Stop script for the Apache Marmotta Platform +# ----------------------------------------------------------------------------- + +# just stop tomcat... +%{INSTALL_PATH}/apache-tomcat-%{TOMCAT_VERSION}/bin/shutdown.sh "$@" + http://git-wip-us.apache.org/repos/asf/marmotta/blob/31420377/launchers/marmotta-installer/src/main/resources/unix/startup.sh ---------------------------------------------------------------------- diff --git a/launchers/marmotta-installer/src/main/resources/unix/startup.sh b/launchers/marmotta-installer/src/main/resources/unix/startup.sh new file mode 100644 index 0000000..d3df807 --- /dev/null +++ b/launchers/marmotta-installer/src/main/resources/unix/startup.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# +# 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. +# +# ----------------------------------------------------------------------------- +# Start script for the Apache Marmotta Platform +# ----------------------------------------------------------------------------- + +# just launch tomcat... +%{INSTALL_PATH}/apache-tomcat-%{TOMCAT_VERSION}/bin/startup.sh "$@" +
