New upstream release. Still some strange issues with permission warnings, but I can't be bothered. Fixes #76906.

11 files changed, 356 insertions, 19 deletions

diff --git a/www-servers/orion/ChangeLog b/www-servers/orion/ChangeLog
index c7dcc7f8c409..e3b141495901 100644
--- a/www-servers/orion/ChangeLog
+++ b/www-servers/orion/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/orion
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/ChangeLog,v 1.5 2004/10/16 23:12:02 axxo Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/ChangeLog,v 1.6 2005/01/08 01:59:21 karltk Exp $
+
+*orion-2.0.5 (08 Jan 2005)
+
+  08 Jan 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +files/2.0.5/2.0.5-gentoo.patch, +files/2.0.5/orion.conf,
+  +files/2.0.5/orion.init, +files/2.0.5/start_orion.sh,
+  +files/2.0.5/stop_orion.sh, +orion-2.0.5.ebuild:
+  New upstream version. Partial fix for #76906.
 
   17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> orion-2.0.1.ebuild,
   orion-2.0.2.ebuild:
diff --git a/www-servers/orion/Manifest b/www-servers/orion/Manifest
index f31876e76701..5b9d5296f8c1 100644
--- a/www-servers/orion/Manifest
+++ b/www-servers/orion/Manifest
@@ -1,12 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 efa6e380eab94c73e7cf675088895277 orion-2.0.1.ebuild 3543
-MD5 1bb462fe65609612de579a5b5a8b189d orion-2.0.2.ebuild 3546
-MD5 034fa2a3923e9719ab56b531e6f326e0 ChangeLog 3707
+MD5 c8a12e74b3a5310f51d633c0dbc36760 orion-2.0.1.ebuild 3545
+MD5 e55c83c1e8cddbf9ec57fa5307294bdf orion-2.0.5.ebuild 3601
+MD5 9d286e41d6e3c3a0b29ff81f50f0a35b orion-2.0.2.ebuild 3548
+MD5 0fa012d059675ad5df5a1b07402c344a ChangeLog 4010
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 5e78308ed1712b24bcced31b5097e7fc files/digest-orion-2.0.1 60
 MD5 2e8906fc5bfd8955cfbac84d1ce4850c files/digest-orion-2.0.2 60
+MD5 64d2f904818b8231a8e04afe11ec9116 files/digest-orion-2.0.5 60
 MD5 d07a4a710da503acad73a3ff6a33b53d files/2.0/stop_orion.sh 199
 MD5 e175ab77e3672e6af0b3440ecf17d1b0 files/2.0/orion.conf 1488
 MD5 8bc08ac3b94467c660311e05f5274235 files/2.0/orion.init 621
