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 az...@apache.org on 2007/07/05 12:18:07 UTC
svn commit: r553446 -
/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
Author: azeez
Date: Thu Jul 5 03:18:05 2007
New Revision: 553446
URL: http://svn.apache.org/viewvc?view=rev&rev=553446
Log:
Fixing the test failure caused by an NPE due to commit r553368
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
Modified: webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java?view=diff&rev=553446&r1=553445&r2=553446
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java Thu Jul 5 03:18:05 2007
@@ -66,18 +66,19 @@
private String use = Java2WSDLConstants.LITERAL;
private String locationUri;
private ArrayList extraClasses;
-
+
private String nsGenClassName = null;
private Map pkg2nsMap = null;
private boolean pretty = true;
private String wsdlVersion = WSDL_VERSION_1;
private String schemaGenClassName = null;
- private boolean generateDocLitBare =false;
+ private boolean generateDocLitBare = false;
private AxisConfiguration axisConfig;
public Java2WSDLBuilder() {
try {
- ConfigurationContext configCtx = ConfigurationContextFactory.createDefaultConfigurationContext();
+ ConfigurationContext configCtx =
+ ConfigurationContextFactory.createDefaultConfigurationContext();
axisConfig = configCtx.getAxisConfiguration();
} catch (Exception e) {
throw new RuntimeException(e);
@@ -88,10 +89,23 @@
this.axisConfig = axisConfig;
}
+ public Java2WSDLBuilder(OutputStream out, String className, ClassLoader classLoader) {
+ try {
+ ConfigurationContext configCtx =
+ ConfigurationContextFactory.createDefaultConfigurationContext();
+ axisConfig = configCtx.getAxisConfiguration();
+ this.out = out;
+ this.className = className;
+ this.classLoader = classLoader;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
public String getSchemaTargetNamespace() throws Exception {
- if ( schemaTargetNamespace == null ) {
+ if (schemaTargetNamespace == null) {
schemaTargetNamespace =
- Java2WSDLUtils.schemaNamespaceFromClassName(className, classLoader, resolveNSGen()).toString();
+ Java2WSDLUtils.schemaNamespaceFromClassName(className, classLoader, resolveNSGen()).toString();
}
return schemaTargetNamespace;
}
@@ -125,7 +139,7 @@
}
public String getSchemaTargetNamespacePrefix() {
- if ( schemaTargetNamespacePrefix == null ) {
+ if (schemaTargetNamespacePrefix == null) {
this.schemaTargetNamespacePrefix = SCHEMA_NAMESPACE_PRFIX;
}
return schemaTargetNamespacePrefix;
@@ -177,19 +191,11 @@
this.generateDocLitBare = generateDocLitBare;
}
- public Java2WSDLBuilder(OutputStream out, String className, ClassLoader classLoader) {
- this.out = out;
- this.className = className;
- this.classLoader = classLoader;
- }
-
-
-
public void generateWSDL() throws Exception {
SchemaGenerator schemaGenerator = resolveSchemaGen(classLoader,
- className,
- getSchemaTargetNamespace(),
- getSchemaTargetNamespacePrefix());
+ className,
+ getSchemaTargetNamespace(),
+ getSchemaTargetNamespacePrefix());
ArrayList excludedOperation = new ArrayList();
Utils.addExcludeMethods(excludedOperation);
@@ -199,8 +205,8 @@
schemaGenerator.setExtraClasses(getExtraClasses());
schemaGenerator.setNsGen(resolveNSGen());
schemaGenerator.setPkg2nsmap(getPkg2nsMap());
- if ( getPkg2nsMap() != null && !getPkg2nsMap().isEmpty() &&
- (getPkg2nsMap().containsKey(ALL) || getPkg2nsMap().containsKey(ALL.toUpperCase())) ) {
+ if (getPkg2nsMap() != null && !getPkg2nsMap().isEmpty() &&
+ (getPkg2nsMap().containsKey(ALL) || getPkg2nsMap().containsKey(ALL.toUpperCase()))) {
schemaGenerator.setUseWSDLTypesNamespace(true);
}
@@ -219,21 +225,21 @@
messageReciverMap.put(
WSDL2Constants.MEP_URI_IN_OUT,
inOutmessageReceiver);
- AxisService service = new AxisService ();
+ AxisService service = new AxisService();
schemaGenerator.setAxisService(service);
AxisService axisService = AxisService.createService(className,
- serviceName == null ? Java2WSDLUtils.getSimpleClassName(className) : serviceName,
- axisConfig,
- messageReciverMap,
- targetNamespace == null ? Java2WSDLUtils.namespaceFromClassName(className, classLoader, resolveNSGen()).toString() : targetNamespace,
- classLoader,
- schemaGenerator,service);
+ serviceName == null ? Java2WSDLUtils.getSimpleClassName(className) : serviceName,
+ axisConfig,
+ messageReciverMap,
+ targetNamespace == null ? Java2WSDLUtils.namespaceFromClassName(className, classLoader, resolveNSGen()).toString() : targetNamespace,
+ classLoader,
+ schemaGenerator, service);
schemaGenerator.setAxisService(axisService);
axisService.setTargetNamespacePrefix(targetNamespacePrefix);
axisService.setSchemaTargetNamespace(getSchemaTargetNamespace());
axisService.setSchematargetNamespacePrefix(getSchemaTargetNamespacePrefix());
String uri = locationUri;
- if(uri == null){
+ if (uri == null) {
uri = DEFAULT_LOCATION_URL + (serviceName == null ? Java2WSDLUtils.getSimpleClassName(className) : serviceName);
}
axisService.setEPRs(new String[]{uri});
@@ -244,7 +250,7 @@
g.setStyle(this.style);
g.setUse(this.use);
OMElement wsdlElement = g.generateOM();
- if(!isPretty()){
+ if (!isPretty()) {
wsdlElement.serialize(out);
} else {
XMLPrettyPrinter.prettify(wsdlElement, out);
@@ -252,7 +258,7 @@
} else {
AxisService2WSDL20 g = new AxisService2WSDL20(axisService);
OMElement wsdlElement = g.generateOM();
- if(!isPretty()){
+ if (!isPretty()) {
wsdlElement.serialize(out);
} else {
XMLPrettyPrinter.prettify(wsdlElement, out);
@@ -310,15 +316,15 @@
public void setPkg2nsMap(Map pkg2nsMap) {
this.pkg2nsMap = pkg2nsMap;
}
-
+
private NamespaceGenerator resolveNSGen() {
- NamespaceGenerator nsGen ;
- if(this.nsGenClassName == null){
+ NamespaceGenerator nsGen;
+ if (this.nsGenClassName == null) {
nsGen = new DefaultNamespaceGenerator();
} else {
try {
- nsGen = (NamespaceGenerator)Class.forName(this.nsGenClassName).newInstance();
- } catch ( Exception e ) {
+ nsGen = (NamespaceGenerator) Class.forName(this.nsGenClassName).newInstance();
+ } catch (Exception e) {
nsGen = new DefaultNamespaceGenerator();
}
}
@@ -326,18 +332,18 @@
}
private SchemaGenerator resolveSchemaGen(ClassLoader loader, String className,
- String schematargetNamespace,
- String schematargetNamespacePrefix) throws Exception {
- SchemaGenerator schemaGen ;
- if(this.schemaGenClassName == null){
+ String schematargetNamespace,
+ String schematargetNamespacePrefix) throws Exception {
+ SchemaGenerator schemaGen;
+ if (this.schemaGenClassName == null) {
if (generateDocLitBare) {
- schemaGen = new DocLitBareSchemaGenerator(
- loader, className, schematargetNamespace,
- schematargetNamespacePrefix,null);
+ schemaGen = new DocLitBareSchemaGenerator(
+ loader, className, schematargetNamespace,
+ schematargetNamespacePrefix, null);
} else {
schemaGen = new DefaultSchemaGenerator(
loader, className, schematargetNamespace,
- schematargetNamespacePrefix,null);
+ schematargetNamespacePrefix, null);
}
} else {
@@ -346,16 +352,16 @@
Constructor constructor = clazz.getConstructor(
new Class[]{ClassLoader.class, String.class, String.class, String.class});
schemaGen = (SchemaGenerator) constructor.newInstance(
- new Object[]{loader, className, schematargetNamespace, schematargetNamespacePrefix});
- } catch ( Exception e ) {
+ new Object[]{loader, className, schematargetNamespace, schematargetNamespacePrefix});
+ } catch (Exception e) {
if (generateDocLitBare) {
schemaGen = new DocLitBareSchemaGenerator(
loader, className, schematargetNamespace,
- schematargetNamespacePrefix,null);
+ schematargetNamespacePrefix, null);
} else {
- schemaGen = new DefaultSchemaGenerator(
- loader, className, schematargetNamespace,
- schematargetNamespacePrefix,null);
+ schemaGen = new DefaultSchemaGenerator(
+ loader, className, schematargetNamespace,
+ schematargetNamespacePrefix, null);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org