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 2006/10/06 06:07:52 UTC
svn commit: r453486 [4/4] - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/codegen/emitter/
codegen/src/org/apache/axis2/wsdl/template/java/
kernel/src/org/apache/axis2/description/ kernel/src/org/apache/axis2/wsdl/
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=453486&r1=453485&r2=453486
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Thu Oct 5 21:07:51 2006
@@ -689,6 +689,9 @@
boolean isWrapped) {
List extensibilityElements = bindingOutput.getExtensibilityElements();
+ if(wsdl4jOperation.getOutput() == null) {
+ return;
+ }
Message wsdl4jMessage = wsdl4jOperation.getOutput().getMessage();
for (int i = 0; i < extensibilityElements.size(); i++) {
@@ -1972,8 +1975,12 @@
if (operationType.equals(OperationType.REQUEST_RESPONSE))
return WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT;
- if (operationType.equals(OperationType.ONE_WAY))
+ if (operationType.equals(OperationType.ONE_WAY)) {
+ if(operation.getFaults().size() > 0) {
+ return WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY;
+ }
return WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY;
+ }
if (operationType.equals(OperationType.NOTIFICATION))
return WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/WSDLUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/WSDLUtil.java?view=diff&rev=453486&r1=453485&r2=453486
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/WSDLUtil.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/WSDLUtil.java Thu Oct 5 21:07:51 2006
@@ -1,88 +1,87 @@
-package org.apache.axis2.wsdl;
-
-import javax.xml.namespace.QName;
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Some utility methods for the WSDL users
- */
-public class WSDLUtil {
-
- /**
- * returns whether the given mep uri is one of the
- * input meps
- * @param mep
- * @return
- */
- public static boolean isInputPresentForMEP(String mep) {
- return WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(mep) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mep) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mep) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mep) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(mep) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(mep) ||
- WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mep)||
- WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(mep)||
- WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT.equals(mep)||
- WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN.equals(mep)||
- WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mep)||
- WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(mep);
- }
-
- /**
- * returns whether the given mep URI is one of the output meps
- * @param MEP
- * @return
- */
- public static boolean isOutputPresentForMEP(String MEP) {
- return WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP) ||
- WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
- WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT.equals(MEP) ||
- WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN.equals(MEP) ||
- WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(MEP) ||
- WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
- WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP);
- }
-
- /**
- * part names are not unique across messages. Hence
- we need some way of making the part name a unique
- one (due to the fact that the type mapper
- is a global list of types).
- The seemingly best way to do that is to
- specify a namespace for the part QName reference which
- is stored in the list. This part qname is
- temporary and should not be used with it's
- namespace URI (which happened to be the operation name)
- with _input (or a similar suffix) attached to it
- * @param opName
- * @param suffix
- * @param partName
- * @return
- */
- public static QName getPartQName(String opName,
- String suffix,
- String partName){
- return new QName(opName+suffix,partName);
- }
-
-}
+package org.apache.axis2.wsdl;
+
+import javax.xml.namespace.QName;
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Some utility methods for the WSDL users
+ */
+public class WSDLUtil {
+
+ /**
+ * returns whether the given mep uri is one of the
+ * input meps
+ * @param mep
+ * @return
+ */
+ public static boolean isInputPresentForMEP(String mep) {
+ return WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(mep) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mep) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mep) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mep) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(mep) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(mep) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mep)||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(mep)||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT.equals(mep)||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN.equals(mep)||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mep)||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(mep);
+ }
+
+ /**
+ * returns whether the given mep URI is one of the output meps
+ * @param MEP
+ * @return
+ */
+ public static boolean isOutputPresentForMEP(String MEP) {
+ return WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(MEP) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
+ WSDLConstants.WSDL20_2004Constants.MEP_URI_IN_OUT.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
+ WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP);
+ }
+
+ /**
+ * part names are not unique across messages. Hence
+ we need some way of making the part name a unique
+ one (due to the fact that the type mapper
+ is a global list of types).
+ The seemingly best way to do that is to
+ specify a namespace for the part QName reference which
+ is stored in the list. This part qname is
+ temporary and should not be used with it's
+ namespace URI (which happened to be the operation name)
+ with _input (or a similar suffix) attached to it
+ * @param opName
+ * @param suffix
+ * @param partName
+ * @return
+ */
+ public static QName getPartQName(String opName,
+ String suffix,
+ String partName){
+ return new QName(opName+suffix,partName);
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org