@@ -22,10 +21,8 @@ MD5 9e9bda794856b8df9f83b685b8927e2f files/2.0.2/orion.conf 1490
 MD5 95371637dbe2fe9a6b90a338b1d2713f files/2.0.2/orion.init 623
 MD5 68df9354bacc148d8077dc4aadd5e296 files/2.0.2/start_orion.sh 329
 MD5 abd7c855a9b9601253916624d6f0e782 files/2.0.2/2.0.2-gentoo.patch 5301
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBcarL/rLF9B432nYRAm9/AJ90oxS5bQf7+xIsgm6bzSjyfcJBXgCgtRjp
-/rUrIsdRbSOPWrIRwSEh7B0=
-=/6+j
------END PGP SIGNATURE-----
+MD5 2a85e4707edaf93fac484f6d4776c907 files/2.0.5/stop_orion.sh 201
+MD5 47d0ad15473027f371c1d02681a84e1e files/2.0.5/2.0.5-gentoo.patch 5287
+MD5 10a92f413fc87c341c409074bc3ce7d4 files/2.0.5/orion.conf 1490
+MD5 9395af08eda1e3bebe30f911f366a668 files/2.0.5/orion.init 625
+MD5 640aeac33bfeef4b73251c255a5cf0b5 files/2.0.5/start_orion.sh 329
diff --git a/www-servers/orion/files/2.0.5/2.0.5-gentoo.patch b/www-servers/orion/files/2.0.5/2.0.5-gentoo.patch
new file mode 100644
index 000000000000..65c9e6925ead
--- /dev/null
+++ b/www-servers/orion/files/2.0.5/2.0.5-gentoo.patch
@@ -0,0 +1,129 @@
+diff -ur orion.orig/config/application.xml orion/config/application.xml
+--- orion.orig/config/application.xml	2004-02-24 18:23:50.000000000 +0100
++++ orion/config/application.xml	2005-01-08 02:43:48.991562592 +0100
+@@ -4,18 +4,18 @@
+ <!-- The global application config that is the parent of all the other
+ 	applications in this server. -->
+ <orion-application>
+-	<web-module id="defaultWebApp" path="../default-web-app" />
++	<web-module id="defaultWebApp" path="/opt/orion/default-web-app" />
+ 
+-	<persistence path="../persistence" />
++	<persistence path="/opt/orion/persistence" />
+ 	
+         <!-- Path to the libraries that are installed on this server.
+ 	These will accesible for the servlets, EJBs etc -->
+-	<library path="../lib" />
++	<library path="/opt/orion/lib" />
+ 	
+-	<principals path="./principals.xml" />
++	<principals path="/opt/orion/config/principals.xml" />
+ 
+ 	<log>
+-		<file path="../log/global-application.log" />
++		<file path="/var/log/orion/global-application.log" />
+ 	</log>
+ 
+ 	<data-sources path="data-sources.xml" />
+diff -ur orion.orig/config/data-sources.xml orion/config/data-sources.xml
+--- orion.orig/config/data-sources.xml	2004-02-24 18:23:50.000000000 +0100
++++ orion/config/data-sources.xml	2005-01-08 02:44:43.282309144 +0100
+@@ -19,7 +19,7 @@
+ 		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>
+diff -ur orion.orig/config/default-web-site.xml orion/config/default-web-site.xml
+--- orion.orig/config/default-web-site.xml	2004-02-24 18:23:50.000000000 +0100
++++ orion/config/default-web-site.xml	2005-01-08 02:45:21.187546672 +0100
+@@ -1,7 +1,7 @@
+ <?xml version="1.0"?>
+ <!DOCTYPE web-site PUBLIC "Orion Web-site" "http://www.orionserver.com/dtds/web-site.dtd">
+ 
+-<web-site host="[ALL]" port="80" display-name="Default Orion WebSite">
++<web-site host="[ALL]" port="8080" display-name="Default Orion WebSite [Gentoo]">
+ 	<!-- The default web-app for this site, bound to the root -->
+ 	<default-web-app application="default" name="defaultWebApp" />
+ 
+@@ -9,5 +9,5 @@
+ 	<!-- <web-app application="news" name="news-web" root="/news" /> -->
+ 
+ 	<!-- Access Log, where requests are logged to -->
+-	<access-log path="../log/default-web-access.log" />
++	<access-log path="/var/log/orion/default-web-access.log" />
+ </web-site>
+diff -ur orion.orig/config/global-web-application.xml orion/config/global-web-application.xml
+--- orion.orig/config/global-web-application.xml	2004-02-24 18:23:50.000000000 +0100
++++ orion/config/global-web-application.xml	2005-01-08 02:46:19.533676712 +0100
+@@ -5,14 +5,14 @@
+ want to debug JSP sources etc -->
+ 
+ <orion-web-app
+-	jsp-cache-directory="./persistence"
++	jsp-cache-directory="/opt/orion/persistence"
+ 	servlet-webdir="/servlet"
+ 	development="false"
+-	persistence-path="./persistence/state.ser"
++	persistence-path="/opt/orion/persistence/state.ser"
+ >
+ 
+ 	<!-- The mime-mappings for this server -->
+-	<mime-mappings path="./mime.types" />
++	<mime-mappings path="/opt/orion/config/mime.types" />
+ <!-- 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" /> -->
+ 
+diff -ur orion.orig/config/jms.xml orion/config/jms.xml
+--- orion.orig/config/jms.xml	2004-02-24 18:23:50.000000000 +0100
++++ orion/config/jms.xml	2005-01-08 02:41:52.300302360 +0100
+@@ -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" />
+ 	</log>
+ </jms-server>
+diff -ur orion.orig/config/rmi.xml orion/config/rmi.xml
+--- orion.orig/config/rmi.xml	2004-02-24 18:23:50.000000000 +0100
++++ orion/config/rmi.xml	2005-01-08 02:46:40.350512072 +0100
+@@ -7,6 +7,6 @@
+ 
+ 	<!-- path to the log-file where RMI-events/errors are stored -->
+ 	<log>
+-		<file path="../log/rmi.log" />
++		<file path="/var/log/orion/rmi.log" />
+ 	</log>
+ </rmi-server>
+diff -ur orion.orig/config/server.xml orion/config/server.xml
+--- orion.orig/config/server.xml	2004-02-24 18:23:50.000000000 +0100
++++ orion/config/server.xml	2005-01-08 02:47:35.156180344 +0100
+@@ -2,20 +2,20 @@
+ <!DOCTYPE application-server PUBLIC "Orion Application Server Config" "http://www.orionserver.com/dtds/application-server.dtd">
+ 
+ <application-server
+-	application-directory="../applications"
+-	deployment-directory="../application-deployments"
++	application-directory="/opt/orion/applications"
++	deployment-directory="/opt/orion/application-deployments"
+ >
+ 	<rmi-config path="./rmi.xml" />
+ 	<!-- JMS-server config link, uncomment to activate the JMS service -->
+ 	<!-- <jms-config path="./jms.xml" /> -->
+ 	<log>
+-		<file path="../log/server.log" />
++		<file path="/var/log/orion/server.log" />
+ 	</log>
+ 	
+ 	<global-application name="default" path="application.xml" />
+ 
+ 	<global-web-app-config path="global-web-application.xml" />
+-	<web-site path="./default-web-site.xml" />
++	<web-site path="/opt/orion/config/default-web-site.xml" />
+ 
+ 	<!-- Compiler, activate this to specify an alternative compiler such
+ 		as jikes for EJB/JSP compiling. -->
diff --git a/www-servers/orion/files/2.0.5/orion.conf b/www-servers/orion/files/2.0.5/orion.conf
new file mode 100644
index 000000000000..b339ec1ed80d
--- /dev/null
+++ b/www-servers/orion/files/2.0.5/orion.conf
@@ -0,0 +1,22 @@
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/files/2.0.5/orion.conf,v 1.1 2005/01/08 01:59:21 karltk Exp $
+# Where your web applications are located
+ORION_DIR=/opt/orion
+
+# Orion's User
+ORION_USER=orion
+
+# STDERR Log Location
+ORION_ERR=/var/log/orion/stderr.log
+
+# STDOUT Log Location
+ORION_OUT=/var/log/orion/stdout.log
+
+# Set this to the base path of whichever Java SDK you
+# want Orion to use.
+JAVA_HOME=`/bin/grep -e "JAVA_HOME" /etc/profile.env | /bin/sed -e "s/^.*'\(.*\)'$/\1/"`
+
+# Location of the Orion JARs and classes
+ORION_LIBDIR=/usr/share/orion/lib
+
+# The CLASSPATH for Orion to use.
+CLASSPATH=${JAVA_HOME}/jre/lib/rt.jar:${ORION_LIBDIR}/activation.jar:${ORION_LIBDIR}/admin.jar:${ORION_LIBDIR}/applicationlauncher.jar:${ORION_LIBDIR}/assemblerlauncher.jar:${ORION_LIBDIR}/autoupdate.jar:${ORION_LIBDIR}/clientassembler.jar:${ORION_LIBDIR}/crimson.jar:${ORION_LIBDIR}/earassembler.jar:${ORION_LIBDIR}/ejb.jar:${ORION_LIBDIR}/ejbassembler.jar:${ORION_LIBDIR}/ejbmaker.jar:${ORION_LIBDIR}/jaas.jar:${ORION_LIBDIR}/jaxp.jar:${ORION_LIBDIR}/jcert.jar:${ORION_LIBDIR}/jdbc.jar:${ORION_LIBDIR}/jndi.jar:${ORION_LIBDIR}/jnet.jar:${ORION_LIBDIR}/jsse.jar:${ORION_LIBDIR}/jta.jar:${ORION_LIBDIR}/loadbalancer.jar:${ORION_LIBDIR}/mail.jar:${ORION_LIBDIR}/orion.jar:${ORION_LIBDIR}/orionconsole.jar:${ORION_LIBDIR}/parser.jar:${ORION_LIBDIR}/taglibassembler.jar:${ORION_LIBDIR}/webappassembler.jar:${ORION_LIBDIR}/xalan.jar:${ORION_LIBDIR}/xerces.jar:${JAVA_HOME}/lib/tools.jar:.
diff --git a/www-servers/orion/files/2.0.5/orion.init b/www-servers/orion/files/2.0.5/orion.init
new file mode 100755
index 000000000000..3b7482e3a340
--- /dev/null
+++ b/www-servers/orion/files/2.0.5/orion.init
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/files/2.0.5/orion.init,v 1.1 2005/01/08 01:59:21 karltk Exp $
+
+depend() {
+	use net
+}
+
+start()	{
+	ebegin "Starting orion"
+	cd ${ORION_DIR}
+	su - orion -c /opt/orion/sbin/start_orion.sh 
+	eend $?
+}
+
+stop()	{
+	ebegin "Stopping orion"
+	su - orion -c /opt/orion/sbin/stop_orion.sh
+	sleep 2
+	eend $?
+}
+
+restart() {
+	ebegin "Restarting orion"
+	su - orion -c /opt/orion/sbin/stop_orion.sh
+	sleep 5
+	su - orion -c /opt/orion/sbin/start_orion.sh
+	eend $?
+}
diff --git a/www-servers/orion/files/2.0.5/start_orion.sh b/www-servers/orion/files/2.0.5/start_orion.sh
new file mode 100755
index 000000000000..9238f454bdfe
--- /dev/null
+++ b/www-servers/orion/files/2.0.5/start_orion.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/files/2.0.5/start_orion.sh,v 1.1 2005/01/08 01:59:21 karltk Exp $
+
+source /etc/conf.d/orion
+JAVAC=${JAVA_HOME}/bin/javac
+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/www-servers/orion/files/2.0.5/stop_orion.sh b/www-servers/orion/files/2.0.5/stop_orion.sh
new file mode 100755
index 000000000000..f39be44508f4
--- /dev/null
+++ b/www-servers/orion/files/2.0.5/stop_orion.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/files/2.0.5/stop_orion.sh,v 1.1 2005/01/08 01:59:21 karltk Exp $
+ps auxww | grep orion.jar | awk '{print $2}' | xargs kill &> /dev/null
diff --git a/www-servers/orion/files/digest-orion-2.0.5 b/www-servers/orion/files/digest-orion-2.0.5
new file mode 100644
index 000000000000..25a5c28ef57a
--- /dev/null
+++ b/www-servers/orion/files/digest-orion-2.0.5
@@ -0,0 +1 @@
+MD5 54309ae36a240b5d7b3f6fb420d4b8ae orion2.0.5.zip 7013799
diff --git a/www-servers/orion/orion-2.0.1.ebuild b/www-servers/orion/orion-2.0.1.ebuild
index 361fd578a5d4..662ebefc6bad 100644
--- a/www-servers/orion/orion-2.0.1.ebuild
+++ b/www-servers/orion/orion-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/orion-2.0.1.ebuild,v 1.2 2004/10/16 23:12:02 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/orion-2.0.1.ebuild,v 1.3 2005/01/08 01:59:21 karltk Exp $
 
 inherit eutils java-pkg
 
