Jaime,
Can you please do the following
- Use "cvs diff -u" from xml-axis/java directory, place output in say a diff.txt
- Create a zip with new files as well as diff.txt
- post the single zip file.
Thanks,
dims
PS: "cvs diff -u" is better than a "cvs diff" and the zip file preserves text from
getting
clobbered.
--- Jaime Meritt <[EMAIL PROTECTED]> wrote:
> All,
>
> Attached is a patch that makes the modifications to the JMS transport
> that we discussed in the Tuesday IRC chat. Mainly, it removes the
> SonicMQ usage from the sample code and replaces it with JNDI.
> Furthermore I have introduced a pluggable JMS vendor component that is
> used for vendor specific ConnectionFactory and Destination creation.
> This allows vendors that offer direct ConnectionFactory instantiation
> options to be used with Axis without requiring JNDI. Implementations
> are plugged in using a system property per Glen's suggestion. I have
> been unsuccessful in running 'ant clean all-tests' against it due to
> unrelated wsdl test failures. Would someone, such as James who has
> reviewed the code previously, commit the code once the all-tests results
> pass.
>
> If you want to apply the patch, the instructions below should do it.
>
> - Remove src\org\apache\axis\transport\jms\SonicConstants.java
> - Place jndi-connection-factory.properties into samples\jms directory
> - Unzip jms.zip into org\apache\axis\components directory
> - Apply diff.txt
>
> Thanks,
> Jaime Meritt
> Sonic Software
>
> ATTACHMENT part 2 application/octet-stream name=jndi-connection-factory.properties
> ATTACHMENT part 3 application/x-zip-compressed name=jms.zip
> cvs diff -w (in directory C:\CVSStore\xml-axis)
> ? java/samples/jms/jndi-connection-factory.properties
> ? java/src/org/apache/axis/components/jms
> cvs server: Diffing .
> cvs server: Diffing contrib
> cvs server: Diffing contrib/Axis-C++
> cvs server: Diffing contrib/Axis-C++/Axis_Release
> cvs server: Diffing contrib/Axis-C++/Linux
> cvs server: Diffing contrib/Axis-C++/Linux/KDev
> cvs server: Diffing contrib/Axis-C++/Linux/KDev/axis
> cvs server: Diffing contrib/Axis-C++/Linux/KDev/axis/axtest
> cvs server: Diffing contrib/Axis-C++/TestHarnesses
> cvs server: Diffing contrib/Axis-C++/Win32
> cvs server: Diffing contrib/Axis-C++/Win32/Axis_Release
> cvs server: Diffing contrib/Axis-C++/Win32/Calculator
> cvs server: Diffing contrib/Axis-C++/Win32/Fault
> cvs server: Diffing contrib/Axis-C++/Win32/TestHarness
> cvs server: Diffing contrib/Axis-C++/Win32/UserType
> cvs server: Diffing contrib/Axis-C++/Win32/axis-dll-not-finish
> cvs server: Diffing contrib/Axis-C++/docs
> cvs server: Diffing contrib/Axis-C++/docs/ApiDocs
> cvs server: Diffing contrib/Axis-C++/doxygen
> cvs server: Diffing contrib/Axis-C++/lib
> cvs server: Diffing contrib/Axis-C++/lib/AIX_4.3
> cvs server: Diffing contrib/Axis-C++/lib/Linux
> cvs server: Diffing contrib/Axis-C++/lib/NT_4.0
> cvs server: Diffing contrib/Axis-C++/lib/SunOS_5.6
> cvs server: Diffing contrib/Axis-C++/lib/SunOS_5.7
> cvs server: Diffing contrib/Axis-C++/lib/SunOS_5.8
> cvs server: Diffing contrib/Axis-C++/objs
> cvs server: Diffing contrib/Axis-C++/objs/AIX_4.3
> cvs server: Diffing contrib/Axis-C++/objs/AIX_4.3/common
> cvs server: Diffing contrib/Axis-C++/objs/Linux
> cvs server: Diffing contrib/Axis-C++/objs/Linux/common
> cvs server: Diffing contrib/Axis-C++/objs/NT_4.0
> cvs server: Diffing contrib/Axis-C++/objs/SunOS_5.6
> cvs server: Diffing contrib/Axis-C++/objs/SunOS_5.6/common
> cvs server: Diffing contrib/Axis-C++/objs/SunOS_5.7
> cvs server: Diffing contrib/Axis-C++/objs/SunOS_5.7/common
> cvs server: Diffing contrib/Axis-C++/objs/SunOS_5.8
> cvs server: Diffing contrib/Axis-C++/objs/SunOS_5.8/common
> cvs server: Diffing contrib/Axis-C++/src
> cvs server: Diffing contrib/Axis-C++/src/Client
> cvs server: Diffing contrib/Axis-C++/src/Encoding
> cvs server: Diffing contrib/Axis-C++/src/Message
> cvs server: Diffing contrib/Axis-C++/src/Transport
> cvs server: Diffing contrib/Axis-C++/src/Util
> cvs server: Diffing contrib/Axis-C++/src/Xml
> cvs server: Diffing contrib/Axis-C++/xerces-c
> cvs server: Diffing contrib/Axis-C++/xerces-c/bin
> cvs server: Diffing contrib/Axis-C++/xerces-c/include
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/dom
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/framework
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/idom
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/internal
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/parsers
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/sax
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/sax2
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Compilers
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/MsgLoaders
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/MsgLoaders/ICU
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/MsgLoaders/InMemory
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/MsgLoaders/MsgCatalog
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/MsgLoaders/Win32
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Platforms
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Platforms/AIX
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Platforms/HPUX
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Platforms/Linux
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Platforms/MacOS
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Platforms/OS2
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Platforms/OS390
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Platforms/PTX
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Platforms/Solaris
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Platforms/Tandem
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Platforms/Win32
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Transcoders
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Transcoders/ICU
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Transcoders/Iconv
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/Transcoders/Win32
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/util/regx
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/validators
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/validators/DTD
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/validators/common
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/validators/datatype
> cvs server: Diffing contrib/Axis-C++/xerces-c/include/validators/schema
> cvs server: Diffing contrib/Axis-C++/xerces-c/lib
> cvs server: Diffing contrib/Axis-C++/xerces-c/lib/Linux
> cvs server: Diffing java
> Index: java/build.xml
> ===================================================================
> RCS file: /home/cvspublic/xml-axis/java/build.xml,v
> retrieving revision 1.192
> diff -w -r1.192 build.xml
> 109a110
> > <exclude name="**/org/apache/axis/components/jms/*" unless="jms.present"/>
> cvs server: Diffing java/docs
> cvs server: Diffing java/lib
> cvs server: Diffing java/samples
> cvs server: Diffing java/samples/addr
> cvs server: Diffing java/samples/attachments
> cvs server: Diffing java/samples/bidbuy
> cvs server: Diffing java/samples/echo
> cvs server: Diffing java/samples/encoding
> cvs server: Diffing java/samples/integrationGuide
> cvs server: Diffing java/samples/integrationGuide/example1
> cvs server: Diffing java/samples/integrationGuide/example2
> cvs server: Diffing java/samples/jaxm
> cvs server: Diffing java/samples/jaxrpc
> cvs server: Diffing java/samples/jaxrpc/address
> cvs server: Diffing java/samples/jaxrpc/hello
> cvs server: Diffing java/samples/jms
> Index: java/samples/jms/JMSTest.java
> ===================================================================
> RCS file: /home/cvspublic/xml-axis/java/samples/jms/JMSTest.java,v
> retrieving revision 1.1
> diff -w -r1.1 JMSTest.java
> 70d69
> < import org.apache.axis.transport.jms.SonicConstants;
> 107c106
> < if ((opts.isFlagSet('?') > 0) || (opts.isFlagSet('h') > 0)) {
> ---
> > if ((opts.isFlagSet('?') > 0) || (opts.isFlagSet('h') > 0))
> 109d107
> < }
> 110a109,113
> > HashMap connectorMap = SimpleJMSListener.createConnectorMap(opts);
> > HashMap cfMap = SimpleJMSListener.createCFMap(opts);
> > String destination = opts.isValueSet('d');
> > String username = opts.getUser();
> > String password = opts.getPassword();
> 112c115,120
> < SimpleJMSListener listener = new SimpleJMSListener(opts);
> ---
> > SimpleJMSListener listener = new SimpleJMSListener(connectorMap,
> > cfMap,
> > destination,
> > username,
> > password,
> > false);
> 116c124
> < if ( args == null ) {
> ---
> > if ( args == null || args.length == 0)
> 118,124d125
> < }
> <
> < int numArgs = args.length;
> < String[] symbols = new String[numArgs];
> < for (int i = 0; i < numArgs; i++) {
> < symbols[i] = args[i];
> < }
> 128,152d128
> < HashMap cfProps = new HashMap();
> < cfProps.put(SonicConstants.BROKER_URL, opts.isValueSet('b'));
> < cfProps.put(SonicConstants.DEFAULT_USERNAME, opts.getUser());
> < cfProps.put(SonicConstants.DEFAULT_PASSWORD, opts.getPassword());
> <
> < // do we have a jndi name?
> < String jndiName = opts.isValueSet('n');
> < if (jndiName != null) {
> < // w/ a jndi name, we can get the appropriate connection factory
> < cfProps.put(JMSConstants.CONNECTION_FACTORY_JNDI_NAME, jndiName);
> < } else {
> < // w/o a jndi name, we default to using the Sonic-specific method
> < // for creating a connection factory, which is by specifying the
> < // appropriate connection factory class from SonicConstants.java
> <
> < // topics or queues?
> < String cf = null;
> < if (opts.isFlagSet('t') > 0) {
> < cf = SonicConstants.TCF_CLASS;
> < } else {
> < cf = SonicConstants.QCF_CLASS;
> < }
> < cfProps.put(JMSConstants.CONNECTION_FACTORY_CLASS, cf);
> < }
> <
> 154c130
> < JMSTransport transport = new JMSTransport(null, cfProps);
> ---
> > JMSTransport transport = new JMSTransport(connectorMap, cfMap);
> 165,168c141,142
> <
> < //call.setUsername(opts.getUser() );
> < //call.setPassword(opts.getPassword() );
> <
> ---
> > //call.setUsername(username );
> > //call.setPassword(password );
> 175c149
> < call.setProperty(JMSConstants.DESTINATION, "SampleQ1");
> ---
> > call.setProperty(JMSConstants.DESTINATION, destination);
> 181,183c155,157
> < for (int i = 0; i < symbols.length; i++) {
> < res = (Float) call.invoke(new Object[] {symbols[i]});
> < System.out.println(symbols[i] + ": " + res);
> ---
> > for (int i = 0; i < args.length; i++) {
> > res = (Float) call.invoke(new Object[] {args[i]});
>
=== message truncated ===
=====
Davanum Srinivas - http://xml.apache.org/~dims/
__________________________________________________
Do you Yahoo!?
New DSL Internet Access from SBC & Yahoo!
http://sbc.yahoo.com
