rpms/jonas/devel jonas-gifencoder.patch, 1.2, 1.3 jonas.spec, 1.81, 1.82

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	jonas.spec 
Added Files:
	jonas-gifencoder.patch 
Log Message:
Revert gifencoder reversion: the original is just as bad

jonas-gifencoder.patch:
 MemoryGraphServlet.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

Index: jonas-gifencoder.patch
===================================================================
RCS file: jonas-gifencoder.patch
diff -N jonas-gifencoder.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ jonas-gifencoder.patch	4 Jul 2005 15:06:55 -0000	1.3
@@ -0,0 +1,23 @@
+--- jonas-4.3.3/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/MemoryGraphServlet.java.orig	2004-03-19 14:31:52.000000000 +0000
++++ jonas-4.3.3/jonas/src/org/objectweb/jonas/webapp/jonasadmin/monitoring/MemoryGraphServlet.java	2005-06-13 14:23:56.000000000 +0100
+@@ -42,7 +42,7 @@
+ import org.objectweb.jonas.jmx.JonasManagementRepr;
+ import org.objectweb.jonas.webapp.jonasadmin.WhereAreYou;
+ 
+-import Acme.JPM.Encoders.GifEncoder;
++import net.jmge.gif.Gif89Encoder;
+ 
+ /**
+  * @author Adriana Danes
+@@ -190,9 +190,8 @@
+         g.drawString("Memory used", xGauge, cartesianYToGraphicsY(Y_LENGTH + 20));
+         g.drawString("(Kbytes)", xGauge, cartesianYToGraphicsY(Y_LENGTH + 10));
+ 
+-        GifEncoder ge = new GifEncoder(img, out);
+-        ge.setDimensions(width, HEIGHT);
+-        ge.encode();
++        Gif89Encoder ge = new Gif89Encoder(img);
++        ge.encode(out);
+         out.close();
+     }
+ 


Index: jonas.spec
===================================================================
RCS file: /cvs/dist/rpms/jonas/devel/jonas.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- jonas.spec	4 Jul 2005 12:53:29 -0000	1.81
+++ jonas.spec	4 Jul 2005 15:06:55 -0000	1.82
@@ -126,6 +126,7 @@
 # Use system packages for various things
 Patch21: jonas-mx4j.patch
 Patch22: jonas-axis.patch
+Patch23: jonas-gifencoder.patch
 
 # Various libgcj workarounds
 Patch30: jonas-rmi-protocols.patch
@@ -249,6 +250,9 @@
 BuildRequires:	xalan-j2 >= 0:2.6.0
 BuildRequires:	xerces-j2 >= 0:2.6.2
 
+# Miscellaneous
+BuildRequires:	gif89encoder
+
 # Needed by the JAXR-RI
 BuildRequires:  castor >= 0.9.3.9
 
@@ -385,6 +389,9 @@
 Requires:	xalan-j2 >= 0:2.6.0
 Requires:	xerces-j2 >= 0:2.6.2
 
+# Miscellaneous
+Requires:	gif89encoder
+
 # Needed by the JAXR-RI
 Requires:  	castor >= 0.9.3.9
 
@@ -487,6 +494,7 @@
 # Fedora specific
 %patch21 -p2 -b .orig
 %patch22 -p2 -b .orig
+%patch23 -p2 -b .orig
 %patch30 -p1
 %patch31 -p1 -b .orig
 %patch32 -p1 -b .orig
@@ -732,6 +740,16 @@
 # ------------------------------------------------------
 #
 
+# Other stuff
+# ------------------------------------------------------
+pushd externals/jonasAdmin
+	rm -f AcmeGifEncoder.jar
+	# XXX something doesn't like square brackets in the war
+	build-jar-repository -s -p . gif89encoder
+popd
+# ------------------------------------------------------
+#
+
 # ------------------------------------------
 # Build JOnAS from sources (no IIOP version)
 # ------------------------------------------