You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by na...@apache.org on 2006/07/21 05:14:09 UTC
svn commit: r424156 - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws:
WebServiceGeneratorImpl.java WrapperUtils.java info/WrapperInfo.java
Author: nadiramra
Date: Thu Jul 20 20:14:08 2006
New Revision: 424156
URL: http://svn.apache.org/viewvc?rev=424156&view=rev
Log:
Remove remnants of java generation code...
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WebServiceGeneratorImpl.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WrapperInfo.java
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WebServiceGeneratorImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WebServiceGeneratorImpl.java?rev=424156&r1=424155&r2=424156&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WebServiceGeneratorImpl.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WebServiceGeneratorImpl.java Thu Jul 20 20:14:08 2006
@@ -40,73 +40,62 @@
{
String language = wscontext.getWrapInfo().getWrapperLanguage();
- if (WrapperConstants.LANGUAGE_JAVA.equalsIgnoreCase(language))
+ if (WrapperConstants.LANGUAGE_CPP.equalsIgnoreCase(language))
{
- (new Generator(WrapperConstants.GENERATOR_WRAPPER_JAVA, wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_SERVICE_JAVA, wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_PARAM_JAVA, wscontext)).generate();
+ if (WrapperConstants.SERVER.equals(wscontext.getWrapInfo().getTargetEngine()))
+ {
+ // Generate Server objects
+ (new Generator(WrapperConstants.GENERATOR_WRAPPER_CPP,wscontext)).generate();
+ (new Generator(WrapperConstants.GENERATOR_WRAPPER_HPP,wscontext)).generate();
+ (new Generator(WrapperConstants.GENERATOR_SERVICE_CPP,wscontext)).generate();
+ (new Generator(WrapperConstants.GENERATOR_SERVICE_HPP,wscontext)).generate();
+ (new Generator(WrapperConstants.GENERATOR_CLASSLOADER_CPP,wscontext)).generate();
+ (new Generator(WrapperConstants.GENERATOR_DEPLOYMENT,wscontext)).generate();
+ (new Generator(WrapperConstants.GENERATOR_SERVER_EXCEPTION,wscontext)).generate();
+ (new Generator(WrapperConstants.GENERATOR_UNDEPLOYMENT,wscontext)).generate();
+ }
+ else
+ {
+ // Generate Client objects
+ (new Generator(WrapperConstants.GENERATOR_CLIENT_STUB_CPP,wscontext)).generate();
+ (new Generator(WrapperConstants.GENERATOR_CLIENT_STUB_HPP,wscontext)).generate();
+ }
+
+ // Generate objects common to Client and Server
+ (new Generator(WrapperConstants.GENERATOR_PARAM_CPP_ALL,wscontext)).generate();
}
- else
+ else if (WrapperConstants.LANGUAGE_C.equalsIgnoreCase(language))
{
- if (WrapperConstants.LANGUAGE_CPP.equalsIgnoreCase(language))
+ if (WrapperConstants.SERVER.equals(wscontext.getWrapInfo().getTargetEngine()))
{
- if (WrapperConstants.SERVER.equals(wscontext.getWrapInfo().getTargetEngine()))
- {
- // Generate Server objects
- (new Generator(WrapperConstants.GENERATOR_WRAPPER_CPP,wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_WRAPPER_HPP,wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_SERVICE_CPP,wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_SERVICE_HPP,wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_CLASSLOADER_CPP,wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_DEPLOYMENT,wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_SERVER_EXCEPTION,wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_UNDEPLOYMENT,wscontext)).generate();
- }
- else
- {
- // Generate Client objects
- (new Generator(WrapperConstants.GENERATOR_CLIENT_STUB_CPP,wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_CLIENT_STUB_HPP,wscontext)).generate();
- }
-
- // Generate objects common to Client and Server
- (new Generator(WrapperConstants.GENERATOR_PARAM_CPP_ALL,wscontext)).generate();
+ // Generate Server objects
+ (new Generator(WrapperConstants.GENERATOR_WRAPPER_C,wscontext)).generate();
+ (new Generator(WrapperConstants.GENERATOR_WRAPPER_H,wscontext)).generate();
+ (new Generator(WrapperConstants.GENERATOR_SERVICE_C,wscontext)).generate();
+ (new Generator(WrapperConstants.GENERATOR_CLASSLOADER_C,wscontext)).generate();
+ (new Generator(WrapperConstants.GENERATOR_DEPLOYMENT,wscontext)).generate();
+ (new Generator(WrapperConstants.GENERATOR_UNDEPLOYMENT,wscontext)).generate();
}
else
{
- if (WrapperConstants.LANGUAGE_C.equalsIgnoreCase(language))
- {
- if (WrapperConstants.SERVER.equals(wscontext.getWrapInfo().getTargetEngine()))
- {
- // Generate Server objects
- (new Generator(WrapperConstants.GENERATOR_WRAPPER_C,wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_WRAPPER_H,wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_SERVICE_C,wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_CLASSLOADER_C,wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_DEPLOYMENT,wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_UNDEPLOYMENT,wscontext)).generate();
- }
- else
- {
- // Generate Client Objects
- (new Generator(WrapperConstants.GENERATOR_CLIENT_STUB_C,wscontext)).generate();
- (new Generator(WrapperConstants.GENERATOR_CLIENT_STUB_H,wscontext)).generate();
+ // Generate Client Objects
+ (new Generator(WrapperConstants.GENERATOR_CLIENT_STUB_C,wscontext)).generate();
+ (new Generator(WrapperConstants.GENERATOR_CLIENT_STUB_H,wscontext)).generate();
- }
- // Generate objects common to Client and Server
- (new Generator(WrapperConstants.GENERATOR_PARAM_C_ALL,wscontext)).generate();
- }
- else
- {
- throw new WrapperFault("Unsupported Language" + language);
- }
}
- /*
- * Ensure the BuildScript generator is called last.
- * If called earlier not all files will be added
- * to the build script(Ex : to Makefile.am).
- */
- (new Generator(WrapperConstants.GENERATOR_BUILDSCRIPT, wscontext)).generate();
+ // Generate objects common to Client and Server
+ (new Generator(WrapperConstants.GENERATOR_PARAM_C_ALL,wscontext)).generate();
}
+ else
+ {
+ throw new WrapperFault("Unsupported Language" + language);
+ }
+
+ /*
+ * Ensure the BuildScript generator is called last.
+ * If called earlier not all files will be added
+ * to the build script(Ex : to Makefile.am).
+ */
+ (new Generator(WrapperConstants.GENERATOR_BUILDSCRIPT, wscontext)).generate();
}
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java?rev=424156&r1=424155&r2=424156&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java Thu Jul 20 20:14:08 2006
@@ -34,34 +34,6 @@
public class WrapperUtils
{
- private static int nscount = 0;
- /**
- * translation fullyqualifiedname -> packagename
- */
- public static String getPackegeName4QualifiedName(String fullyQualifiedName)
- {
- int index = fullyQualifiedName.indexOf('.');
- int lastIndex = 0;
- while (index != -1)
- {
- lastIndex = index;
- index = fullyQualifiedName.indexOf('.', lastIndex + 1);
- }
-
- if (lastIndex == 0)
- return fullyQualifiedName;
-
- return fullyQualifiedName.substring(0, lastIndex);
- }
-
- /**
- * take care of the conversion from basic type name to parameter names. e.g. int -> Int
- * the param will not intParam but IntParm !!!
- * @param packagename
- * @param classname
- * @return fully quallified name for the param class.
- */
-
/**
* extract the parameter name from the fully qualified name
* @param fullyQualifiedName
@@ -69,7 +41,6 @@
*/
public static String getClassNameFromFullyQualifiedName(String fullyQualifiedName)
{
- // TODO: Not needed - REMOVE?
int index = fullyQualifiedName.indexOf('.');
int lastIndex = 0;
while (index != -1)
@@ -83,10 +54,9 @@
return fullyQualifiedName.substring(lastIndex + 1);
}
-
/**
* get classpart of the class and if name happen to be a Simple type return
- * the Wrapper Class name(service.0 wrapper class name) eg int -> Int ect
+ * the Wrapper Class name(service.0 wrapper class name)
*
*/
public static String getLanguageTypeName4Type(Type type)
@@ -99,10 +69,7 @@
return CUtils.getCmplxArrayNameforType(qname);
}
else
- {
- String fullyQualifiedName = type.getLanguageSpecificName();
- return getClassNameFromFullyQualifiedName(fullyQualifiedName);
- }
+ return type.getLanguageSpecificName();
}
/**
@@ -115,21 +82,6 @@
char[] chars = value.toCharArray();
chars[0] = Character.toUpperCase(value.charAt(0));
return new String(chars);
- }
-
- /* This return the String of type xsi:type ="typename"*/
- public static String getParamTypeString(QName name)
- {
- nscount++;
- return " xsi:type=\\\"ns"
- + nscount
- + ":"
- + name.getLocalPart()
- + "\\\" xmlns:ns"
- + nscount
- + " = \\\""
- + name.getNamespaceURI()
- + "\\\"";
}
public static String firstCharacterToLowercase(String value)
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WrapperInfo.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WrapperInfo.java?rev=424156&r1=424155&r2=424156&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WrapperInfo.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WrapperInfo.java Thu Jul 20 20:14:08 2006
@@ -56,65 +56,40 @@
this.targetOutputLocation = targetOutputLocation;
//validate the data
- if (this.wrapperLanguage == null
- || this.wrapperLanguage.toLowerCase().equals(
- WrapperConstants.LANGUAGE_JAVA))
- {
- this.wrapperLanguage = WrapperConstants.LANGUAGE_JAVA;
- }
+ if (this.wrapperLanguage == null)
+ this.wrapperLanguage = WrapperConstants.LANGUAGE_CPP;
else
- {
this.wrapperLanguage = wrapperLanguage.toLowerCase();
- }
+
if (this.wrapperStyle == null
- || this.wrapperStyle.toLowerCase().equals(WrapperConstants.STYLE_RPC))
- {
+ || this.wrapperStyle.toLowerCase().equals(WrapperConstants.STYLE_RPC))
this.wrapperStyle = WrapperConstants.STYLE_RPC;
- }
else
- {
this.wrapperStyle = this.wrapperStyle.toLowerCase();
- }
// if (encodingStyle == null || encodingStyle.equals(WrapperConstants.ENCODING_STYLE_SOAP))
// encodingStyle = WrapperConstants.ENCODING_STYLE_SOAP;
if (targetOutputLocation == null)
- {
targetOutputLocation = ".";
- }
if (targetEngine == null
- || !WrapperConstants.CLIENT.equalsIgnoreCase(targetEngine))
- {
+ || !WrapperConstants.CLIENT.equalsIgnoreCase(targetEngine))
this.targetEngine = WrapperConstants.SERVER;
- }
else
- {
this.targetEngine = WrapperConstants.CLIENT;
- }
if (transportUri == null)
- {
this.transportUri = WrapperConstants.TRANSPORT_HTTP;
- }
else
- {
this.transportUri = transportUri;
- }
if (targetEndpointURI == null)
- {
- this.targetEndpointURI =
- WrapperConstants.DEFAULT_TARGET_ENDPOINT_URI;
-
- }
+ this.targetEndpointURI = WrapperConstants.DEFAULT_TARGET_ENDPOINT_URI;
else
- {
this.targetEndpointURI = targetEndpointURI;
- }
- this.targetNameSpaceOfWSDL =
- (targetNameSpaceOfWSDL == null) ? "" : targetNameSpaceOfWSDL;
+
+ this.targetNameSpaceOfWSDL = (targetNameSpaceOfWSDL == null) ? "" : targetNameSpaceOfWSDL;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org