Fixed start_orion.sh to correctly source conf.d/orion. Added cvs keywords.

5 files changed, 15 insertions, 5 deletions

diff --git a/net-www/orion/ChangeLog b/net-www/orion/ChangeLog
index c8e878cc2c68..ed6530079e49 100644
--- a/net-www/orion/ChangeLog
+++ b/net-www/orion/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for net-www/orion
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/orion/ChangeLog,v 1.3 2003/03/13 22:27:40 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/ChangeLog,v 1.4 2003/03/14 20:32:22 absinthe Exp $
 
 *orion-1.5.2b-r1 (13 Mar 2003)
 
+  14 Mar 2003; Dylan Carlson <absinthe@gentoo.org> files/1.5.2b/orion.conf,
+  files/1.5.2b/orion.init, files/1.5.2b/start_orion.sh,
+  files/1.5.2b/stop_orion.sh:
+  Fixed start_orion.sh to correctly source conf.d/orion.  Added cvs keywords.
+
   13 Mar 2003; Dylan Carlson <absinthe@gentoo.org> ChangeLog  :
 
   Log directory gets properly created now.  init.d/conf.d is fixed.
diff --git a/net-www/orion/files/1.5.2b/orion.conf b/net-www/orion/files/1.5.2b/orion.conf
index 2e5e700f917a..3bf3f2eefc81 100644
--- a/net-www/orion/files/1.5.2b/orion.conf
+++ b/net-www/orion/files/1.5.2b/orion.conf
@@ -1,3 +1,4 @@
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/files/1.5.2b/orion.conf,v 1.2 2003/03/14 20:32:22 absinthe Exp $
 # Where your web applications are located
 ORION_DIR=/opt/orion
 
diff --git a/net-www/orion/files/1.5.2b/orion.init b/net-www/orion/files/1.5.2b/orion.init
index 503c28367423..388aa6cbdd5a 100644
--- a/net-www/orion/files/1.5.2b/orion.init
+++ b/net-www/orion/files/1.5.2b/orion.init
@@ -1,6 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/files/1.5.2b/orion.init,v 1.3 2003/03/14 20:32:22 absinthe Exp $
 
 depend() {
 	need net
diff --git a/net-www/orion/files/1.5.2b/start_orion.sh b/net-www/orion/files/1.5.2b/start_orion.sh
index 4289087a65a3..185d345233bb 100644
--- a/net-www/orion/files/1.5.2b/start_orion.sh
+++ b/net-www/orion/files/1.5.2b/start_orion.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/files/1.5.2b/start_orion.sh,v 1.2 2003/03/14 20:32:22 absinthe Exp $
+
 source /etc/conf.d/orion
-cd ${ORION_DIR}
-JAVA_HOME=/opt/sun-jdk-1.4.1.01
-JDK_HOME=${JAVA_HOME}
 JAVAC=${JAVA_HOME}/bin/javac
-CLASSPATH=/usr/share/orion/lib/activation.jar:/usr/share/orion/lib/admin.jar:/usr/share/orion/lib/applicationlauncher.jar:/usr/share/orion/lib/assemblerlauncher.jar:/usr/share/orion/lib/autoupdate.jar:/usr/share/orion/lib/clientassembler.jar:/usr/share/orion/lib/crimson.jar:/usr/share/orion/lib/earassembler.jar:/usr/share/orion/lib/ejb.jar:/usr/share/orion/lib/ejbassembler.jar:/usr/share/orion/lib/ejbmaker.jar:/usr/share/orion/lib/jaas.jar:/usr/share/orion/lib/jaxp.jar:/usr/share/orion/lib/jcert.jar:/usr/share/orion/lib/jdbc.jar:/usr/share/orion/lib/jndi.jar:/usr/share/orion/lib/jnet.jar:/usr/share/orion/lib/jsse.jar:/usr/share/orion/lib/jta.jar:/usr/share/orion/lib/loadbalancer.jar:/usr/share/orion/lib/mail.jar:/usr/share/orion/lib/orion.jar:/usr/share/orion/lib/orionconsole.jar:/usr/share/orion/lib/parser.jar:/usr/share/orion/lib/taglibassembler.jar:/usr/share/orion/lib/webappassembler.jar:/usr/share/orion/lib/xalan.jar:/usr/share/orion/lib/xerces.jar:/opt/orion/tools.jar:${JAVA_HOME}/jre/lib/rt.jar:.
+JDK_HOME=${JAVA_HOME}
+
+cd ${ORION_DIR}
+
 ${JAVA_HOME}/bin/java -jar /usr/share/orion/lib/orion.jar -quiet -out ${ORION_OUT} -err ${ORION_ERR} &
diff --git a/net-www/orion/files/1.5.2b/stop_orion.sh b/net-www/orion/files/1.5.2b/stop_orion.sh
index a7c0efd41416..f5556713367f 100644
--- a/net-www/orion/files/1.5.2b/stop_orion.sh
+++ b/net-www/orion/files/1.5.2b/stop_orion.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/files/1.5.2b/stop_orion.sh,v 1.2 2003/03/14 20:32:22 absinthe Exp $
 ps auxww | grep orion.jar | awk '{print $2}' | xargs kill &> /dev/null