rpms/joram/devel joram-soap.patch,NONE,1.1 joram.spec,1.10,1.11

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/joram/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29086

Modified Files:
	joram.spec 
Added Files:
	joram-soap.patch 
Log Message:
Reinstate a deleted class to fix JOnAS tests

joram-soap.patch:
 ObjectFactory.java |   51 ---------------------------------------------------
 1 files changed, 51 deletions(-)

--- NEW FILE joram-soap.patch ---
We can't compile this SOAP stuff without using binary jarfiles from
the JORAM tarball.

--- src/org/objectweb/joram/client/jms/admin/ObjectFactory.java	2004-09-02 10:03:19.000000000 +0100
+++ src/org/objectweb/joram/client/jms/admin/ObjectFactory.java	2005-10-17 19:14:30.000000000 +0100
@@ -47,9 +47,6 @@
 import org.objectweb.joram.client.jms.tcp.XATcpConnectionFactory;
 import org.objectweb.joram.client.jms.tcp.XAQueueTcpConnectionFactory;
 import org.objectweb.joram.client.jms.tcp.XATopicTcpConnectionFactory;
-import org.objectweb.joram.client.jms.soap.SoapConnectionFactory;
-import org.objectweb.joram.client.jms.soap.QueueSoapConnectionFactory;
-import org.objectweb.joram.client.jms.soap.TopicSoapConnectionFactory;
 import org.objectweb.joram.client.jms.Destination;
 import org.objectweb.joram.client.jms.admin.ClusterDestination;
 
@@ -194,54 +184,6 @@
       return new XAQueueLocalConnectionFactory();
     } else if (ref.getClassName().equals(localXATCF)) {
       return new XATopicLocalConnectionFactory();
-    } else if (ref.getClassName().equals(soapCF)) {
-      String host = (String) ref.get("cFactory.host").getContent();
-      String port = (String) ref.get("cFactory.port").getContent();
-      String cnxTimer = (String) ref.get("cFactory.cnxT").getContent();
-      String txTimer = (String) ref.get("cFactory.txT").getContent();
-      String soapCnxTimeout =
-        (String) ref.get("cFactory.soapCnxT").getContent();
-      int timer = new Integer(soapCnxTimeout).intValue() / 1000;
-      ConnectionFactory cnxFact =
-        new SoapConnectionFactory(host,
-                                  (new Integer(port)).intValue(),
-                                  timer); 
-      FactoryParameters params = cnxFact.getParameters();
-      params.connectingTimer = (new Integer(cnxTimer)).intValue();
-      params.txPendingTimer = (new Integer(txTimer)).intValue();
-      return cnxFact;
-    } else if (ref.getClassName().equals(soapQCF)) {
-      String host = (String) ref.get("cFactory.host").getContent();
-      String port = (String) ref.get("cFactory.port").getContent();
-      String cnxTimer = (String) ref.get("cFactory.cnxT").getContent();
-      String txTimer = (String) ref.get("cFactory.txT").getContent();
-      String soapCnxTimeout =
-        (String) ref.get("cFactory.soapCnxT").getContent();
-      int timer = new Integer(soapCnxTimeout).intValue() / 1000;
-      ConnectionFactory cnxFact =
-        new QueueSoapConnectionFactory(host,
-                                       (new Integer(port)).intValue(),
-                                       timer); 
-      FactoryParameters params = cnxFact.getParameters();
-      params.connectingTimer = (new Integer(cnxTimer)).intValue();
-      params.txPendingTimer = (new Integer(txTimer)).intValue();
-      return cnxFact;
-    } else if (ref.getClassName().equals(soapTCF)) {
-      String host = (String) ref.get("cFactory.host").getContent();
-      String port = (String) ref.get("cFactory.port").getContent();
-      String cnxTimer = (String) ref.get("cFactory.cnxT").getContent();
-      String txTimer = (String) ref.get("cFactory.txT").getContent();
-      String soapCnxTimeout =
-        (String) ref.get("cFactory.soapCnxT").getContent();
-      int timer = new Integer(soapCnxTimeout).intValue() / 1000;
-      ConnectionFactory cnxFact =
-        new TopicSoapConnectionFactory(host,
-                                       (new Integer(port)).intValue(),
-                                       timer); 
-      FactoryParameters params = cnxFact.getParameters();
-      params.connectingTimer = (new Integer(cnxTimer)).intValue();
-      params.txPendingTimer = (new Integer(txTimer)).intValue();
-      return cnxFact;
     } else if (ref.getClassName().equals(queue)) {
       String destName = (String) ref.get("dest.name").getContent();
       return new Queue(destName);



Index: joram.spec
===================================================================
RCS file: /cvs/dist/rpms/joram/devel/joram.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- joram.spec	8 Aug 2005 10:14:49 -0000	1.10
+++ joram.spec	27 Oct 2005 09:07:07 -0000	1.11
@@ -1,6 +1,6 @@
 %define name		joram
 %define version		4.1.5
-%define release		1jpp_5fc
+%define release		1jpp_6fc
 %define	section		free
 
 
@@ -17,6 +17,7 @@
 Patch1:		joram-mx4j.patch
 Patch2:		joram-javadoc.patch
 Patch3:		joram-adaptor.patch
+Patch4:		joram-soap.patch
 
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:	ant >= 0:1.6
@@ -96,7 +97,7 @@
 # remove classes that don't build without said jarfiles
 rm -f src/fr/dyade/aaa/jndi2/soap/SoapExt_*.java
 rm -f src/org/objectweb/joram/client/jms/soap/*.java
-rm -f src/org/objectweb/joram/client/jms/admin/ObjectFactory.java
+%patch4 -p0
 
 %build
 pushd lib
@@ -179,6 +180,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Oct 27 2005 Gary Benson <gbenson at redhat.com> 0:4.1.5-1jpp_6fc
+- Reinstate a deleted class to fix JOnAS tests.
+
 * Mon Aug  8 2005 Gary Benson <gbenson at redhat.com> 0:4.1.5-1jpp_5fc
 - Add jonas resource adaptor.