rpms/jonas/devel jonas-no-iiop.patch, NONE, 1.1 jonas-outputstream.patch, NONE, 1.1 jonas.spec, 1.67, 1.68 jonas-gcj-01.patch, 1.2, NONE jonas-gcj-02.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	jonas.spec 
Added Files:
	jonas-no-iiop.patch jonas-outputstream.patch 
Removed Files:
	jonas-gcj-01.patch jonas-gcj-02.patch 
Log Message:
Rename some patches

jonas-no-iiop.patch:
 build.xml |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE jonas-no-iiop.patch ---
GNU rmic does not support IIOP.

--- jonas/build.xml.orig	2004-12-13 10:15:50.000000000 +0000
+++ jonas/build.xml	2005-03-07 12:03:13.949996729 +0000
@@ -321,6 +321,7 @@
 
   <!-- build stub and skeleton for the class given by arg classname -->
   <target name="stub" unless="${done}">
+<!--
     <echo message="doing stubs/skels ${classname} for rmi/jrmp and rmi/iiop" />
     <rmic compiler="sun"
           iiop="true"
@@ -330,6 +331,7 @@
           base="classes/common">
       <classpath refid="base.classpath" />
     </rmic>
+-->
 
     <echo message="doing stubs/skels ${classname} for rmi/jeremie" />
     <java classname="org.objectweb.jeremie.tools.jrmic.JRMICompiler"

jonas-outputstream.patch:
 JDefinitionWriter.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE jonas-outputstream.patch ---
libgcj does not implement this method.

--- jonas/src/org/objectweb/jonas/ws/JDefinitionWriter.java.orig	2004-11-23 16:31:41.000000000 +0000
+++ jonas/src/org/objectweb/jonas/ws/JDefinitionWriter.java	2005-03-07 11:41:34.536539389 +0000
@@ -151,7 +151,7 @@
         File file = new File(base, locURI).getCanonicalFile();
         logger.log(BasicLevel.DEBUG, "Writing XML Document in " + file);
         createParentIfNeeded(file);
-        Writer writer = new OutputStreamWriter(new FileOutputStream(file), cs);
+        Writer writer = new OutputStreamWriter(new FileOutputStream(file));
         ser.serialize(writer);
         writer.close();
     }
@@ -169,7 +169,7 @@
         File wsdl = new File(base, filename).getCanonicalFile();
         logger.log(BasicLevel.DEBUG, "Writing WSDL Definition in " + wsdl);
         createParentIfNeeded(wsdl);
-        Writer w = new OutputStreamWriter(new FileOutputStream(wsdl), cs);
+        Writer w = new OutputStreamWriter(new FileOutputStream(wsdl));
         writer.writeWSDL(def, w);
         w.close();
     }


Index: jonas.spec
===================================================================
RCS file: /cvs/dist/rpms/jonas/devel/jonas.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- jonas.spec	22 Jun 2005 10:34:26 -0000	1.67
+++ jonas.spec	22 Jun 2005 10:40:24 -0000	1.68
@@ -131,8 +131,8 @@
 
 # Stuff that libgcj can't do
 Patch30: jonas-no-jrmp.patch
-Patch50: jonas-gcj-01.patch
-Patch51: jonas-gcj-02.patch
+Patch31: jonas-outputstream.patch
+Patch32: jonas-no-iiop.patch
 Patch52: jonas-gcj-03.patch
 Patch55: jonas-gcj-06.patch
 
@@ -510,8 +510,8 @@
 %patch22 -p2 -b .orig
 %patch23 -p2 -b .orig
 %patch30 -p2 -b .orig
-%patch50 -p1 -b .orig
-%patch51 -p1 -b .orig
+%patch31 -p1 -b .orig
+%patch32 -p1 -b .orig
 %patch52 -p1 -b .orig
 %patch55 -p1 -b .orig
 


--- jonas-gcj-01.patch DELETED ---


--- jonas-gcj-02.patch DELETED ---