From d6b28468d040f37791621bc05fa54daba1238293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 25 May 2020 18:54:37 +0200 Subject: [PATCH] Remove redundant files for unix packages --- scm-packaging/deb/pom.xml | 8 +- .../deb/src/main/fs/etc/scm/logging.xml | 106 ---------- .../deb/src/main/fs/etc/scm/server-config.xml | 193 ------------------ .../src/main/fs/opt/scm-server/bin/scm-server | 192 ----------------- .../scm-server/var/webapp/docroot/index.html | 35 ---- scm-packaging/rpm/pom.xml | 8 +- .../rpm/src/main/fs/etc/scm/logging.xml | 106 ---------- .../rpm/src/main/fs/etc/scm/server-config.xml | 193 ------------------ .../src/main/fs/opt/scm-server/bin/scm-server | 192 ----------------- .../scm-server/var/webapp/docroot/index.html | 35 ---- 10 files changed, 8 insertions(+), 1060 deletions(-) delete mode 100644 scm-packaging/deb/src/main/fs/etc/scm/logging.xml delete mode 100644 scm-packaging/deb/src/main/fs/etc/scm/server-config.xml delete mode 100644 scm-packaging/deb/src/main/fs/opt/scm-server/bin/scm-server delete mode 100644 scm-packaging/deb/src/main/fs/opt/scm-server/var/webapp/docroot/index.html delete mode 100644 scm-packaging/rpm/src/main/fs/etc/scm/logging.xml delete mode 100644 scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml delete mode 100644 scm-packaging/rpm/src/main/fs/opt/scm-server/bin/scm-server delete mode 100644 scm-packaging/rpm/src/main/fs/opt/scm-server/var/webapp/docroot/index.html diff --git a/scm-packaging/deb/pom.xml b/scm-packaging/deb/pom.xml index c92007f62d..fb702d8efa 100644 --- a/scm-packaging/deb/pom.xml +++ b/scm-packaging/deb/pom.xml @@ -134,7 +134,7 @@ file - src/main/fs/opt/scm-server/bin/scm-server + ${project.basedir}/../unix/src/main/bin/scm-server /opt/scm-server/bin/scm-server perm @@ -160,7 +160,7 @@ file - src/main/fs/etc/scm/logging.xml + ${project.basedir}/../unix/src/main/fs/conf/logging.xml /etc/scm/logging.xml true @@ -173,7 +173,7 @@ file - src/main/fs/etc/scm/server-config.xml + ${project.basedir}/../unix/src/main/fs/conf/server-config.xml /etc/scm/server-config.xml true @@ -222,7 +222,7 @@ file - src/main/fs/opt/scm-server/var/webapp/docroot/index.html + ${project.basedir}/../unix/src/main/fs/var/webapp/docroot/index.html /opt/scm-server/var/webapp/docroot/index.html perm diff --git a/scm-packaging/deb/src/main/fs/etc/scm/logging.xml b/scm-packaging/deb/src/main/fs/etc/scm/logging.xml deleted file mode 100644 index b3f4014265..0000000000 --- a/scm-packaging/deb/src/main/fs/etc/scm/logging.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - /var/log/scm/scm-manager.log - - - /var/log/scm/scm-manager-%i.log - 1 - 10 - - - - 10MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%-10X{transaction_id}] %-5level %logger - %msg%n - - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%-10X{transaction_id}] %-5level %logger - %msg%n - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml b/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml deleted file mode 100644 index b7a5a7efef..0000000000 --- a/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - 16384 - 16384 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /scm - - /var/webapp/scm-webapp.war - - - org.eclipse.jetty.servlet.Default.dirAllowed - false - - /var/cache/scm/work/webapp - - - - / - - - - - - /var/webapp/docroot - - - - - /var/cache/scm/work/work/docroot - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/scm-packaging/deb/src/main/fs/opt/scm-server/bin/scm-server b/scm-packaging/deb/src/main/fs/opt/scm-server/bin/scm-server deleted file mode 100644 index 15cc41e124..0000000000 --- a/scm-packaging/deb/src/main/fs/opt/scm-server/bin/scm-server +++ /dev/null @@ -1,192 +0,0 @@ -#!/bin/bash -# ---------------------------------------------------------------------------- -# Copyright 2001-2006 The Apache Software Foundation. -# -# 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. -# ---------------------------------------------------------------------------- - -# Copyright (c) 2001-2002 The Apache Software Foundation. All rights -# reserved. - -# user used to run the daemon (defaults to current user) -USER="scm" - -# extra jvm arguments -EXTRA_JVM_ARGUMENTS="-Djava.awt.headless=true -Dlogback.configurationFile=logging.xml" - -BASEDIR="/opt/scm-server" - -# set pid path for jsvc -PIDFILE="/var/run/scm-server.pid" - -# set log dir for jsvc -LOGDIR="/var/log/scm" - -# load settings from defaults directory -[ -r /etc/default/scm-server ] && . /etc/default/scm-server - -OS=`uname | tr '[:upper:]' '[:lower:]'` -ARCH=`uname -m` - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -case "$OS" in - sunos*) OS="solaris" - ARCH=`uname -p` - ;; - cygwin*) cygwin=true ;; - darwin*) darwin=true - if [ -z "$JAVA_VERSION" ] ; then - JAVA_VERSION="CurrentJDK" - else - echo "Using Java version: $JAVA_VERSION" - fi - if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# If a specific java binary isn't specified search for the standard 'java' binary -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD=`which java` - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." - echo " We cannot execute $JAVACMD" - exit 1 -fi - -if [ -z "$REPO" ] -then - REPO="$BASEDIR"/lib -fi - -CLASSPATH=$CLASSPATH_PREFIX:"$BASEDIR"/conf:"$REPO"/scm-server-2.0.0-SNAPSHOT.jar:"$REPO"/commons-daemon-1.2.2.jar:"$REPO"/jetty-server-9.4.28.v20200408.jar:"$REPO"/javax.servlet-api-3.1.0.jar:"$REPO"/jetty-http-9.4.28.v20200408.jar:"$REPO"/jetty-io-9.4.28.v20200408.jar:"$REPO"/jetty-webapp-9.4.28.v20200408.jar:"$REPO"/jetty-xml-9.4.28.v20200408.jar:"$REPO"/jetty-servlet-9.4.28.v20200408.jar:"$REPO"/jetty-security-9.4.28.v20200408.jar:"$REPO"/jetty-jmx-9.4.28.v20200408.jar:"$REPO"/jetty-util-9.4.28.v20200408.jar - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$HOME" ] && HOME=`cygpath --path --windows "$HOME"` - [ -n "$BASEDIR" ] && BASEDIR=`cygpath --path --windows "$BASEDIR"` - [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"` -fi - -jsvc=false; -stop=""; - -if [ "$1" == "start" ] -then - jsvc=true; -else - if [ "$1" == "stop" ] - then - jsvc=true; - stop='-stop'; - fi -fi - -USER_ARGUMENT="" - -if [ "x$USER" != "x" ] -then - USER_ARGUMENT="-user $USER" -fi - -DARWIN_USE_ARCH="false" - -if $jsvc; then - - JSVCCMD="" - if [ "$OS" == "darwin" ]; then - if [ "$DARWIN_USE_ARCH" == "true" ]; then - JSVCCMD="/usr/bin/arch -arch $ARCH $BASEDIR/libexec/jsvc-$OS" - else - JSVCCMD="exec $BASEDIR/libexec/jsvc-$OS" - fi - else - JSVCCMD="exec $BASEDIR/libexec/jsvc-$OS-$ARCH" - fi - - # try to extract JAVA_HOME from JAVACMD - if [ -z "$JAVA_HOME" ] ; then - PRG="$JAVACMD" - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - DIR="$(dirname "$PRG")" - DIR="$(dirname "$DIR")" - if [ -d "$DIR" ] ; then - JAVA_HOME="$DIR" - fi - fi - - # TODO JVM Arguments - - $JSVCCMD -cp "$CLASSPATH" $JAVA_OPTS \ - $EXTRA_JVM_ARGUMENTS $USER_ARGUMENT \ - -outfile "$LOGDIR/scm-server.out" \ - -errfile "$LOGDIR/scm-server.err" \ - -pidfile "$PIDFILE" \ - -jvm server \ - -home "$JAVA_HOME" \ - -Dapp.name="scm-server" \ - -Dapp.pid="$$" \ - -Dapp.repo="$REPO" \ - -Dbasedir="$BASEDIR" \ - $stop sonia.scm.server.ScmServerDaemon \ - "$@" - -else - - exec "$JAVACMD" $JAVA_OPTS \ - $EXTRA_JVM_ARGUMENTS \ - -classpath "$CLASSPATH" \ - -Dapp.name="scm-server" \ - -Dapp.pid="$$" \ - -Dapp.repo="$REPO" \ - -Dbasedir="$BASEDIR" \ - sonia.scm.server.ScmServerDaemon \ - "$@" - -fi diff --git a/scm-packaging/deb/src/main/fs/opt/scm-server/var/webapp/docroot/index.html b/scm-packaging/deb/src/main/fs/opt/scm-server/var/webapp/docroot/index.html deleted file mode 100644 index a3bff3f8b3..0000000000 --- a/scm-packaging/deb/src/main/fs/opt/scm-server/var/webapp/docroot/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - SCM-Server - - - - - - diff --git a/scm-packaging/rpm/pom.xml b/scm-packaging/rpm/pom.xml index e35499b044..dc11925d97 100644 --- a/scm-packaging/rpm/pom.xml +++ b/scm-packaging/rpm/pom.xml @@ -179,7 +179,7 @@ /opt/scm-server/bin/scm-server - src/main/fs/opt/scm-server/bin/scm-server + ${project.basedir}/../unix/src/main/bin/scm-server root scm 0750 @@ -196,7 +196,7 @@ /etc/scm/logging.xml - src/main/fs/etc/scm/logging.xml + ${project.basedir}/../unix/src/main/fs/conf/logging.xml root scm 0640 @@ -205,7 +205,7 @@ /etc/scm/server-config.xml - src/main/fs/etc/scm/server-config.xml + ${project.basedir}/../unix/src/main/fs/conf/server-config.xml root scm 0640 @@ -238,7 +238,7 @@ /opt/scm-server/var/webapp/docroot/index.html - src/main/fs/opt/scm-server/var/webapp/docroot/index.html + ${project.basedir}/../unix/src/main/fs/var/webapp/docroot/index.html root scm 0644 diff --git a/scm-packaging/rpm/src/main/fs/etc/scm/logging.xml b/scm-packaging/rpm/src/main/fs/etc/scm/logging.xml deleted file mode 100644 index b3f4014265..0000000000 --- a/scm-packaging/rpm/src/main/fs/etc/scm/logging.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - /var/log/scm/scm-manager.log - - - /var/log/scm/scm-manager-%i.log - 1 - 10 - - - - 10MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%-10X{transaction_id}] %-5level %logger - %msg%n - - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%-10X{transaction_id}] %-5level %logger - %msg%n - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml b/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml deleted file mode 100644 index b7a5a7efef..0000000000 --- a/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - 16384 - 16384 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /scm - - /var/webapp/scm-webapp.war - - - org.eclipse.jetty.servlet.Default.dirAllowed - false - - /var/cache/scm/work/webapp - - - - / - - - - - - /var/webapp/docroot - - - - - /var/cache/scm/work/work/docroot - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/scm-packaging/rpm/src/main/fs/opt/scm-server/bin/scm-server b/scm-packaging/rpm/src/main/fs/opt/scm-server/bin/scm-server deleted file mode 100644 index 15cc41e124..0000000000 --- a/scm-packaging/rpm/src/main/fs/opt/scm-server/bin/scm-server +++ /dev/null @@ -1,192 +0,0 @@ -#!/bin/bash -# ---------------------------------------------------------------------------- -# Copyright 2001-2006 The Apache Software Foundation. -# -# 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. -# ---------------------------------------------------------------------------- - -# Copyright (c) 2001-2002 The Apache Software Foundation. All rights -# reserved. - -# user used to run the daemon (defaults to current user) -USER="scm" - -# extra jvm arguments -EXTRA_JVM_ARGUMENTS="-Djava.awt.headless=true -Dlogback.configurationFile=logging.xml" - -BASEDIR="/opt/scm-server" - -# set pid path for jsvc -PIDFILE="/var/run/scm-server.pid" - -# set log dir for jsvc -LOGDIR="/var/log/scm" - -# load settings from defaults directory -[ -r /etc/default/scm-server ] && . /etc/default/scm-server - -OS=`uname | tr '[:upper:]' '[:lower:]'` -ARCH=`uname -m` - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -case "$OS" in - sunos*) OS="solaris" - ARCH=`uname -p` - ;; - cygwin*) cygwin=true ;; - darwin*) darwin=true - if [ -z "$JAVA_VERSION" ] ; then - JAVA_VERSION="CurrentJDK" - else - echo "Using Java version: $JAVA_VERSION" - fi - if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# If a specific java binary isn't specified search for the standard 'java' binary -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD=`which java` - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." - echo " We cannot execute $JAVACMD" - exit 1 -fi - -if [ -z "$REPO" ] -then - REPO="$BASEDIR"/lib -fi - -CLASSPATH=$CLASSPATH_PREFIX:"$BASEDIR"/conf:"$REPO"/scm-server-2.0.0-SNAPSHOT.jar:"$REPO"/commons-daemon-1.2.2.jar:"$REPO"/jetty-server-9.4.28.v20200408.jar:"$REPO"/javax.servlet-api-3.1.0.jar:"$REPO"/jetty-http-9.4.28.v20200408.jar:"$REPO"/jetty-io-9.4.28.v20200408.jar:"$REPO"/jetty-webapp-9.4.28.v20200408.jar:"$REPO"/jetty-xml-9.4.28.v20200408.jar:"$REPO"/jetty-servlet-9.4.28.v20200408.jar:"$REPO"/jetty-security-9.4.28.v20200408.jar:"$REPO"/jetty-jmx-9.4.28.v20200408.jar:"$REPO"/jetty-util-9.4.28.v20200408.jar - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$HOME" ] && HOME=`cygpath --path --windows "$HOME"` - [ -n "$BASEDIR" ] && BASEDIR=`cygpath --path --windows "$BASEDIR"` - [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"` -fi - -jsvc=false; -stop=""; - -if [ "$1" == "start" ] -then - jsvc=true; -else - if [ "$1" == "stop" ] - then - jsvc=true; - stop='-stop'; - fi -fi - -USER_ARGUMENT="" - -if [ "x$USER" != "x" ] -then - USER_ARGUMENT="-user $USER" -fi - -DARWIN_USE_ARCH="false" - -if $jsvc; then - - JSVCCMD="" - if [ "$OS" == "darwin" ]; then - if [ "$DARWIN_USE_ARCH" == "true" ]; then - JSVCCMD="/usr/bin/arch -arch $ARCH $BASEDIR/libexec/jsvc-$OS" - else - JSVCCMD="exec $BASEDIR/libexec/jsvc-$OS" - fi - else - JSVCCMD="exec $BASEDIR/libexec/jsvc-$OS-$ARCH" - fi - - # try to extract JAVA_HOME from JAVACMD - if [ -z "$JAVA_HOME" ] ; then - PRG="$JAVACMD" - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - DIR="$(dirname "$PRG")" - DIR="$(dirname "$DIR")" - if [ -d "$DIR" ] ; then - JAVA_HOME="$DIR" - fi - fi - - # TODO JVM Arguments - - $JSVCCMD -cp "$CLASSPATH" $JAVA_OPTS \ - $EXTRA_JVM_ARGUMENTS $USER_ARGUMENT \ - -outfile "$LOGDIR/scm-server.out" \ - -errfile "$LOGDIR/scm-server.err" \ - -pidfile "$PIDFILE" \ - -jvm server \ - -home "$JAVA_HOME" \ - -Dapp.name="scm-server" \ - -Dapp.pid="$$" \ - -Dapp.repo="$REPO" \ - -Dbasedir="$BASEDIR" \ - $stop sonia.scm.server.ScmServerDaemon \ - "$@" - -else - - exec "$JAVACMD" $JAVA_OPTS \ - $EXTRA_JVM_ARGUMENTS \ - -classpath "$CLASSPATH" \ - -Dapp.name="scm-server" \ - -Dapp.pid="$$" \ - -Dapp.repo="$REPO" \ - -Dbasedir="$BASEDIR" \ - sonia.scm.server.ScmServerDaemon \ - "$@" - -fi diff --git a/scm-packaging/rpm/src/main/fs/opt/scm-server/var/webapp/docroot/index.html b/scm-packaging/rpm/src/main/fs/opt/scm-server/var/webapp/docroot/index.html deleted file mode 100644 index a3bff3f8b3..0000000000 --- a/scm-packaging/rpm/src/main/fs/opt/scm-server/var/webapp/docroot/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - SCM-Server - - - - - -