better ebuild

dev-java/artifactory/files/artifactory.confd

@@ -0,0 +1,16 @@
+
+# Port for jetty
+ARTIFACTORY_PORT="8081"
+
+# Home dir of artifactory
+ARTIFACTORY_HOME="/var/lib/artifactory"
+ARTIFACTORY_INSTALL="/usr/share/artifactory"
+
+# Options for artifacory
+ARTIFACTORY_OPTS=""
+
+# User and group as which to run artifactory
+#ARTIFACTORY_USER="artifact"
+#ARTIFACTORY_GROUP="artifact"
+
+JAVA_OPTIONS="-server -Xms1g -Xmx1g -Xss256k -XX:PermSize=128m -XX:MaxPermSize=128m -XX:NewSize=384m -XX:MaxNewSize=384m -Djava.awt.headless=true"

dev-java/artifactory/files/artifactory.initd

@@ -1,37 +1,33 @@
 #!/sbin/runscript
-# Installed in /etc/init.d/artifactory
-
-export JAVA_HOME=/etc/java-config-2/current-system-vm
-export PATH=$JAVA_HOME/bin:$PATH
-DESC="Artifactory Maven Artifact Server"
-NAME=artifactory
-PIDFILE=/var/run/$NAME.pid
-RUN_AS=artifact
-ARTIFACTORY_HOME=/opt/artifact/artifactory
-COMMAND=$ARTIFACTORY_HOME/bin/artifactory.init
-ARGS="$ARTIFACTORY_HOME/etc/jetty.xml"
-LOGFILE="$ARTIFACTORY_HOME/logs/consoleout.log"
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: $
 
 depend() {
-	use net
-	after logger
+	need net
 }
 
 start() {
-	ebegin "Starting $DESC"
-	start-stop-daemon --start --verbose --background --make-pidfile --pidfile $PIDFILE\
-	           --chdir $ARTIFACTORY_HOME --chuid $RUN_AS --exec $COMMAND -- $ARGS > $LOGFILE 2>&1
+	ebegin "Starting artifactory"
+	JAVACMD=$(java-config-2 -J)
+	JAVA_OPTIONS="$JAVA_OPTIONS -server -Djetty.home=$ARTIFACTORY_HOME -Dartifactory.home=$ARTIFACTORY_HOME -Dfile.encoding=UTF8"
+	LIB_DIR=$ARTIFACTORY_INSTALL/lib
+	CLASSPATH=$ARTIFACTORY_INSTALL/artifactory.jar
+	# Add all jars under the lib dir to the classpath
+	for i in $(ls $LIB_DIR/*.jar)
+	do
+	    CLASSPATH="$CLASSPATH:$i"
+	done
+
+	start-stop-daemon --start --chuid ${ARTIFACTORY_USER:-artifact}:${ARTIFACTORY_GROUP:-artifact} \
+	      -t  --chdir "/var/lib/artifactory" \
+                --pidfile /var/run/artifactory.pid --make-pidfile --background \
+		--exec "$JAVACMD" -- $JAVA_OPTIONS -cp "$CLASSPATH" org.artifactory.standalone.main.Main 
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping $DESC"
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE
-
-	if [ -e $PIDFILE ]
-	then
-	  rm $PIDFILE
-	fi
-
+	ebegin "Stopping artifactory"
+	start-stop-daemon --stop --quiet --pidfile /var/run/artifactory.pid
 	eend $?
 }