rpms/jonas/devel jonas-early-resolution.patch, 1.2, 1.3 jonas.spec, 1.124, 1.125

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/jonas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15719

Modified Files:
	jonas-early-resolution.patch jonas.spec 
Log Message:
Random undocumented fixes from aph

jonas-early-resolution.patch:
 jonas/build.xml                   |    4 ++--
 jonas/src/bin/config_env.sh       |    3 ++-
 jonas_tests/conformance/build.xml |    1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

Index: jonas-early-resolution.patch
===================================================================
RCS file: /cvs/dist/rpms/jonas/devel/jonas-early-resolution.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jonas-early-resolution.patch	12 Oct 2005 13:34:34 -0000	1.2
+++ jonas-early-resolution.patch	1 Nov 2005 15:03:58 -0000	1.3
@@ -28,3 +28,17 @@
        <jonas destdir="${ejbjars.dir}"
               jonasroot="${jonas.root}"
               jonasbase="${jonas.base}"
+--- jonas-4.3.3/jonas/src/bin/config_env.sh~	2005-10-25 12:39:21.000000000 +0100
++++ jonas-4.3.3/jonas/src/bin/config_env.sh	2005-11-01 10:28:20.000000000 +0000
+@@ -36,9 +36,10 @@
+ INTERBASE_CLASSES=/usr/interclient/interclient.jar
+ MYSQL_CLASSES=/usr/local/lib/mm.mysql-2.0.14/mm.mysql-2.0.14-bin.jar
+ MCKOI_CLASSES=/usr/local/lib/mkjdbc.jar
++JUNIT_CLASSES=/usr/share/java/junit.jar
+ 
+ # Avoid to add to the classpath unexisting .jar
+-for CLS in $IDB_CLASSES_1 $IDB_CLASSES_2 $ORACLE_CLASSES $POSTGRE_CLASSES $INTERBASE_CLASSES $MYSQL_CLASSES $MCKOI_CLASSES
++for CLS in $IDB_CLASSES_1 $IDB_CLASSES_2 $ORACLE_CLASSES $POSTGRE_CLASSES $INTERBASE_CLASSES $MYSQL_CLASSES $MCKOI_CLASSES $JUNIT_CLASSES
+ do
+     if [ -f "$CLS" ]
+     then


Index: jonas.spec
===================================================================
RCS file: /cvs/dist/rpms/jonas/devel/jonas.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- jonas.spec	1 Nov 2005 10:24:49 -0000	1.124
+++ jonas.spec	1 Nov 2005 15:03:59 -0000	1.125
@@ -814,6 +814,7 @@
 export CLASSPATH=../../lib/common/ow_jonas_ant.jar:%(build-classpath xalan-j2 junit bcel)
 
 ant
+cat ../../../jonas/output/JONAS_4_3_3/.package >> ../build.properties
 
 popd
 %endif