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 ha...@apache.org on 2004/11/30 17:15:07 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info WrapperInfo.java
hawkeye 2004/11/30 08:15:07
Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws WSDL2Ws.java
WrapperConstants.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c
ClientStubWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal
ClientStubWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
ClientStubWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
ClientStubWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info
WrapperInfo.java
Log:
For JIRA AXISCPP-267
Removed most of SSL from WSDL2Ws. it no longer supports this option.
However, there are still calls created in the stub to C functions. I did not want to change these in this delicate stage of the project (just prior to 1.4) so I left them in the stub as NORMAL_CHANNEL. I'll leave the JIRA issue open (adding some comments) to it.
Revision Changes Path
1.49 +2 -6 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
Index: WSDL2Ws.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- WSDL2Ws.java 18 Nov 2004 17:07:21 -0000 1.48
+++ WSDL2Ws.java 30 Nov 2004 16:15:06 -0000 1.49
@@ -618,7 +618,6 @@
String targetLanguage,
String targetImplementationStyle,
String targetEngine,
- String security,
String wsdlWrapStyle)
throws WrapperFault
{
@@ -664,8 +663,7 @@
targetEngine,
transportURI,
targetEndpointURI,
- targetNameSpaceOfWSDL,
- security),
+ targetNameSpaceOfWSDL),
new ServiceInfo(servicename, qualifiedServiceName, methods),
typeMap));
if (wsg == null)
@@ -1078,8 +1076,7 @@
+ "-help, -h print this message\n"
+ "-o<folder> target output folder - default is current folder\n"
+ "-l<c++|c> target language (c++|c) - default is c++\n"
- + "-s<server|client> target side (serve|client) - default is server\n"
- + "-c<none|ssl> channel security (ssl|none) - default is none\n"
+ + "-s<server|client> target side (server|client) - default is server\n"
+ "-w<wrapped|nonwrapped> wrapping style of the WSDL (wrapped|nonwrapped) - default is wrapped\n"
+ "-verbose, -v be verbose\n"
+ "-m<none|gnu> generate make files (none|gnu) - default is none\n");
@@ -1145,7 +1142,6 @@
"c++",
data.getOptionBykey("i"),
data.getOptionBykey("s"),
- data.getOptionBykey("c"),
data.getOptionBykey("w"));
System.out.println("\nCode generation completed.\n");
1.12 +1 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperConstants.java
Index: WrapperConstants.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperConstants.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WrapperConstants.java 22 Jul 2004 12:38:51 -0000 1.11
+++ WrapperConstants.java 30 Nov 2004 16:15:06 -0000 1.12
@@ -95,6 +95,6 @@
public static final String SOAPENC_ARRAY = "Array";
//channel security types
+ // Temporarily putting this in until 1.4 release is finished
public static final String CHANNEL_SECURITY_NONE = "none";
- public static final String CHANNEL_SECURITY_SSL = "ssl";
}
1.29 +1 -7 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java
Index: ClientStubWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ClientStubWriter.java 9 Nov 2004 10:26:19 -0000 1.28
+++ ClientStubWriter.java 30 Nov 2004 16:15:07 -0000 1.29
@@ -286,12 +286,6 @@
{
writer.write("\tAxis_Array array;\n");
}
- String channelSecurityType =
- (WrapperConstants
- .CHANNEL_SECURITY_SSL
- .equals(wscontext.getWrapInfo().getChannelSecurity()))
- ? "SSL_CHANNEL"
- : "NORMAL_CHANNEL";
String provider =
minfo.getInputUse().equals("literal")
? "C_RPC_LITERAL_PROVIDER"
@@ -302,7 +296,7 @@
"\tif (AXIS_SUCCESS != pCall->_functions->initialize(pCall->_object,"
+ provider
+ ", "
- + channelSecurityType
+ + WrapperConstants.CHANNEL_SECURITY_NONE
+ ")) return ");
if (returntype != null)
{
1.28 +1 -7 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java
Index: ClientStubWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ClientStubWriter.java 5 Nov 2004 15:57:05 -0000 1.27
+++ ClientStubWriter.java 30 Nov 2004 16:15:07 -0000 1.28
@@ -248,17 +248,11 @@
//TODO initialize return parameter appropriately.
}
}
- String channelSecurityType =
- (WrapperConstants
- .CHANNEL_SECURITY_SSL
- .equals(wscontext.getWrapInfo().getChannelSecurity()))
- ? "SSL_CHANNEL"
- : "NORMAL_CHANNEL";
writer.write(
"\t/* Following will establish the connections with the server too */\n");
writer.write(
"\tif (AXIS_SUCCESS != pCall->_functions->initialize(pCall->_object, C_DOC_PROVIDER, "
- + channelSecurityType
+ + "NORMAL_CHANNEL"
+ ")) return ");
if (returntype != null)
{
1.65 +1 -7 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
Index: ClientStubWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ClientStubWriter.java 23 Nov 2004 17:21:07 -0000 1.64
+++ ClientStubWriter.java 30 Nov 2004 16:15:07 -0000 1.65
@@ -345,12 +345,6 @@
}
}
}
- String channelSecurityType =
- (WrapperConstants
- .CHANNEL_SECURITY_SSL
- .equals(wscontext.getWrapInfo().getChannelSecurity()))
- ? "SSL_CHANNEL"
- : "NORMAL_CHANNEL";
//writer.write("\tchar* cFaultcode;\n");
//writer.write("\tchar* cFaultstring;\n");
@@ -359,7 +353,7 @@
writer.write("\ttry\n\t{");
writer.write(
"\n\t\tif (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, "
- + channelSecurityType
+ + "NORMAL_CHANNEL"
+ ")) \n\t\t\treturn ");
//damitha
if (returntype != null)
1.57 +1 -7 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
Index: ClientStubWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ClientStubWriter.java 23 Nov 2004 17:21:07 -0000 1.56
+++ ClientStubWriter.java 30 Nov 2004 16:15:07 -0000 1.57
@@ -394,18 +394,12 @@
//TODO initialize return parameter appropriately.
}
}
- String channelSecurityType =
- (WrapperConstants
- .CHANNEL_SECURITY_SSL
- .equals(wscontext.getWrapInfo().getChannelSecurity()))
- ? "SSL_CHANNEL"
- : "NORMAL_CHANNEL";
writer.write("\tconst char* pcCmplxFaultName;\n");
writer.write("\ttry\n\t{");
writer.write(
"\tif (AXIS_SUCCESS != m_pCall->initialize(CPP_DOC_PROVIDER, "
- + channelSecurityType
+ + "NORMAL_CHANNEL"
+ ")) return ");
if (returntype != null)
{
1.8 +1 -20 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WrapperInfo.java
Index: WrapperInfo.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WrapperInfo.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WrapperInfo.java 28 Oct 2004 14:14:54 -0000 1.7
+++ WrapperInfo.java 30 Nov 2004 16:15:07 -0000 1.8
@@ -42,8 +42,6 @@
private String targetEndpointURI;
//private target name space of the wsdl file
private String targetNameSpaceOfWSDL;
- //channel security type
- private String channelSecurity;
public WrapperInfo(String wrapperStyle, String wrapperLanguage,
// String encodingStyle,
@@ -52,8 +50,7 @@
String targetEngine,
String trasportUri,
String targetEndpointURI,
- String targetNameSpaceOfWSDL,
- String channelSecurity)
+ String targetNameSpaceOfWSDL)
{
this.wrapperStyle = wrapperStyle;
this.wrapperLanguage = wrapperLanguage;
@@ -130,15 +127,6 @@
}
this.targetNameSpaceOfWSDL =
(targetNameSpaceOfWSDL == null) ? "" : targetNameSpaceOfWSDL;
- if (channelSecurity == null)
- {
- this.channelSecurity = WrapperConstants.CHANNEL_SECURITY_NONE;
- }
- else
- {
- this.channelSecurity = channelSecurity;
- }
-
}
/**
@@ -232,11 +220,4 @@
return trasportUri;
}
- /**
- * @return String
- */
- public String getChannelSecurity()
- {
- return channelSecurity;
- }
}