diff --git a/www-servers/orion/orion-2.0.2.ebuild b/www-servers/orion/orion-2.0.2.ebuild
index e6a64c4d7392..5593086f95b6 100644
--- a/www-servers/orion/orion-2.0.2.ebuild
+++ b/www-servers/orion/orion-2.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/orion-2.0.2.ebuild,v 1.2 2004/10/16 23:12:02 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/orion-2.0.2.ebuild,v 1.3 2005/01/08 01:59:21 karltk Exp $
 
 inherit eutils java-pkg
 
diff --git a/www-servers/orion/orion-2.0.5.ebuild b/www-servers/orion/orion-2.0.5.ebuild
new file mode 100644
index 000000000000..89335e72209c
--- /dev/null
+++ b/www-servers/orion/orion-2.0.5.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/orion-2.0.5.ebuild,v 1.1 2005/01/08 01:59:21 karltk Exp $
+
+inherit eutils java-pkg
+
+S=${WORKDIR}/${PN}
+
+At=${PN}${PV}.zip
+
+DESCRIPTION="Orion EJB/J2EE application webserver"
+SRC_URI="http://www.orionserver.com/distributions/${At}"
+HOMEPAGE="http://www.orionserver.com/"
+KEYWORDS="~x86 ~ppc ~sparc"
+LICENSE="ORIONSERVER"
+SLOT="0"
+DEPEND=">=virtual/jdk-1.3
+	app-arch/unzip"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/${PV}-gentoo.patch
+}
+
+pkg_preinst() {
+	enewgroup orion
+	enewuser orion -1 /bin/bash /opt/orion orion
+}
+
+src_install() {
+	# CREATE DIRECTORIES
+	diropts -m0775
+	dodir /opt/${PN}
+	dodir /opt/${PN}/config
+	dodir /opt/${PN}/sbin
+	dodir /var/log/${PN}
+
+	cd ${S}
+
+	# INSTALL STARTUP SCRIPTS
+	insinto /opt/orion/sbin
+	insopts -m0750
+	doins ${FILESDIR}/${PV}/start_orion.sh
+	doins ${FILESDIR}/${PV}/stop_orion.sh
+
+	cp -a ${FILESDIR}/${PV}/orion.init ${S}/orion
+	insinto /etc/init.d
+	insopts -m0750
+	doins ${S}/orion
+
+	cp -a ${FILESDIR}/${PV}/orion.conf ${S}/orion
+	insinto /etc/conf.d
+	insopts -m0750
+	doins ${S}/orion
+
+	# CREATE DUMMY LOG & PERSISTENCE DIR
+	dodir /var/log/${PN}
+	dodir /opt/${PN}/persistence
+
+	keepdir /var/log/${PN}
+	keepdir /opt/${PN}/persistence
+
+	# INSTALL EXTRA FILES
+	local dirs="applications default-web-app demo lib persistence autoupdate.properties"
+	for i in $dirs ; do
+		cp -a ${i} ${D}/opt/${PN}/
+	done
+
+	# INSTALL APP CONFIG
+	cd ${S}/config
+	local dirs="application.xml data-sources.xml database-schemas default-web-site.xml global-web-application.xml jms.xml mime.types principals.xml rmi.xml server.xml"
+	for i in $dirs ; do
+		cp -a ${i} ${D}/opt/${PN}/config
+	done
+
+	# INSTALL JARS
+	cd ${S}
+	for i in `ls *.jar` ; do
+		java-pkg_dojar $i
+	done
+
+	# LINK IN SDK TOOLS.JAR
+	dosym ${JAVA_HOME}/lib/tools.jar /usr/share/${PN}/lib/tools.jar
+
+	# INSTALL DOCS
+	dodoc Readme.txt changes.txt
+}
+
+pkg_postinst() {
+
+	chown -R orion:orion /opt/${PN} || die "Failed to chown in /opt"
+	chown -R orion:orion /var/log/${PN} || die "Failed to chown in /var/log"
+	chown orion:orion /etc/conf.d/orion
+
+	einfo " "
+	einfo " NOTICE!"
+	einfo " User and group 'orion' have been added."
+	einfo " Please set a password for the user account 'orion'"
+	einfo " if you have not done so already."
+	einfo " "
+	einfo " "
+	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 " "
+	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 " "
+	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 " "
+}