You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2008/03/26 21:55:39 UTC
svn commit: r641570 -
/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Author: dims
Date: Wed Mar 26 13:55:36 2008
New Revision: 641570
URL: http://svn.apache.org/viewvc?rev=641570&view=rev
Log:
if folks are running on JDK1.6, then they don't need JAXWS RI jars
Modified:
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java?rev=641570&r1=641569&r2=641570&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java Wed Mar 26 13:55:36 2008
@@ -19,12 +19,11 @@
package org.apache.axis2.jaxws.description.builder;
-import com.sun.tools.ws.spi.WSToolsObjectFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.deployment.util.Utils;
import org.apache.axis2.dataretrieval.SchemaSupplier;
import org.apache.axis2.dataretrieval.WSDLSupplier;
+import org.apache.axis2.deployment.util.Utils;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
@@ -58,6 +57,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLDecoder;
@@ -157,10 +157,20 @@
}
createOutputDirectory(localOutputDirectory);
- WSToolsObjectFactory factory = WSToolsObjectFactory.newInstance();
+ Class clazz;
+ try {
+ // Try the one in JDK16
+ clazz = Class.forName("com.sun.tools.internal.ws.spi.WSToolsObjectFactory");
+ } catch (Throwable t){
+ // Look for the RI
+ clazz = Class.forName("com.sun.tools.ws.spi.WSToolsObjectFactory");
+ }
+ Method m1 = clazz.getMethod("newInstance", new Class[]{});
+ Object factory = m1.invoke(new Object[]{});
String[] arguments = getWsGenArguments(className, bindingType, localOutputDirectory);
OutputStream os = new ByteArrayOutputStream();
- factory.wsgen(os, arguments);
+ Method m2 = clazz.getMethod("wsgen", new Class[]{OutputStream.class, String[].class});
+ m2.invoke(factory, os, arguments);
os.close();
wsdlDefMap = readInWSDL(localOutputDirectory);
if (wsdlDefMap.isEmpty()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org