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 pr...@apache.org on 2005/10/07 14:44:59 UTC
svn commit: r307104 - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal:
BeanParamWriter.java ParamCPPFileWriter.java ParmHeaderFileWriter.java
Author: prestonf
Date: Fri Oct 7 05:44:56 2005
New Revision: 307104
URL: http://svn.apache.org/viewcvs?rev=307104&view=rev
Log:
Part of the fix for AXISCPP-849 and AXIS-850
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParamCPPFileWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java?rev=307104&r1=307103&r2=307104&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java Fri Oct 7 05:44:56 2005
@@ -144,7 +144,7 @@
{
for (int i = 0; i < attribs.length; i++)
{
- attribs[i].setParamName( sanitiseAttributeName( attribs[i].getParamName()));
+ attribs[i].setParamName( CUtils.sanitiseAttributeName( classname, attribs[i].getParamName()));
// FJP Nillable vv
if (isElementNillable(i))
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParamCPPFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParamCPPFileWriter.java?rev=307104&r1=307103&r2=307104&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParamCPPFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParamCPPFileWriter.java Fri Oct 7 05:44:56 2005
@@ -88,7 +88,7 @@
protected abstract void writeGlobalCodes() throws WrapperFault;
protected File getFilePath() throws WrapperFault
{
- classname = sanitiseClassName( classname);
+ classname = CUtils.sanitiseClassName( classname);
String targetOutputLocation =
this.wscontext.getWrapInfo().getTargetOutputLocation();
@@ -123,35 +123,5 @@
e.printStackTrace();
throw new WrapperFault(e);
}
- }
- protected String sanitiseClassName( String name)
- {
- String sanitisedName = name;
- String cRsrvdSymblLst = ".;-&*+/^%";
-
- for( int iRSLCount = 0; iRSLCount < cRsrvdSymblLst.length(); iRSLCount++)
- {
- sanitisedName.replaceAll( cRsrvdSymblLst.substring( iRSLCount, iRSLCount), "_");
- }
-
- return sanitisedName;
- }
-
- protected String sanitiseAttributeName( String name)
- {
- String sanitisedName = name;
- String cRsrvdSymblLst = ".;-&*+/^%";
-
- for( int iRSLCount = 0; iRSLCount < cRsrvdSymblLst.length(); iRSLCount++)
- {
- sanitisedName.replaceAll( cRsrvdSymblLst.substring( iRSLCount, iRSLCount), "_");
- }
-
- if( classname.equals( sanitisedName))
- {
- sanitisedName += "_";
- }
-
- return sanitisedName;
}
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java?rev=307104&r1=307103&r2=307104&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java Fri Oct 7 05:44:56 2005
@@ -69,7 +69,7 @@
{
writePreprocessorStatements();
- classname = sanitiseClassName( classname);
+ classname = CUtils.sanitiseClassName( classname);
this.writer.write("class STORAGE_CLASS_INFO " + classname);
if (this.type.isFault())
@@ -258,7 +258,7 @@
writer.write("public:\n");
for (int i = 0; i < attribs.length; i++)
{
- attribs[i].setParamName( sanitiseAttributeName( attribs[i].getParamName()));
+ attribs[i].setParamName( CUtils.sanitiseAttributeName( classname, attribs[i].getParamName()));
// FJP Nillable vv
if (isElementNillable(i)) {
@@ -582,35 +582,4 @@
return bNillable;
}
// FJP Nillable ^^
-
- protected String sanitiseClassName( String name)
- {
- String sanitisedName = name;
- String cRsrvdSymblLst = ".;-&*+/^%";
-
- for( int iRSLCount = 0; iRSLCount < cRsrvdSymblLst.length(); iRSLCount++)
- {
- sanitisedName.replaceAll( cRsrvdSymblLst.substring( iRSLCount, iRSLCount), "_");
- }
-
- return sanitisedName;
- }
-
- protected String sanitiseAttributeName( String name)
- {
- String sanitisedName = name;
- String cRsrvdSymblLst = ".;-&*+/^%";
-
- for( int iRSLCount = 0; iRSLCount < cRsrvdSymblLst.length(); iRSLCount++)
- {
- sanitisedName.replaceAll( cRsrvdSymblLst.substring( iRSLCount, iRSLCount), "_");
- }
-
- if( classname.equals( sanitisedName))
- {
- sanitisedName += "_";
- }
-
- return sanitisedName;
- }
}