owenb 2002/06/11 08:09:23
Modified: java/test/wsdl WSDLTest.java
java/src/org/apache/wsif/stub WSIFUtils.java
java/src/org/apache/wsif WSIFConstants.java
java/src/org/apache/wsif/compiler MessageCompiler.java
java/src/org/apache/wsif/wsdl/extensions/format
FormatBindingSerializer.java
Added: java/src/org/apache/wsif/wsdl WSIFWSDLFactoryImpl.java
Removed: java/src/org/apache/wsif/stub
WSIFPrivateWSDLFactoryImpl.java
Log:
Moved WSIFPrivateWSDLFactoryImpl from org.apache.wsif.stub
to org.apache.wsif.wsdl and renamed to WSIFWSDLFactoryImpl
Revision Changes Path
1.2 +1 -1 xml-axis-wsif/java/test/wsdl/WSDLTest.java
Index: WSDLTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/wsdl/WSDLTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WSDLTest.java 6 Jun 2002 08:29:01 -0000 1.1
+++ WSDLTest.java 11 Jun 2002 15:09:23 -0000 1.2
@@ -85,7 +85,7 @@
private final static String DEF_FACTORY_PROPERTY_NAME =
"javax.wsdl.factory.DefinitionFactory";
private final static String PRIVATE_DEF_FACTORY_CLASS =
- "org.apache.wsif.stub.WSIFPrivateWSDLFactoryImpl";
+ "org.apache.wsif.wsdl.WSIFWSDLFactoryImpl";
private static String WSDL_GOOD = "";
private static String WSDL_BAD = "";
1.2 +7 -10 xml-axis-wsif/java/src/org/apache/wsif/stub/WSIFUtils.java
Index: WSIFUtils.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/stub/WSIFUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WSIFUtils.java 6 Jun 2002 08:28:52 -0000 1.1
+++ WSIFUtils.java 11 Jun 2002 15:09:23 -0000 1.2
@@ -117,9 +117,6 @@
private final static String DEF_FACTORY_PROPERTY_NAME =
"javax.wsdl.factory.WSDLFactory";
- private final static String PRIVATE_DEF_FACTORY_CLASS =
- "org.apache.wsif.stub.WSIFPrivateWSDLFactoryImpl";
-
private static Class initContextClass;
private static final String SLASH = "/";
private static final String DOT = ".";
@@ -422,7 +419,7 @@
Properties props = System.getProperties();
String oldPropValue = props.getProperty(DEF_FACTORY_PROPERTY_NAME);
- props.setProperty(DEF_FACTORY_PROPERTY_NAME, PRIVATE_DEF_FACTORY_CLASS);
+ props.setProperty(DEF_FACTORY_PROPERTY_NAME,
WSIFConstants.WSIF_WSDLFACTORY);
WSDLFactory factory = WSDLFactory.newInstance();
WSDLReader wsdlReader = factory.newWSDLReader();
@@ -469,7 +466,7 @@
Properties props = System.getProperties();
String oldPropValue = props.getProperty(DEF_FACTORY_PROPERTY_NAME);
- props.setProperty(DEF_FACTORY_PROPERTY_NAME, PRIVATE_DEF_FACTORY_CLASS);
+ props.setProperty(DEF_FACTORY_PROPERTY_NAME,
WSIFConstants.WSIF_WSDLFACTORY);
WSDLFactory factory = WSDLFactory.newInstance();
WSDLReader wsdlReader = factory.newWSDLReader();
@@ -517,7 +514,7 @@
Properties props = System.getProperties();
String oldPropValue = props.getProperty(DEF_FACTORY_PROPERTY_NAME);
- props.setProperty(DEF_FACTORY_PROPERTY_NAME, PRIVATE_DEF_FACTORY_CLASS);
+ props.setProperty(DEF_FACTORY_PROPERTY_NAME,
WSIFConstants.WSIF_WSDLFACTORY);
WSDLFactory factory = WSDLFactory.newInstance();
WSDLReader wsdlReader = factory.newWSDLReader();
@@ -562,7 +559,7 @@
Properties props = System.getProperties();
String oldPropValue = props.getProperty(DEF_FACTORY_PROPERTY_NAME);
- props.setProperty(DEF_FACTORY_PROPERTY_NAME, PRIVATE_DEF_FACTORY_CLASS);
+ props.setProperty(DEF_FACTORY_PROPERTY_NAME,
WSIFConstants.WSIF_WSDLFACTORY);
WSDLFactory factory = WSDLFactory.newInstance();
WSDLReader wsdlReader = factory.newWSDLReader();
@@ -593,7 +590,7 @@
Properties props = System.getProperties();
String oldPropValue = props.getProperty(DEF_FACTORY_PROPERTY_NAME);
- props.setProperty(DEF_FACTORY_PROPERTY_NAME, PRIVATE_DEF_FACTORY_CLASS);
+ props.setProperty(DEF_FACTORY_PROPERTY_NAME,
WSIFConstants.WSIF_WSDLFACTORY);
WSDLFactory factory = WSDLFactory.newInstance();
WSDLReader wsdlReader = factory.newWSDLReader();
@@ -626,7 +623,7 @@
Properties props = System.getProperties();
String oldPropValue = props.getProperty(DEF_FACTORY_PROPERTY_NAME);
- props.setProperty(DEF_FACTORY_PROPERTY_NAME, PRIVATE_DEF_FACTORY_CLASS);
+ props.setProperty(DEF_FACTORY_PROPERTY_NAME,
WSIFConstants.WSIF_WSDLFACTORY);
WSDLFactory factory = WSDLFactory.newInstance();
WSDLReader wsdlReader = factory.newWSDLReader();
@@ -654,7 +651,7 @@
Properties props = System.getProperties();
String oldPropValue = props.getProperty(DEF_FACTORY_PROPERTY_NAME);
- props.setProperty(DEF_FACTORY_PROPERTY_NAME, PRIVATE_DEF_FACTORY_CLASS);
+ props.setProperty(DEF_FACTORY_PROPERTY_NAME,
WSIFConstants.WSIF_WSDLFACTORY);
WSDLFactory factory = WSDLFactory.newInstance();
WSDLWriter wsdlWriter = factory.newWSDLWriter();
1.3 +20 -7 xml-axis-wsif/java/src/org/apache/wsif/WSIFConstants.java
Index: WSIFConstants.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/WSIFConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WSIFConstants.java 10 Jun 2002 10:23:06 -0000 1.2
+++ WSIFConstants.java 11 Jun 2002 15:09:23 -0000 1.3
@@ -83,13 +83,14 @@
public static final long TYPE_ERROR = 7006;
// WSIF properties for pluggable provider defaults
- public static final String WSIF_PROP_PROVIDER_PFX1 = "wsif.provider.default.";
+ public static final String WSIF_PROP_PROVIDER_PFX1 =
+ "wsif.provider.default.";
public static final String WSIF_PROP_PROVIDER_PFX2 = "wsif.provider.uri.";
// WSIF properties for asynchronous requests
public static final String WSIF_PROP_ASYNC_TIMEOUT =
"wsif.asyncrequest.timeout";
-
+
public static final String WSIF_PROP_ASYNC_USING_MDB =
"wsif.async.listener.mdb";
@@ -97,7 +98,8 @@
public static final int CORRELATION_TIMEOUT_DELAY = 5000; // 5 seconds
// WSIF properties for synchronous requests
- public static final String WSIF_PROP_SYNC_TIMEOUT = "wsif.syncrequest.timeout";
+ public static final String WSIF_PROP_SYNC_TIMEOUT =
+ "wsif.syncrequest.timeout";
// WSIFCorelationService registered JNDI name
public static final String CORRELATION_SERVICE_NAMESPACE =
@@ -108,10 +110,12 @@
"http://www.apache.org/namespaces/jrom";;
// WSIF context part name for HTTP basic authentication userid
- public static final String CONTEXT_HTTP_USER = "org.apache.wsif.http.UserName";
+ public static final String CONTEXT_HTTP_USER =
+ "org.apache.wsif.http.UserName";
// WSIF context part name for HTTP basic authentication userid
- public static final String CONTEXT_HTTP_PSWD = "org.apache.wsif.http.Password";
+ public static final String CONTEXT_HTTP_PSWD =
+ "org.apache.wsif.http.Password";
// WSIF context part name for SOAP headers
public static final String CONTEXT_SOAP_HEADERS =
@@ -124,10 +128,12 @@
public static final String JMS_REPLYTO = "JMSReplyTo";
// SOAP faults WSIFMessage part name for the fault code
- public static final String SOAP_FAULT_MSG_NAME = "org.apache.wsif.soap.fault";
+ public static final String SOAP_FAULT_MSG_NAME =
+ "org.apache.wsif.soap.fault";
// SOAP faults WSIFMessage part name for the fault code
- public static final String SOAP_FAULT_CODE = "org.apache.wsif.soap.fault.code";
+ public static final String SOAP_FAULT_CODE =
+ "org.apache.wsif.soap.fault.code";
// SOAP faults WSIFMessage part name for the fault string
public static final String SOAP_FAULT_STRING =
@@ -141,4 +147,11 @@
public static final String SOAP_FAULT_OBJECT =
"org.apache.wsif.soap.fault.object";
+ // WSDLFactory property name
+ public static final String WSDLFACTORY_PROPERTY_NAME =
+ "javax.wsdl.factory.WSDLFactory";
+
+ // WSIF implemetation of WSDLfactory
+ public static final String WSIF_WSDLFACTORY =
+ "org.apache.wsif.wsdl.WSIFWSDLFactoryImpl";
}
1.2 +2 -2
xml-axis-wsif/java/src/org/apache/wsif/compiler/MessageCompiler.java
Index: MessageCompiler.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/MessageCompiler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MessageCompiler.java 6 Jun 2002 08:28:49 -0000 1.1
+++ MessageCompiler.java 11 Jun 2002 15:09:23 -0000 1.2
@@ -77,7 +77,7 @@
import javax.wsdl.xml.WSDLReader;
import org.apache.soap.Constants;
import org.apache.wsif.WSIFException;
-import org.apache.wsif.stub.WSIFPrivateWSDLFactoryImpl;
+import org.apache.wsif.wsdl.WSIFWSDLFactoryImpl;
import com.ibm.bsf.util.CodeBuffer;
@@ -773,7 +773,7 @@
try {
//javax.wsdl.xml.WSDLReader reader =
javax.wsdl.factory.WSDLFactory.newInstance().newWSDLReader();
javax.wsdl.xml.WSDLReader reader =
- (new WSIFPrivateWSDLFactoryImpl()).newWSDLReader();
+ (new WSIFWSDLFactoryImpl()).newWSDLReader();
Definition def = reader.readWSDL(null, argSource);
MessageCompiler mc = new MessageCompiler();
mc.setVerbose(optVerbose);
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/format/FormatBindingSerializer.java
Index: FormatBindingSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/format/FormatBindingSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FormatBindingSerializer.java 6 Jun 2002 08:28:53 -0000 1.1
+++ FormatBindingSerializer.java 11 Jun 2002 15:09:23 -0000 1.2
@@ -218,7 +218,7 @@
QName qElementName;
QName qTypeName;
WSDLFactory factory =
-
WSDLFactory.newInstance("org.apache.wsif.stub.WSIFPrivateWSDLFactoryImpl");
+
WSDLFactory.newInstance("org.apache.wsif.wsdl.WSIFWSDLFactoryImpl");
WSDLReader wsdlReader = factory.newWSDLReader();
if
(wsdlReader.getFeature(Constants.FEATURE_TOLERATE_UNQUALIFIED_QNAMES)) {
qElementName =
1.1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/WSIFWSDLFactoryImpl.java
Index: WSIFWSDLFactoryImpl.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "WSIF" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation and was
* originally based on software copyright (c) 2001, 2002, International
* Business Machines, Inc., http://www.apache.org. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.wsif.wsdl;
import javax.wsdl.Definition;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.factory.WSDLFactory;
import org.apache.wsif.WSIFServiceImpl;
import org.apache.wsif.logging.Tr;
import com.ibm.wsdl.DefinitionImpl;
import com.ibm.wsdl.xml.WSDLReaderImpl;
import com.ibm.wsdl.xml.WSDLWriterImpl;
/**
* WSIF specific implementation of javax.wsdl.factory.WSDLFactory
* @author Owen Burroughs <[EMAIL PROTECTED]>
*/
public class WSIFWSDLFactoryImpl extends WSDLFactory {
public WSIFWSDLFactoryImpl() {
Tr.entry(this);
Tr.exit();
}
public Definition newDefinition() {
Tr.entry(this);
Definition def = new DefinitionImpl();
def.setExtensionRegistry(newPopulatedExtensionRegistry());
Tr.exit(def);
return def;
}
public javax.wsdl.xml.WSDLReader newWSDLReader() {
Tr.entry(this);
WSDLReaderImpl reader = new WSDLReaderImpl();
reader.setFactoryImplName(this.getClass().getName());
reader.setExtensionRegistry(newPopulatedExtensionRegistry());
Tr.exit(reader);
return reader;
}
public javax.wsdl.xml.WSDLWriter newWSDLWriter() {
Tr.entry(this);
WSDLWriterImpl writer = new WSDLWriterImpl();
Tr.exit(writer);
return writer;
}
public ExtensionRegistry newPopulatedExtensionRegistry() {
Tr.entry(this);
ExtensionRegistry extReg = WSIFServiceImpl.getCompositeExtensionRegistry();
if (extReg == null) {
extReg = new com.ibm.wsdl.extensions.PopulatedExtensionRegistry();
}
Tr.exit(extReg);
return extReg;
}
}
