Version bump.

9 files changed, 101 insertions, 67 deletions

diff --git a/net-www/orion/ChangeLog b/net-www/orion/ChangeLog
index ed6530079e49..a09aa33b1b70 100644
--- a/net-www/orion/ChangeLog
+++ b/net-www/orion/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2003/03/14 20:32:22 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/ChangeLog,v 1.5 2003/03/22 03:28:35 absinthe Exp $
+
+*orion-2.0 (21 Mar 2003)
+
+  21 Mar 2003; Dylan Carlson <absinthe@gentoo.org> orion-2.0.ebuild,
+  files/2.0/2.0-gentoo.patch, files/2.0/orion.conf, files/2.0/orion.init,
+  files/2.0/start_orion.sh, files/2.0/stop_orion.sh:
+  Version bump.  Improved post-install notices, and user/group add and remove.
 
 *orion-1.5.2b-r1 (13 Mar 2003)
 
diff --git a/net-www/orion/files/1.5.2b/stop_orion.sh b/net-www/orion/files/1.5.2b/stop_orion.sh
deleted file mode 100644
index f5556713367f..000000000000
--- a/net-www/orion/files/1.5.2b/stop_orion.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/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
diff --git a/net-www/orion/files/1.5.2b/1.5.2b-gentoo.patch b/net-www/orion/files/2.0/2.0-gentoo.patch
index 4f8f715748ac..52742e8b8a07 100644
--- a/net-www/orion/files/1.5.2b/1.5.2b-gentoo.patch
+++ b/net-www/orion/files/2.0/2.0-gentoo.patch
@@ -1,6 +1,6 @@
-diff -u -r config/application.xml.orig config/application.xml
---- config/application.xml.orig	2002-11-28 11:14:48.000000000 -0500
-+++ config/application.xml	2002-11-28 18:36:20.000000000 -0500
+diff -ur config/application.xml config.new/application.xml
+--- config/application.xml	2002-03-14 07:52:08.000000000 -0500
++++ config.new/application.xml	2003-03-21 20:06:16.000000000 -0500
 @@ -4,16 +4,16 @@
  <!-- The global application config that is the parent of all the other
  	applications in this server. -->
@@ -22,21 +22,22 @@ diff -u -r config/application.xml.orig config/application.xml
  	</log>
  
  	<data-sources path="data-sources.xml" />
-diff -u -r config/data-sources.xml.orig config/data-sources.xml
---- config/data-sources.xml.orig	2002-11-28 11:14:48.000000000 -0500
-+++ config/data-sources.xml	2002-11-28 18:36:36.000000000 -0500
+diff -ur config/data-sources.xml config.new/data-sources.xml
+--- config/data-sources.xml	2003-02-25 17:31:38.000000000 -0500
++++ config.new/data-sources.xml	2003-03-21 19:58:51.000000000 -0500
 @@ -19,7 +19,7 @@
- 		connection-driver="org.hsql.jdbcDriver"
- 		username="sa"
- 		password=""
--		url="jdbc:HypersonicSQL:./database/defaultdb"
-+		url="jdbc:HypersonicSQL:/opt/orion/database/defaultdb"
- 		inactivity-timeout="30"
- 	/>
- </data-sources>
-diff -u -r config/default-web-site.xml.orig config/default-web-site.xml
---- config/default-web-site.xml.orig	2002-11-28 18:41:30.000000000 -0500
-+++ config/default-web-site.xml	2002-11-28 18:37:20.000000000 -0500
+ 		connection-driver="org.hsqldb.jdbcDriver"

+ 		username="sa"

+ 		password=""

+-		url="jdbc:hsqldb:./database/defaultdb"

++		url="jdbc:hsqldb:/opt/orion/database/defaultdb"

+ 		inactivity-timeout="30"

+ 	/>

+ </data-sources>

