Author: rfeng
Date: Fri Sep 14 10:41:48 2007
New Revision: 575762
URL: http://svn.apache.org/viewvc?rev=575762&view=rev
Log:
Bring up the exceptions-cross-binding itest
Added:
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
- copied, changed from r575724,
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
Removed:
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java
Copied:
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
(from r575724,
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java?p2=incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java&p1=incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java&r1=575724&r2=575762&rev=575762&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
(original)
+++
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
Fri Sep 14 10:41:48 2007
@@ -28,7 +28,7 @@
import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
import stockexceptiontestservice.scatesttool.StockOffer;
-public class IntraCompositeTestCaseFIXME extends TestCase {
+public class IntraCompositeTestCase extends TestCase {
private SCADomain domain;
private StockTraderSDO stockTrader;
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java?rev=575762&r1=575761&r2=575762&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
Fri Sep 14 10:41:48 2007
@@ -160,7 +160,7 @@
// Assumes JavaBeans DB is default
if (dataBinding != null &&
!dataBinding.equals(JavaBeansDataBinding.NAME)) {
if (nonDefaultDataBindingName != null) {
- if (nonDefaultDataBindingName != dataBinding) {
+ if (!nonDefaultDataBindingName.equals(dataBinding)) {
// We've seen two different non-default DBs, e.g.
SDO and JAXB
// so unset the string and break out of the loop
nonDefaultDataBindingName = null;
Modified:
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java?rev=575762&r1=575761&r2=575762&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java
Fri Sep 14 10:41:48 2007
@@ -25,16 +25,11 @@
import javax.jws.WebMethod;
import javax.jws.WebService;
-import javax.xml.namespace.QName;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
import
org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
-import org.apache.tuscany.sca.interfacedef.util.ElementInfo;
-import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
/**
* The databinding annotation processor for java interfaces
@@ -72,6 +67,7 @@
return;
}
+ /*
String operationName = getValue(webMethod.operationName(),
operation.getName());
RequestWrapper requestWrapper =
method.getAnnotation(RequestWrapper.class);
@@ -80,7 +76,6 @@
return;
}
-
String ns = getValue(requestWrapper.targetNamespace(), tns);
String name = getValue(requestWrapper.localName(), operationName);
QName inputWrapper = new QName(ns, name);
@@ -90,10 +85,28 @@
QName outputWrapper = new QName(ns, name);
- WrapperInfo wrapperInfo = new WrapperInfo(JAXBDataBinding.NAME,
new ElementInfo(inputWrapper, null),
- new
ElementInfo(outputWrapper, null), null, null);
- operation.setWrapperStyle(true);
+ List<ElementInfo> inputElements = new ArrayList<ElementInfo>();
+ for (Annotation[] annotations : method.getParameterAnnotations()) {
+ for (Annotation annotation : annotations) {
+ if (annotation.annotationType() == WebParam.class) {
+ WebParam param = (WebParam)annotation;
+ inputElements.add(new ElementInfo(new
QName(param.targetNamespace(), param.name()), null));
+ break;
+ }
+ }
+ }
+
+ List<ElementInfo> outputElements = new ArrayList<ElementInfo>();
+ WebResult result = method.getAnnotation(WebResult.class);
+ outputElements.add(new ElementInfo(new
QName(result.targetNamespace(), result.name()), null));
+
+ WrapperInfo wrapperInfo =
+ new WrapperInfo(JAXBDataBinding.NAME, new
ElementInfo(inputWrapper, null),
+ new ElementInfo(outputWrapper, null),
inputElements, outputElements);
operation.setWrapper(wrapperInfo);
+ */
+ operation.setWrapperStyle(false);
+ operation.setDataBinding(JAXBDataBinding.NAME);
}
}
Modified:
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java?rev=575762&r1=575761&r2=575762&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java
Fri Sep 14 10:41:48 2007
@@ -104,7 +104,7 @@
} catch (NoSuchFieldException e) {
// Fall back to type inspection
Type type = helperContext.getTypeHelper().getType(faultBeanClass);
- if (type != null) {
+ if (type != null && !type.isDataType()) {
String ns = type.getURI();
String name = helperContext.getXSDHelper().getLocalName(type);
faultElement = new QName(ns, name);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
