OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Aug-2007 10:48:07
Branch: HEAD Handle: 2007082709480600
Modified files:
openpkg-src/jboss jboss.spec rc.jboss
Log:
switch to new Java toolkit world order
Summary:
Revision Changes Path
1.17 +4 -4 openpkg-src/jboss/jboss.spec
1.6 +2 -2 openpkg-src/jboss/rc.jboss
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/jboss/jboss.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 jboss.spec
--- openpkg-src/jboss/jboss.spec 25 Aug 2007 17:38:10 -0000 1.16
+++ openpkg-src/jboss/jboss.spec 27 Aug 2007 08:48:06 -0000 1.17
@@ -33,7 +33,7 @@
Group: Web
License: GPL
Version: 3.2.8
-Release: 20070825
+Release: 20070827
# package options
%option with_compat no
@@ -46,8 +46,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.0.0, JDK, j2se, ant
-PreReq: OpenPKG, openpkg >= 2.0.0, JDK, j2se, netcat
+BuildPreReq: OpenPKG, openpkg >= 2.0.0, java, java-jdk15, ant
+PreReq: OpenPKG, openpkg >= 2.0.0, java, java-jdk15, netcat
AutoReq: no
AutoReqProv: no
@@ -68,7 +68,7 @@
%setup -q -n jboss-%{version}-src
%build
- export JAVA_HOME=`%{l_rc} --query JDK_home`
+ eval `JAVA_PLATFORM="sun-jdk" %{l_prefix}/bin/java-toolkit -e`
sh build/build.sh
%install
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jboss/rc.jboss
============================================================================
$ cvs diff -u -r1.5 -r1.6 rc.jboss
--- openpkg-src/jboss/rc.jboss 25 Aug 2006 19:17:01 -0000 1.5
+++ openpkg-src/jboss/rc.jboss 27 Aug 2007 08:48:06 -0000 1.6
@@ -19,7 +19,7 @@
nc -z $jboss_check_host $jboss_check_port >/dev/null 2>&1
}
jboss_start () {
- export JAVA_HOME=$JDK_home
+ eval `JAVA_PLATFORM="sun-jdk" @l_prefix@/bin/java-toolkit -e`
# load custom environment
. @l_prefix@/etc/jboss/jboss.sh
@@ -57,7 +57,7 @@
export JBOSS_CLASSPATH
# trigger JBoss shutdown process
- export JAVA_HOME=$JDK_home
+ eval `JAVA_PLATFORM="sun-jdk" @l_prefix@/bin/java-toolkit -e`
$jboss_bindir/shutdown.sh -S
# wait until JBoss service disappears
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