+Only in config: database-schemas
+diff -ur config/default-web-site.xml config.new/default-web-site.xml
+--- config/default-web-site.xml	2002-03-14 07:52:10.000000000 -0500
++++ config.new/default-web-site.xml	2003-03-21 19:59:35.000000000 -0500
 @@ -1,12 +1,12 @@
  <?xml version="1.0"?>
  <!DOCTYPE web-site PUBLIC "Orion Web-site" "http://www.orionserver.com/dtds/web-site.dtd">
@@ -52,9 +53,9 @@ diff -u -r config/default-web-site.xml.orig config/default-web-site.xml
 -	<access-log path="../log/default-web-access.log" />
 +	<access-log path="/var/log/orion/default-web-access.log" />
  </web-site>
-diff -u -r config/global-web-application.xml.orig config/global-web-application.xml
---- config/global-web-application.xml.orig	2002-11-28 11:14:48.000000000 -0500
-+++ config/global-web-application.xml	2002-11-28 18:38:20.000000000 -0500
+diff -ur config/global-web-application.xml config.new/global-web-application.xml
+--- config/global-web-application.xml	2003-03-17 21:04:44.000000000 -0500
++++ config.new/global-web-application.xml	2003-03-21 20:01:11.000000000 -0500
 @@ -5,13 +5,13 @@
  want to debug JSP sources etc -->
  
@@ -69,23 +70,23 @@ diff -u -r config/global-web-application.xml.orig config/global-web-application.
  	<!-- The mime-mappings for this server -->
 -	<mime-mappings path="./mime.types" />
 +	<mime-mappings path="/opt/orion/config/mime.types" />
