JBossWS SVN: r9092 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-22 09:41:38 -0500 (Thu, 22 Jan 2009)
New Revision: 9092
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2480] excluding test
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-01-22 14:33:22 UTC (rev 9091)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-01-22 14:41:38 UTC (rev 9092)
@@ -69,9 +69,6 @@
# [JBWS-2112] Cannot use CXF with endpoint API
org/jboss/test/ws/jaxws/endpoint/**
-# [JBWS-2114] IllegalArgumentException: Wrong target. class
-org/jboss/test/ws/jaxws/jbws1283/**
-
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
@@ -105,3 +102,6 @@
# [JBWS-2478] Investigate why WS-Security CXF tests are failing
org/jboss/test/ws/jaxws/samples/wsse/**
+
+# [JBWS-2480] Soap attachments are dropped on server response
+org/jboss/test/ws/jaxws/jbws1283/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-01-22 14:33:22 UTC (rev 9091)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-01-22 14:41:38 UTC (rev 9092)
@@ -69,9 +69,6 @@
# [JBWS-2112] Cannot use CXF with endpoint API
org/jboss/test/ws/jaxws/endpoint/**
-# [JBWS-2114] IllegalArgumentException: Wrong target. class
-org/jboss/test/ws/jaxws/jbws1283/**
-
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
@@ -105,3 +102,6 @@
# [JBWS-2478] Investigate why WS-Security CXF tests are failing
org/jboss/test/ws/jaxws/samples/wsse/**
+
+# [JBWS-2480] Soap attachments are dropped on server response
+org/jboss/test/ws/jaxws/jbws1283/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-01-22 14:33:22 UTC (rev 9091)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-01-22 14:41:38 UTC (rev 9092)
@@ -69,9 +69,6 @@
# [JBWS-2112] Cannot use CXF with endpoint API
org/jboss/test/ws/jaxws/endpoint/**
-# [JBWS-2114] IllegalArgumentException: Wrong target. class
-org/jboss/test/ws/jaxws/jbws1283/**
-
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
@@ -105,3 +102,6 @@
# [JBWS-2478] Investigate why WS-Security CXF tests are failing
org/jboss/test/ws/jaxws/samples/wsse/**
+
+# [JBWS-2480] Soap attachments are dropped on server response
+org/jboss/test/ws/jaxws/jbws1283/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-01-22 14:33:22 UTC (rev 9091)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-01-22 14:41:38 UTC (rev 9092)
@@ -76,9 +76,6 @@
# [JBWS-2112] Cannot use CXF with endpoint API
org/jboss/test/ws/jaxws/endpoint/**
-# [JBWS-2114] IllegalArgumentException: Wrong target. class
-org/jboss/test/ws/jaxws/jbws1283/**
-
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
@@ -106,3 +103,6 @@
# [JBWS-2478] Investigate why WS-Security CXF tests are failing
org/jboss/test/ws/jaxws/samples/wsse/**
+
+# [JBWS-2480] Soap attachments are dropped on server response
+org/jboss/test/ws/jaxws/jbws1283/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-01-22 14:33:22 UTC (rev 9091)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-01-22 14:41:38 UTC (rev 9092)
@@ -76,9 +76,6 @@
# [JBWS-2112] Cannot use CXF with endpoint API
org/jboss/test/ws/jaxws/endpoint/**
-# [JBWS-2114] IllegalArgumentException: Wrong target. class
-org/jboss/test/ws/jaxws/jbws1283/**
-
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
@@ -106,3 +103,6 @@
# [JBWS-2478] Investigate why WS-Security CXF tests are failing
org/jboss/test/ws/jaxws/samples/wsse/**
+
+# [JBWS-2480] Soap attachments are dropped on server response
+org/jboss/test/ws/jaxws/jbws1283/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-01-22 14:33:22 UTC (rev 9091)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-01-22 14:41:38 UTC (rev 9092)
@@ -76,9 +76,6 @@
# [JBWS-2112] Cannot use CXF with endpoint API
org/jboss/test/ws/jaxws/endpoint/**
-# [JBWS-2114] IllegalArgumentException: Wrong target. class
-org/jboss/test/ws/jaxws/jbws1283/**
-
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
@@ -106,3 +103,6 @@
# [JBWS-2478] Investigate why WS-Security CXF tests are failing
org/jboss/test/ws/jaxws/samples/wsse/**
+
+# [JBWS-2480] Soap attachments are dropped on server response
+org/jboss/test/ws/jaxws/jbws1283/**
15 years, 11 months
JBossWS SVN: r9091 - stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-22 09:33:22 -0500 (Thu, 22 Jan 2009)
New Revision: 9091
Modified:
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java
Log:
[JBWS-2466] Adding comment
Modified: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2009-01-22 11:20:20 UTC (rev 9090)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2009-01-22 14:33:22 UTC (rev 9091)
@@ -234,6 +234,12 @@
JavassistUtils.addSignature(field, typeSignature);
}
+
+ // Conformance 3.14 (use of JAXB annotations): An implementation MUST honor any JAXB annotation that
+ // exists on an SEI method or parameter to assure that the proper XML infoset is used when marshalling/
+ // unmarshalling the the return value or parameters of the method. The set of JAXB annotations that MUST be
+ // supported are: javax.xml.bind.annotation.XmlAttachementRef,javax.xml.bind.annotation.XmlList,
+ // javax.xml.bind.XmlMimeType and javax.xml.bind.annotation.adapters.Xml.JavaTypeAdapter
JavassistUtils.Annotation annotation;
// Add @XmlElement
if (!xmlTransient)
15 years, 11 months
JBossWS SVN: r9090 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-22 06:20:20 -0500 (Thu, 22 Jan 2009)
New Revision: 9090
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
Log:
use proper invoker
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2009-01-22 09:44:03 UTC (rev 9089)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2009-01-22 11:20:20 UTC (rev 9090)
@@ -114,7 +114,6 @@
Object retObj = null;
try
{
- invContext.setTargetBean(getTargetBean(ep));
invHandler.invoke(ep, inv);
retObj = inv.getReturnValue();
}
@@ -128,12 +127,6 @@
protected abstract WebServiceContext getWebServiceContext(MessageContext msgCtx);
- protected Object getTargetBean(Endpoint ep) throws InstantiationException, IllegalAccessException
- {
- Class beanClass = ep.getTargetBeanClass();
- return beanClass.newInstance();
- }
-
protected void handleException(Exception ex)
{
Throwable th = ex;
15 years, 11 months
JBossWS SVN: r9089 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-22 04:44:03 -0500 (Thu, 22 Jan 2009)
New Revision: 9089
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
Log:
enable another test
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-01-22 09:33:26 UTC (rev 9088)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-01-22 09:44:03 UTC (rev 9089)
@@ -71,7 +71,6 @@
# [JBWS-2114] IllegalArgumentException: Wrong target. class
org/jboss/test/ws/jaxws/jbws1283/**
-org/jboss/test/ws/jaxws/jbws1822/**
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-01-22 09:33:26 UTC (rev 9088)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-01-22 09:44:03 UTC (rev 9089)
@@ -71,7 +71,6 @@
# [JBWS-2114] IllegalArgumentException: Wrong target. class
org/jboss/test/ws/jaxws/jbws1283/**
-org/jboss/test/ws/jaxws/jbws1822/**
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-01-22 09:33:26 UTC (rev 9088)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-01-22 09:44:03 UTC (rev 9089)
@@ -71,7 +71,6 @@
# [JBWS-2114] IllegalArgumentException: Wrong target. class
org/jboss/test/ws/jaxws/jbws1283/**
-org/jboss/test/ws/jaxws/jbws1822/**
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
15 years, 11 months
JBossWS SVN: r9088 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-22 04:33:26 -0500 (Thu, 22 Jan 2009)
New Revision: 9088
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
enable tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-01-22 08:37:32 UTC (rev 9087)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-01-22 09:33:26 UTC (rev 9088)
@@ -24,7 +24,6 @@
# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/namespace/**
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
@@ -56,12 +55,6 @@
# [CXF-1521] Exception handling with @WebFault annotation
org/jboss/test/ws/jaxws/webfault/**
-# [CXF-1522] NPE in ServiceUtils
-org/jboss/test/ws/jaxws/jbws1566/**
-
-# [CXF-1623] Wrong AnnotationHandlerChainBuilder.protocolMatches() method implementation or preconditions
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
-
# [CXF-1624] XmlSchemaException: Schema name conflict in collection
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-01-22 08:37:32 UTC (rev 9087)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-01-22 09:33:26 UTC (rev 9088)
@@ -24,7 +24,6 @@
# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/namespace/**
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
@@ -56,12 +55,6 @@
# [CXF-1521] Exception handling with @WebFault annotation
org/jboss/test/ws/jaxws/webfault/**
-# [CXF-1522] NPE in ServiceUtils
-org/jboss/test/ws/jaxws/jbws1566/**
-
-# [CXF-1623] Wrong AnnotationHandlerChainBuilder.protocolMatches() method implementation or preconditions
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
-
# [CXF-1624] XmlSchemaException: Schema name conflict in collection
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-01-22 08:37:32 UTC (rev 9087)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-01-22 09:33:26 UTC (rev 9088)
@@ -24,7 +24,6 @@
# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/namespace/**
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
@@ -56,12 +55,6 @@
# [CXF-1521] Exception handling with @WebFault annotation
org/jboss/test/ws/jaxws/webfault/**
-# [CXF-1522] NPE in ServiceUtils
-org/jboss/test/ws/jaxws/jbws1566/**
-
-# [CXF-1623] Wrong AnnotationHandlerChainBuilder.protocolMatches() method implementation or preconditions
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
-
# [CXF-1624] XmlSchemaException: Schema name conflict in collection
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-01-22 08:37:32 UTC (rev 9087)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-01-22 09:33:26 UTC (rev 9088)
@@ -24,7 +24,6 @@
# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/namespace/**
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
@@ -56,12 +55,6 @@
# [CXF-1521] Exception handling with @WebFault annotation
org/jboss/test/ws/jaxws/webfault/**
-# [CXF-1522] NPE in ServiceUtils
-org/jboss/test/ws/jaxws/jbws1566/**
-
-# [CXF-1623] Wrong AnnotationHandlerChainBuilder.protocolMatches() method implementation or preconditions
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
-
# [CXF-1624] XmlSchemaException: Schema name conflict in collection
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-01-22 08:37:32 UTC (rev 9087)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-01-22 09:33:26 UTC (rev 9088)
@@ -24,7 +24,6 @@
# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/namespace/**
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
@@ -56,12 +55,6 @@
# [CXF-1521] Exception handling with @WebFault annotation
org/jboss/test/ws/jaxws/webfault/**
-# [CXF-1522] NPE in ServiceUtils
-org/jboss/test/ws/jaxws/jbws1566/**
-
-# [CXF-1623] Wrong AnnotationHandlerChainBuilder.protocolMatches() method implementation or preconditions
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
-
# [CXF-1624] XmlSchemaException: Schema name conflict in collection
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-01-22 08:37:32 UTC (rev 9087)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-01-22 09:33:26 UTC (rev 9088)
@@ -24,7 +24,6 @@
# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/namespace/**
# [CXF-1513] NPE in JaxWsServiceConfiguration
org/jboss/test/ws/jaxws/handlerscope/**
@@ -56,12 +55,6 @@
# [CXF-1521] Exception handling with @WebFault annotation
org/jboss/test/ws/jaxws/webfault/**
-# [CXF-1522] NPE in ServiceUtils
-org/jboss/test/ws/jaxws/jbws1566/**
-
-# [CXF-1623] Wrong AnnotationHandlerChainBuilder.protocolMatches() method implementation or preconditions
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
-
# [CXF-1624] XmlSchemaException: Schema name conflict in collection
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
15 years, 11 months
JBossWS SVN: r9087 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-22 03:37:32 -0500 (Thu, 22 Jan 2009)
New Revision: 9087
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java
Log:
extending timeout from 1s to 5s to prevent hudson regressions
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2009-01-21 18:53:57 UTC (rev 9086)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2009-01-22 08:37:32 UTC (rev 9087)
@@ -78,7 +78,8 @@
{
try
{
- String retStr = (String) response.get(1000, TimeUnit.MILLISECONDS);
+ System.out.println("AsyncHandler.handleResponse() method called");
+ String retStr = (String) response.get(5000, TimeUnit.MILLISECONDS);
assertEquals("Hello", retStr);
asyncHandlerCalled = true;
}
@@ -91,7 +92,10 @@
Endpoint port = createProxy();
Future future = port.echoAsync("Hello", handler);
- future.get(1000, TimeUnit.MILLISECONDS);
+ long start = System.currentTimeMillis();
+ future.get(5000, TimeUnit.MILLISECONDS);
+ long end = System.currentTimeMillis();
+ System.out.println("Time spent in future.get() was " + (end - start) + "milliseconds");
if (handlerException != null)
throw handlerException;
15 years, 11 months
JBossWS SVN: r9086 - framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-21 13:53:57 -0500 (Wed, 21 Jan 2009)
New Revision: 9086
Added:
framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java
framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CustomAdapter.java
framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CustomBean.java
Modified:
framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java
framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
Log:
[JBWS-2451] Adding testcase for @XmlJavaTypeAdapter
[JBWS-2479] skipping @XmlJavaTypeAdapter whit Metro
Modified: framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java
===================================================================
--- framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java 2009-01-21 18:52:15 UTC (rev 9085)
+++ framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java 2009-01-21 18:53:57 UTC (rev 9086)
@@ -28,6 +28,7 @@
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.xml.bind.annotation.XmlList;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@WebService(targetNamespace = "http://foo.bar.com/calculator")
public class CalculatorBean
@@ -59,4 +60,11 @@
{
return list;
}
+
+ @WebMethod
+ @XmlJavaTypeAdapter(CustomAdapter.class)
+ public CustomBean processCustom((a)XmlJavaTypeAdapter(CustomAdapter.class) CustomBean bean)
+ {
+ return bean;
+ }
}
Added: framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java
===================================================================
--- framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java (rev 0)
+++ framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java 2009-01-21 18:53:57 UTC (rev 9086)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.smoke.tools;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlList;
+
+@WebService(targetNamespace = "http://foo.bar.com/calculator", serviceName="CalculatorBeanService")
+public class CalculatorBeanMetro
+{
+ @WebMethod
+ public int add(int a, int b)
+ {
+ return a+b;
+ }
+
+ @WebMethod
+ public int subtract(int a, int b)
+ {
+ return a-b;
+ }
+
+ @WebMethod
+ public Set<Integer> getKeys(HashMap<Integer, String> map)
+ {
+ if (map != null)
+ return map.keySet();
+ else
+ return null;
+ }
+
+ @WebMethod
+ @XmlList
+ public List<String> processList(@XmlList List<String> list)
+ {
+ return list;
+ }
+}
Property changes on: framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBeanMetro.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CustomAdapter.java
===================================================================
--- framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CustomAdapter.java (rev 0)
+++ framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CustomAdapter.java 2009-01-21 18:53:57 UTC (rev 9086)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.smoke.tools;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+public class CustomAdapter extends XmlAdapter<String, CustomBean>
+{
+
+ @Override
+ public String marshal(CustomBean v) throws Exception
+ {
+ return v.getFistAttribute() + "-" + v.getSecondAttribute();
+ }
+
+ @Override
+ public CustomBean unmarshal(String v) throws Exception
+ {
+ CustomBean b = new CustomBean();
+ b.setFistAttribute(v.substring(0, v.indexOf('-')));
+ b.setSecondAttribute(Long.valueOf(v.substring(v.indexOf('-') + 1)));
+ return b;
+ }
+
+}
Property changes on: framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CustomAdapter.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CustomBean.java
===================================================================
--- framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CustomBean.java (rev 0)
+++ framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CustomBean.java 2009-01-21 18:53:57 UTC (rev 9086)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.smoke.tools;
+
+public class CustomBean
+{
+ private String fistAttribute;
+ private Long secondAttribute;
+
+ public String getFistAttribute()
+ {
+ return fistAttribute;
+ }
+
+ public void setFistAttribute(String fistAttribute)
+ {
+ this.fistAttribute = fistAttribute;
+ }
+
+ public Long getSecondAttribute()
+ {
+ return secondAttribute;
+ }
+
+ public void setSecondAttribute(Long secondAttribute)
+ {
+ this.secondAttribute = secondAttribute;
+ }
+}
Property changes on: framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/CustomBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
===================================================================
--- framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2009-01-21 18:52:15 UTC (rev 9085)
+++ framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2009-01-21 18:53:57 UTC (rev 9086)
@@ -28,6 +28,7 @@
import javax.xml.bind.annotation.XmlList;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
@@ -156,6 +157,17 @@
responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.ProcessListResponse");
XmlList xmlList = (XmlList) responseWrapper.getDeclaredField("_return").getAnnotation(XmlList.class);
assertNotNull("@XmlList missing from response wrapper's _return field", xmlList);
+ if (!isIntegrationMetro())
+ {
+ responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.ProcessCustomResponse");
+ XmlJavaTypeAdapter xmlJavaTypeAdapter = (XmlJavaTypeAdapter) responseWrapper.getDeclaredField("_return").getAnnotation(XmlJavaTypeAdapter.class);
+ assertNotNull("@XmlJavaTypeAdapter missing from response wrapper's _return field", xmlJavaTypeAdapter);
+ assertEquals("org.jboss.test.ws.jaxws.smoke.tools.CustomAdapter", xmlJavaTypeAdapter.value().getName());
+ }
+ else
+ {
+ System.out.println("FIXME [JBWS-2479] @XmlJavaTypeAdapter on SEI causes exception");
+ }
}
/**
@@ -271,6 +283,8 @@
{
//provider.setGenerateSource(true);
provider.setOutputDirectory(outputDirectory);
- provider.provide(CalculatorBean.class);
+ //JBWS-2479: using different beans because the whole smoke tools test is supposed to be run for every stack
+ //and we can't afford excluding it for Metro just because of JBWS-2479
+ provider.provide(isIntegrationMetro() ? CalculatorBeanMetro.class : CalculatorBean.class);
}
}
15 years, 11 months
JBossWS SVN: r9085 - in stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws: core/utils and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-21 13:52:15 -0500 (Wed, 21 Jan 2009)
New Revision: 9085
Modified:
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/utils/JavassistUtils.java
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java
stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java
Log:
[JBWS-2451] Support for @XmlJavaTypeAdapter on SEI when producing wrapper beans and wsdl
Modified: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2009-01-21 15:07:17 UTC (rev 9084)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2009-01-21 18:52:15 UTC (rev 9085)
@@ -46,6 +46,7 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
@@ -123,8 +124,7 @@
parameter.getName(), parameter.getVariable(),
parameter.getTypeArguments(),
new boolean[] {parameter.isSwaRef(), parameter.isXop()},
- false,
- parameter.isXmlList()
+ false, parameter.isXmlList(), parameter.getAdapter()
);
}
clazz.stopPruning(!prune);
@@ -161,7 +161,7 @@
addProperty(
clazz, prop.getReturnType().getName(),
new QName(prop.getName()), prop.getName(), null,
- new boolean[] {false, false}, prop.isTransientAnnotated(), false
+ new boolean[] {false, false}, prop.isTransientAnnotated(), false, null
);
clazz.stopPruning(!prune);
@@ -218,7 +218,7 @@
private void addProperty(CtClass clazz, String typeName,
QName name, String variable, String[] typeArguments,
- boolean[] attachments, boolean xmlTransient, boolean xmlList)
+ boolean[] attachments, boolean xmlTransient, boolean xmlList, String adapter)
throws CannotCompileException, NotFoundException
{
ConstPool constPool = clazz.getClassFile().getConstPool();
@@ -269,6 +269,13 @@
annotation = JavassistUtils.createAnnotation(XmlList.class, constPool);
annotation.markField(field);
}
+ //@XmlJavaTypeAdapter
+ if (adapter != null)
+ {
+ annotation = JavassistUtils.createAnnotation(XmlJavaTypeAdapter.class, constPool);
+ annotation.addClassParameter("value", adapter);
+ annotation.markField(field);
+ }
clazz.addField(field);
// Add accessor methods
Modified: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/utils/JavassistUtils.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/utils/JavassistUtils.java 2009-01-21 15:07:17 UTC (rev 9084)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/core/utils/JavassistUtils.java 2009-01-21 18:52:15 UTC (rev 9085)
@@ -31,6 +31,7 @@
import javassist.bytecode.MethodInfo;
import javassist.bytecode.SignatureAttribute;
import javassist.bytecode.annotation.ArrayMemberValue;
+import javassist.bytecode.annotation.ClassMemberValue;
import javassist.bytecode.annotation.EnumMemberValue;
import javassist.bytecode.annotation.StringMemberValue;
@@ -105,6 +106,12 @@
enumValue.setValue(value.name());
annotation.addMemberValue(name, enumValue);
}
+
+ public void addClassParameter(String name, String value)
+ {
+ ClassMemberValue classValue = new ClassMemberValue(value, constPool);
+ annotation.addMemberValue(name, classValue);
+ }
public void addParameter(String name, String[] values)
{
Modified: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2009-01-21 15:07:17 UTC (rev 9084)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2009-01-21 18:52:15 UTC (rev 9085)
@@ -45,6 +45,7 @@
import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.bind.annotation.XmlList;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
import javax.xml.ws.BindingType;
@@ -448,24 +449,19 @@
return HolderUtils.isHolderType(javaType) ? ParameterMode.INOUT : ParameterMode.IN;
}
- private WebParam getWebParamAnnotation(Method method, int pos)
+ @SuppressWarnings("unchecked")
+ private <T extends Annotation> T getAnnotation(Class<T> annotation, Method method, int pos)
{
- for (Annotation annotation : method.getParameterAnnotations()[pos])
- if (annotation instanceof WebParam)
- return (WebParam)annotation;
-
+ for (Annotation an : method.getParameterAnnotations()[pos])
+ {
+ if (annotation.isAssignableFrom(an.annotationType()))
+ {
+ return (T)an;
+ }
+ }
return null;
}
-
- private XmlList getXmlListAnnotation(Method method, int pos)
- {
- for (Annotation annotation : method.getParameterAnnotations()[pos])
- if (annotation instanceof XmlList)
- return (XmlList)annotation;
- return null;
- }
-
private QName getWebParamName(OperationMetaData opMetaData, int index, WebParam webParam)
{
String namespace = null;
@@ -643,7 +639,7 @@
Class<?> javaType = parameterTypes[i];
Type genericType = genericTypes[i];
String javaTypeName = javaType.getName();
- WebParam anWebParam = getWebParamAnnotation(method, i);
+ WebParam anWebParam = getAnnotation(WebParam.class, method, i);
boolean isHeader = anWebParam != null && anWebParam.header();
boolean isWrapped = opMetaData.isDocumentWrapped() && !isHeader;
ParameterMode mode = getParameterMode(anWebParam, javaType);
@@ -666,7 +662,13 @@
WrappedParameter wrappedParameter = new WrappedParameter(wrappedElementName, javaTypeName, variable, i);
wrappedParameter.setTypeArguments(convertTypeArguments(javaType, genericType));
- wrappedParameter.setXmlList(getXmlListAnnotation(method, i) != null);
+ wrappedParameter.setXmlList(getAnnotation(XmlList.class, method, i) != null);
+ XmlJavaTypeAdapter xmlJavaTypeAdapter = getAnnotation(XmlJavaTypeAdapter.class, method, i);
+ if (xmlJavaTypeAdapter != null)
+ {
+ //XmlJavaTypeAdapter.type() is for package only
+ wrappedParameter.setAdapter(xmlJavaTypeAdapter.value().getName());
+ }
if (mode != ParameterMode.OUT)
wrappedParameters.add(wrappedParameter);
@@ -735,6 +737,12 @@
WrappedParameter wrapped = new WrappedParameter(xmlName, returnTypeName, convertToVariable(xmlName.getLocalPart()), -1);
wrapped.setTypeArguments(convertTypeArguments(returnType, genericReturnType));
wrapped.setXmlList(method.getAnnotation(XmlList.class) != null);
+ XmlJavaTypeAdapter xmlJavaTypeAdapter = method.getAnnotation(XmlJavaTypeAdapter.class);
+ if (xmlJavaTypeAdapter != null)
+ {
+ //XmlJavaTypeAdapter.type() is for package only
+ wrapped.setAdapter(xmlJavaTypeAdapter.value().getName());
+ }
// insert at the beginning just for prettiness
wrappedOutputParameters.add(0, wrapped);
Modified: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2009-01-21 15:07:17 UTC (rev 9084)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2009-01-21 18:52:15 UTC (rev 9085)
@@ -44,6 +44,7 @@
private boolean swaRef;
private boolean xop;
private boolean xmlList;
+ private String adapter = null;
public WrappedParameter(WrappedParameter wrapped)
{
@@ -164,6 +165,16 @@
this.xmlList = xmlList;
}
+ public String getAdapter()
+ {
+ return adapter;
+ }
+
+ public void setAdapter(String adapter)
+ {
+ this.adapter = adapter;
+ }
+
public String toString()
{
return "[name = " + getName() + ", type = " + getType() + ", typeArgs = " + JavaUtils.printArray(getTypeArguments()) + ", variable = " + getVariable()
Modified: stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java
===================================================================
--- stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2009-01-21 15:07:17 UTC (rev 9084)
+++ stack/native/branches/jaxws21/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2009-01-21 18:52:15 UTC (rev 9085)
@@ -35,6 +35,7 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
@@ -111,7 +112,7 @@
addClassAnnotations(clazz, parameterMD.getXmlName(), parameterMD.getXmlType(), null);
for (WrappedParameter wrapped : wrappedParameters)
{
- addProperty(clazz, wrapped.getType(), wrapped.getName(), wrapped.getVariable(), wrapped.getTypeArguments(), false, wrapped.isXmlList(), loader);
+ addProperty(clazz, wrapped.getType(), wrapped.getName(), wrapped.getVariable(), wrapped.getTypeArguments(), false, wrapped.isXmlList(), wrapped.getAdapter(), loader);
}
}
catch (Exception e)
@@ -136,7 +137,7 @@
for (String property : propertyOrder)
{
ExceptionProperty p = properties.get(property);
- addProperty(clazz, p.getReturnType().getName(), new QName(property), property, null, p.isTransientAnnotated(), false, loader);
+ addProperty(clazz, p.getReturnType().getName(), new QName(property), property, null, p.isTransientAnnotated(), false, null, loader);
}
}
catch (Exception e)
@@ -150,7 +151,7 @@
return (Boolean.TYPE == type || Boolean.class == type) ? "is" : "get";
}
- private void addProperty(JDefinedClass clazz, String typeName, QName name, String variable, String[] typeArguments, boolean xmlTransient, boolean xmlList, ClassLoader loader)
+ private void addProperty(JDefinedClass clazz, String typeName, QName name, String variable, String[] typeArguments, boolean xmlTransient, boolean xmlList, String adapter, ClassLoader loader)
throws Exception
{
// define variable
@@ -161,12 +162,12 @@
}
else
{
- addProperty(clazz, javaType, name, variable, typeArguments, xmlTransient, xmlList, codeModel);
+ addProperty(clazz, javaType, name, variable, typeArguments, xmlTransient, xmlList, adapter, codeModel);
}
}
- private static void addProperty(JDefinedClass clazz, Class<?> javaType, QName name, String variable, String[] typeArguments, boolean xmlTransient, boolean xmlList, JCodeModel codeModel)
- throws Exception
+ private static void addProperty(JDefinedClass clazz, Class<?> javaType, QName name, String variable, String[] typeArguments, boolean xmlTransient, boolean xmlList,
+ String adapter, JCodeModel codeModel) throws Exception
{
// be careful about reserved keywords when generating variable names
String realVariableName = JavaUtils.isReservedKeyword(variable) ? "_" + variable : variable;
@@ -204,6 +205,12 @@
{
field.annotate(XmlList.class);
}
+
+ if (adapter != null)
+ {
+ JAnnotationUse xmlJavaTypeAdapter = field.annotate(XmlJavaTypeAdapter.class);
+ xmlJavaTypeAdapter.param("value", codeModel.ref(adapter));
+ }
// generate acessor get method for variable
JMethod method = clazz.method(JMod.PUBLIC, type, getterPrefix(javaType) + JavaUtils.capitalize(variable));
15 years, 11 months
JBossWS SVN: r9084 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-21 10:07:17 -0500 (Wed, 21 Jan 2009)
New Revision: 9084
Modified:
stack/cxf/trunk/.classpath
Log:
do not modify project classpath
Modified: stack/cxf/trunk/.classpath
===================================================================
--- stack/cxf/trunk/.classpath 2009-01-21 15:05:32 UTC (rev 9083)
+++ stack/cxf/trunk/.classpath 2009-01-21 15:07:17 UTC (rev 9084)
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="modules/server/src/main/java"/>
- <classpathentry kind="src" path="cxf-api"/>
- <classpathentry kind="src" path="cxf-transport-http"/>
- <classpathentry kind="src" path="cxf-core"/>
<classpathentry kind="src" path="modules/testsuite/cxf-tests/src/test/java"/>
<classpathentry kind="src" path="modules/client/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
15 years, 11 months
JBossWS SVN: r9083 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-21 10:05:32 -0500 (Wed, 21 Jan 2009)
New Revision: 9083
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2478] excluding WS-Security test for now
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-01-21 14:55:54 UTC (rev 9082)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-01-21 15:05:32 UTC (rev 9083)
@@ -110,3 +110,6 @@
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
+# [JBWS-2478] Investigate why WS-Security CXF tests are failing
+org/jboss/test/ws/jaxws/samples/wsse/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-01-21 14:55:54 UTC (rev 9082)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-01-21 15:05:32 UTC (rev 9083)
@@ -110,3 +110,6 @@
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
+# [JBWS-2478] Investigate why WS-Security CXF tests are failing
+org/jboss/test/ws/jaxws/samples/wsse/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-01-21 14:55:54 UTC (rev 9082)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-01-21 15:05:32 UTC (rev 9083)
@@ -110,3 +110,6 @@
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
+# [JBWS-2478] Investigate why WS-Security CXF tests are failing
+org/jboss/test/ws/jaxws/samples/wsse/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-01-21 14:55:54 UTC (rev 9082)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-01-21 15:05:32 UTC (rev 9083)
@@ -111,3 +111,5 @@
# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+# [JBWS-2478] Investigate why WS-Security CXF tests are failing
+org/jboss/test/ws/jaxws/samples/wsse/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-01-21 14:55:54 UTC (rev 9082)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-01-21 15:05:32 UTC (rev 9083)
@@ -111,3 +111,5 @@
# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+# [JBWS-2478] Investigate why WS-Security CXF tests are failing
+org/jboss/test/ws/jaxws/samples/wsse/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-01-21 14:55:54 UTC (rev 9082)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-01-21 15:05:32 UTC (rev 9083)
@@ -111,3 +111,5 @@
# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+# [JBWS-2478] Investigate why WS-Security CXF tests are failing
+org/jboss/test/ws/jaxws/samples/wsse/**
15 years, 11 months