version bump

6 files changed, 117 insertions, 13 deletions

diff --git a/dev-java/snipsnap-bin/ChangeLog b/dev-java/snipsnap-bin/ChangeLog
index ec9ee52d02e4..35e7bb74a2b7 100644
--- a/dev-java/snipsnap-bin/ChangeLog
+++ b/dev-java/snipsnap-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/snipsnap-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/snipsnap-bin/ChangeLog,v 1.3 2004/09/05 07:18:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/snipsnap-bin/ChangeLog,v 1.4 2004/09/15 23:00:06 axxo Exp $
+
+*snipsnap-bin-1.0_beta1 (16 Sep 2004)
+
+  16 Sep 2004; Thomas Matthijs <axxo@gentoo.org> +files/1.0_beta1-run.sh,
+  +files/1.0_beta1-snipsnap, +snipsnap-bin-1.0_beta1.ebuild:
+  version bump, 64154
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/dev-java/snipsnap-bin/Manifest b/dev-java/snipsnap-bin/Manifest
index cf475d370020..3a063c3a5a4e 100644
--- a/dev-java/snipsnap-bin/Manifest
+++ b/dev-java/snipsnap-bin/Manifest
@@ -1,16 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 f7470283de7a71d9c1c305966c6eedad snipsnap-bin-0.5.1a-r1.ebuild 704
+MD5 224a1a12efd6c8965cfc055e66cddffe snipsnap-bin-1.0_beta1.ebuild 748
 MD5 c230fe6eca428fadf54475f3164ce80d ChangeLog 1123
-MD5 ab4b8d9f503c24fb0b5f16479e373aca files/0.5.1a-run.sh 1763
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 3277b2bd71b9b75a519d72b099cc03cf files/1.0_beta1-snipsnap 568
+MD5 ab4b8d9f503c24fb0b5f16479e373aca files/1.0_beta1-run.sh 1763
+MD5 7b387820adfdc4f5164a0388738aa520 files/digest-snipsnap-bin-1.0_beta1 84
 MD5 3277b2bd71b9b75a519d72b099cc03cf files/0.5.1a-snipsnap 568
+MD5 ab4b8d9f503c24fb0b5f16479e373aca files/0.5.1a-run.sh 1763
 MD5 5b47f6680b38ea95f097319cab50a00a files/digest-snipsnap-bin-0.5.1a-r1 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBOr3jI1lqEGTUzyQRAsRsAKCWGMT9MR8weQJJWdp7xyT5lZlBkACgtHFu