- 	<servlet-chaining servlet-name="xsl" mime-type="text/xml" />
+ <!-- Enable the below entry for automatic XSLT processing of XML docs (docs without an XSLT tag will pass through untouched but access will be slower -->
+ <!--	<servlet-chaining servlet-name="xsl" mime-type="text/xml" /> -->
  
- 	<web-app>
-diff -u -r config/jms.xml.orig config/jms.xml
---- config/jms.xml.orig	2002-11-28 11:14:48.000000000 -0500
-+++ config/jms.xml	2002-11-28 18:38:35.000000000 -0500
+diff -ur config/jms.xml config.new/jms.xml
+--- config/jms.xml	2002-03-14 07:52:12.000000000 -0500
++++ config.new/jms.xml	2003-03-21 20:01:27.000000000 -0500
 @@ -16,6 +16,6 @@
  
  	<!-- path to the log-file where JMS-events/errors are stored -->
  	<log>
 -		<file path="../log/jms.log" />
-+		<file path="/var/log/orion/jms.log" />
++		<file path="/opt/orion/log/jms.log" />
  	</log>
  </jms-server>
-diff -u -r config/rmi.xml.orig config/rmi.xml
---- config/rmi.xml.orig	2002-11-28 11:14:48.000000000 -0500
-+++ config/rmi.xml	2002-11-28 18:38:58.000000000 -0500
+diff -ur config/rmi.xml config.new/rmi.xml
+--- config/rmi.xml	2002-03-14 07:52:12.000000000 -0500
++++ config.new/rmi.xml	2003-03-21 20:04:36.000000000 -0500
 @@ -7,6 +7,6 @@
  
  	<!-- path to the log-file where RMI-events/errors are stored -->
@@ -94,9 +95,9 @@ diff -u -r config/rmi.xml.orig config/rmi.xml
 +		<file path="/var/log/orion/rmi.log" />
  	</log>
  </rmi-server>
-diff -u -r config/server.xml.orig config/server.xml
---- config/server.xml.orig	2002-11-28 11:14:48.000000000 -0500
-+++ config/server.xml	2002-11-28 18:40:46.000000000 -0500
+diff -ur config/server.xml config.new/server.xml
+--- config/server.xml	2002-03-14 07:52:14.000000000 -0500
++++ config.new/server.xml	2003-03-21 20:05:52.000000000 -0500
 @@ -2,20 +2,20 @@
  <!DOCTYPE application-server PUBLIC "Orion Application Server Config" "http://www.orionserver.com/dtds/application-server.dtd">
  
diff --git a/net-www/orion/files/1.5.2b/orion.conf b/net-www/orion/files/2.0/orion.conf
index 3bf3f2eefc81..e093e9bac67b 100644
--- a/net-www/orion/files/1.5.2b/orion.conf
+++ b/net-www/orion/files/2.0/orion.conf
@@ -1,4 +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 $
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/files/2.0/orion.conf,v 1.1 2003/03/22 03:28:35 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/2.0/orion.init
index 388aa6cbdd5a..01d561631f14 100644
--- a/net-www/orion/files/1.5.2b/orion.init
+++ b/net-www/orion/files/2.0/orion.init
@@ -1,7 +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 $
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/files/2.0/orion.init,v 1.1 2003/03/22 03:28:35 absinthe Exp $
 
 depend() {
 	need net
diff --git a/net-www/orion/files/1.5.2b/start_orion.sh b/net-www/orion/files/2.0/start_orion.sh
index 185d345233bb..0189c98450b7 100644
--- a/net-www/orion/files/1.5.2b/start_orion.sh
+++ b/net-www/orion/files/2.0/start_orion.sh
@@ -1,5 +1,5 @@
 #!/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 $
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/files/2.0/start_orion.sh,v 1.1 2003/03/22 03:28:35 absinthe Exp $
 
 source /etc/conf.d/orion
 JAVAC=${JAVA_HOME}/bin/javac
diff --git a/net-www/orion/files/2.0/stop_orion.sh b/net-www/orion/files/2.0/stop_orion.sh
new file mode 100644
index 000000000000..713367ad77b8
--- /dev/null
+++ b/net-www/orion/files/2.0/stop_orion.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/files/2.0/stop_orion.sh,v 1.1 2003/03/22 03:28:35 absinthe Exp $
+ps auxww | grep orion.jar | awk '{print $2}' | xargs kill &> /dev/null
diff --git a/net-www/orion/files/digest-orion-1.5.2b-r1 b/net-www/orion/files/digest-orion-2.0
index e69de29bb2d1..e69de29bb2d1 100644
--- a/net-www/orion/files/digest-orion-1.5.2b-r1
+++ b/net-www/orion/files/digest-orion-2.0
diff --git a/net-www/orion/orion-1.5.2b-r1.ebuild b/net-www/orion/orion-2.0.ebuild
index 43dadb4d14d0..f5c1530c30c6 100644
--- a/net-www/orion/orion-1.5.2b-r1.ebuild
+++ b/net-www/orion/orion-2.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/orion/orion-1.5.2b-r1.ebuild,v 1.1 2003/03/13 22:27:40 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/orion-2.0.ebuild,v 1.1 2003/03/22 03:28:35 absinthe Exp $
+
+inherit eutils
 
 S=${WORKDIR}/${PN}
 
@@ -18,29 +20,31 @@ DEPEND=">=virtual/jdk-1.3
 
 src_unpack() {
 	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE} and place into ${DISTDIR}."
+		einfo "Due to licensing restrictions, you must:"
+		einfo " "
+		einfo "1. Download ${At} from ${HOMEPAGE}."
+		einfo "2. Place ${At} into ${DISTDIR}."
+		einfo "3. Run 'emerge' on this ebuild again to continue."
+		die "Missing ${DISTDIR}/${At}; aborting."
 	fi
 	unzip -q ${DISTDIR}/${At} || die
 	cd ${S}
-	patch -p0 < ${FILESDIR}/${PV}/${PV}-gentoo.patch
+	epatch ${FILESDIR}/${PV}/${PV}-gentoo.patch
 }
 
 
 pkg_setup() {
-
-	if ! groupmod orion ; then
-		groupadd -g 260 orion || die "problem adding group orion"
-        fi
-
-        if ! id orion; then
-                useradd -g orion -s /bin/bash -d /opt/orion -c "orion" orion
-                assert "problem adding user orion"
-        fi
+	enewgroup orion 260
+	enewuser orion 260 /bin/bash /opt/orion orion
+	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
+        sleep 10
 }
 
 
 src_install() {
-
+	local INSTALLING
+	INSTALLING="yes"
+	
 	# CREATE DIRECTORIES
 	DIROPTIONS="--mode=0775 --owner=orion --group=orion"
 	dodir /opt/${PN}
@@ -98,39 +102,61 @@ src_install() {
 	ln -s ${JAVA_HOME}/lib/tools.jar ${D}/usr/share/${PN}/lib/tools.jar
 	
 	# INSTALL DOCS
-	dodoc Copyright.txt Readme.txt changes.txt
+	dodoc Readme.txt changes.txt
 }
 
 pkg_postinst() {
 	einfo " "
-	einfo " NOTICE!  User account created:  orion"
-	einfo " Please set a password for this account!"
-	einfo " "
-	einfo " Orion's home directory is: /opt/orion"
-	einfo " In this directory you will have all of your application data,"
-	einfo " settings and configurations."
+	einfo " NOTICE!"
+	einfo " Please set a password for the user account 'orion'"
+	einfo " if you have not done so already."
 	einfo " "
-	einfo " Runtime settings, such as CLASSPATH and desired JDK are set"
-	einfo " in /etc/conf.d/orion"
 	einfo " "
-	einfo " Logs can be found in /var/log/orion/"
+	einfo " FILE LOCATIONS:"
+	einfo " 1.  Orion home directory: /opt/orion"
+	einfo "     Contains application data, configuration files."
+	einfo " 2.  Runtime settings: /etc/conf.d/orion"
+	einfo "     Contains CLASSPATH and JDK settings."
+	einfo " 3.  Logs:  /var/log/orion/"
+	einfo " 4.  Executables, libraries:  /usr/share/${PN}/"
 	einfo " "
-	einfo " Executables and libraries are in /usr/share/${PN}/"
 	einfo " "
-	einfo " To set an administrative password, execute the following"
-	einfo " commands as user 'orion':"
-	einfo " \$ java -jar /usr/share/${PN}/lib/orion.jar -install"
+	einfo " STARTING AND STOPPING ORION:"
+	einfo "   /etc/init.d/orion start"
+	einfo "   /etc/init.d/orion stop"
+	einfo "   /etc/init.d/orion restart"
 	einfo " "
-	einfo " To start/stop orion, use '/etc/init.d/orion' as root."
 	einfo " "
+	einfo " NETWORK CONFIGURATION:"
 	einfo " By default, Orion runs on port 8080.  You can change this"
 	einfo " value by editing /opt/orion/config/default-web-site.xml."
 	einfo " "
 	einfo " To test Orion while it's running, point your web browser to:"
 	einfo " http://localhost:8080/"
 	einfo " "
+	einfo " "
+	einfo " APPLICATION DEPLOYMENT:"
+	einfo " To set an administrative password, execute the following"
+	einfo " commands as user 'orion':"
+	einfo " \$ java -jar /usr/share/${PN}/lib/orion.jar -install"
+	einfo " "
+	einfo " "
+	einfo " BUGS:"
+	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
+	einfo " may not get seen.  Thank you."
+	einfo " "
 	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
         sleep 10
 
 }
 
+pkg_postrm() {
+	if [ -z "${INSTALLING}" ] ; then
+		einfo ">>> Removing user for Orion"
+		userdel orion || die "Error removing Orion user"
+		einfo ">>> Removing group for Orion"
+		groupdel orion || die "Error removing Orion group"
+	else
+		einfo ">>> Orion user and group preserved"
+	fi
+}