-Jd+69ysZXgaox3BDPCBA+44=
-=4mrG
------END PGP SIGNATURE-----
diff --git a/dev-java/snipsnap-bin/files/1.0_beta1-run.sh b/dev-java/snipsnap-bin/files/1.0_beta1-run.sh
new file mode 100644
index 000000000000..eaabefbeb734
--- /dev/null
+++ b/dev-java/snipsnap-bin/files/1.0_beta1-run.sh
@@ -0,0 +1,55 @@
+#! /bin/sh
+
+base=/opt/snipsnap
+jar=$base/lib
+
+if [ -f $HOME/.gentoo/java-env ] ; then
+  source $HOME/.gentoo/java-env
+else
+  JAVA_HOME=`java-config --jdk-home`
+  if [ -z $JAVA_HOME ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  echo "Please set JAVA_HOME environment variable!"
+  echo "A Java SDK of at least version 1.3 is required!"
+  exit
+fi
+
+# check whether the java compiler is available
+if [ ! -f $JAVA_HOME/lib/tools.jar -a ! -f /System/Library/Frameworks/JavaVM.framework/Classes/classes.jar ]; then
+  echo "$JAVA_HOME/lib/tools.jar or MacOS X pendant not found, cannot compile jsp files"
+  echo "Make sure tools.jar or similar from the Java SDK is in the classpath!"
+  exit 
+else
+  if [ -f /System/Library/Frameworks/JavaVM.framework/Classes/classes.jar ]; then
+    TOOLS=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar
+  else
+    TOOLS=$JAVA_HOME/lib/tools.jar
+  fi
+fi
+
+if [ ! -f $jar/snipsnap.jar ]; then
+  echo "$jar/snipsnap.jar missing, please compile application first"
+  exit
+fi
+
+# put classpath together (this is a script-local variable)
+CLASSPATH=$jar/org.mortbay.jetty.jar:$jar/javax.servlet.jar:$jar/org.apache.crimson.jar:$jar/org.apache.jasper.jar:$jar/jdbcpool.jar:$jar/mckoidb.jar:$TOOLS
+
+if [ "$1" = "admin" ]; then
+  $JAVA_HOME/bin/java -jar $jar/snipsnap-utils.jar "$2" "$3" 
+  exit
+fi
+
+if [ "$1" = "-debug" ]; then
+  DBG="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5000"
+fi
+
+# execute application server
+[ -f $base/server.log ] && mv $base/server.log $base/server.log.old
+cd $base
+$JAVA_HOME/bin/java -server $DBG -jar $jar/snipsnap.jar -Duser.dir=$base $cmdline > $base/server.log 2>&1 &
+echo "$!" > /var/run/snipsnap.pid  
diff --git a/dev-java/snipsnap-bin/files/1.0_beta1-snipsnap b/dev-java/snipsnap-bin/files/1.0_beta1-snipsnap
new file mode 100644
index 000000000000..256be5670b93
--- /dev/null
+++ b/dev-java/snipsnap-bin/files/1.0_beta1-snipsnap
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/snipsnap-bin/files/1.0_beta1-snipsnap,v 1.1 2004/09/15 23:00:06 axxo Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting snipsnap"
+	start-stop-daemon -o --quiet --start --startas /opt/snipsnap/run.sh \
+	    --pidfile /var/run/snipsnap.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping snipsnap"
+	start-stop-daemon -o --quiet --stop --pidfile /var/run/snipsnap.pid
+	rm /var/run/snipsnap.pid
+	eend $?
+}
+
diff --git a/dev-java/snipsnap-bin/files/digest-snipsnap-bin-1.0_beta1 b/dev-java/snipsnap-bin/files/digest-snipsnap-bin-1.0_beta1
new file mode 100644
index 000000000000..9fcc449d701d
--- /dev/null
+++ b/dev-java/snipsnap-bin/files/digest-snipsnap-bin-1.0_beta1
@@ -0,0 +1 @@
+MD5 d725519a5e0e8dfec5772b8985501c12 snipsnap-1.0b1-uttoxeter-20040914.tgz 20681196
diff --git a/dev-java/snipsnap-bin/snipsnap-bin-1.0_beta1.ebuild b/dev-java/snipsnap-bin/snipsnap-bin-1.0_beta1.ebuild
new file mode 100644
index 000000000000..c3cd32de34b0
--- /dev/null
+++ b/dev-java/snipsnap-bin/snipsnap-bin-1.0_beta1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/snipsnap-bin/snipsnap-bin-1.0_beta1.ebuild,v 1.1 2004/09/15 23:00:06 axxo Exp $
+
+DESCRIPTION="A blog/wiki personal content management system"
+HOMEPAGE="http://snipsnap.org"
+MY_P=${P/-bin}
+MY_PN=${PN/-bin}
+SRC_URI="ftp://snipsnap.org/${MY_PN}/${MY_PN}-1.0b1-uttoxeter-20040914.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+DEPEND=">=virtual/jre-1.3"
+S=${WORKDIR}/${MY_PN}-1.0b1-uttoxeter
+
+src_install() {
+	dodir /opt/${MY_PN}
+	cp -pR * ${D}/opt/${MY_PN}
+
+	exeinto /opt/${MY_PN}
+	newexe ${FILESDIR}/${PV}-run.sh run.sh
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${PV}-snipsnap snipsnap
+}