March 2010 - jbossws-commits - Jboss List Archives

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-03-22 12:24:02 -0400 (Mon, 22 Mar 2010) New Revision: 11833 Added: spi/tags/jbossws-spi-1.3.0.CR1/ Log: Tagging jbossws-spi 1.3.0.CR1 Copied: spi/tags/jbossws-spi-1.3.0.CR1 (from rev 11832, spi/trunk)

14 years, 9 months

1
0
0 / 0

JBossWS SVN: r11832 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes: types and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: pmacik(a)redhat.com Date: 2010-03-22 06:51:24 -0400 (Mon, 22 Mar 2010) New Revision: 11832 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointDoc.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointDocImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointRPC.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointRPCImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedDoc.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedDocImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedRPC.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedRPCImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/types/ComplexType.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/CalendarDocTest.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/CalendarRPCTest.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/CalendarDocTest.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/CalendarRPCTest.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ComplexTypeDocTest.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ComplexTypeRPCTest.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToComplexTypeDocTest.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToComplexTypeRPCTest.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToStringDocTest.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToStringRPCTest.java Log: [JBQA-3163] Calendar changed to XMLGregorianCalenar Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointDoc.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointDoc.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointDoc.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -21,9 +21,8 @@ */ package org.jboss.test.ws.jaxws.benchmark.test.datatypes; -import java.io.IOException; import java.math.BigDecimal; -import java.util.Calendar; +import javax.xml.datatype.XMLGregorianCalendar; import java.util.Date; import javax.jws.WebMethod; @@ -38,45 +37,44 @@ */ @WebService(name = "EndpointDoc", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") @SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -public interface EndpointDoc -{ +public interface EndpointDoc { - @WebMethod(operationName = "sayHello", action = "urn:SayHello") - public String sayHello(String toWhom); + @WebMethod(operationName = "sayHello", action = "urn:SayHello") + public String sayHello(String toWhom); - @WebMethod(operationName = "increaseBigDecimal", action = "urn:IncreaseBigDecimal") - public BigDecimal increaseBigDecimal(BigDecimal value); + @WebMethod(operationName = "increaseBigDecimal", action = "urn:IncreaseBigDecimal") + public BigDecimal increaseBigDecimal(BigDecimal value); - @WebMethod(operationName = "negateBoolean", action = "urn:NegateBoolean") - public boolean negateBoolean(boolean value); + @WebMethod(operationName = "negateBoolean", action = "urn:NegateBoolean") + public boolean negateBoolean(boolean value); - @WebMethod(operationName = "increaseByte", action = "urn:IncreaseByte") - public byte increaseByte(byte value); + @WebMethod(operationName = "increaseByte", action = "urn:IncreaseByte") + public byte increaseByte(byte value); - @WebMethod(operationName = "reverseByteOrder", action = "urn:ReverseByteOrder") - public byte[] reverseByteOrder(byte[] data); + @WebMethod(operationName = "reverseByteOrder", action = "urn:ReverseByteOrder") + public byte[] reverseByteOrder(byte[] data); - @WebMethod(operationName = "getCalendarPlusDay", action = "urn:GetCalendarPlusDay") - public Calendar getCalendarPlusDay(Calendar calendar); + @WebMethod(operationName = "getCalendarPlusDay", action = "urn:GetCalendarPlusDay") + public XMLGregorianCalendar getCalendarPlusDay(XMLGregorianCalendar calendar); - @WebMethod(operationName = "getDatePlusDay", action = "urn:GetDatePlusDay") - public Date getDatePlusDay(Date date); + @WebMethod(operationName = "getDatePlusDay", action = "urn:GetDatePlusDay") + public Date getDatePlusDay(Date date); - @WebMethod(operationName = "increaseDouble", action = "urn:IncreaseDouble") - public double increaseDouble(double value); + @WebMethod(operationName = "increaseDouble", action = "urn:IncreaseDouble") + public double increaseDouble(double value); - @WebMethod(operationName = "increaseFloat", action = "urn:IncreaseFloat") - public float increaseFloat(float value); + @WebMethod(operationName = "increaseFloat", action = "urn:IncreaseFloat") + public float increaseFloat(float value); - @WebMethod(operationName = "increaseInt", action = "urn:IncreaseInt") - public int increaseInt(int value); + @WebMethod(operationName = "increaseInt", action = "urn:IncreaseInt") + public int increaseInt(int value); - @WebMethod(operationName = "increaseLong", action = "urn:IncreaseLong") - public long increaseLong(long value); + @WebMethod(operationName = "increaseLong", action = "urn:IncreaseLong") + public long increaseLong(long value); - @WebMethod(operationName = "modifyQName", action = "urn:ModifyQName") - public QName modifyQName(QName value); + @WebMethod(operationName = "modifyQName", action = "urn:ModifyQName") + public QName modifyQName(QName value); - @WebMethod(operationName = "increaseShort", action = "urn:IncreaseShort") - public short increaseShort(short value); + @WebMethod(operationName = "increaseShort", action = "urn:IncreaseShort") + public short increaseShort(short value); } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointDocImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointDocImpl.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointDocImpl.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -24,9 +24,7 @@ import java.io.IOException; import java.math.BigDecimal; -import java.util.Calendar; import java.util.Date; -import java.util.GregorianCalendar; import javax.jws.WebParam; import javax.jws.WebService; //import javax.jws.soap.SOAPBinding; @@ -35,6 +33,8 @@ //import org.jboss.logging.Logger; import javax.ejb.Stateless; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; /** * @author pmacik(a)redhat.com @@ -78,11 +78,10 @@ return retVal; } - public Calendar getCalendarPlusDay(@WebParam(name = "calendar") Calendar calendar) + public XMLGregorianCalendar getCalendarPlusDay(@WebParam(name = "calendar") XMLGregorianCalendar calendar) { - Calendar retVal = new GregorianCalendar(); - retVal.setTimeInMillis(calendar.getTimeInMillis() + 86400000L); - return retVal; + calendar.setDay(calendar.getDay() + 1); + return (XMLGregorianCalendar) calendar.clone(); } public Date getDatePlusDay(@WebParam(name = "date") Date date) Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointRPC.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointRPC.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointRPC.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -21,10 +21,9 @@ */ package org.jboss.test.ws.jaxws.benchmark.test.datatypes; -import java.io.IOException; import java.math.BigDecimal; -import java.util.Calendar; import java.util.Date; +import javax.xml.datatype.XMLGregorianCalendar; import javax.jws.WebMethod; import javax.jws.WebService; @@ -57,7 +56,7 @@ public byte[] reverseByteOrder(byte[] data); @WebMethod(operationName = "getCalendarPlusDay", action = "urn:GetCalendarPlusDay") - public Calendar getCalendarPlusDay(Calendar calendar); + public XMLGregorianCalendar getCalendarPlusDay(XMLGregorianCalendar calendar); @WebMethod(operationName = "getDatePlusDay", action = "urn:GetDatePlusDay") public Date getDatePlusDay(Date date); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointRPCImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointRPCImpl.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointRPCImpl.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -23,12 +23,11 @@ import java.io.IOException; import java.math.BigDecimal; -import java.util.Calendar; import java.util.Date; -import java.util.GregorianCalendar; - import javax.jws.WebParam; import javax.jws.WebService; //import javax.jws.soap.SOAPBinding; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; //import org.jboss.logging.Logger; @@ -77,11 +76,10 @@ return retVal; } - public Calendar getCalendarPlusDay(@WebParam(name = "calendar") Calendar calendar) + public XMLGregorianCalendar getCalendarPlusDay(@WebParam(name = "calendar") XMLGregorianCalendar calendar) { - Calendar retVal = new GregorianCalendar(); - retVal.setTimeInMillis(calendar.getTimeInMillis() + 86400000L); - return retVal; + calendar.setDay(calendar.getDay() + 1); + return (XMLGregorianCalendar) calendar.clone(); } public Date getDatePlusDay(@WebParam(name = "date") Date date) Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedDoc.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedDoc.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedDoc.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -22,7 +22,7 @@ package org.jboss.test.ws.jaxws.benchmark.test.datatypes; import java.math.BigDecimal; -import java.util.Calendar; +import javax.xml.datatype.XMLGregorianCalendar; import java.util.Date; import javax.jws.WebMethod; @@ -85,8 +85,8 @@ @WebResult(name = "Response", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") @RequestWrapper(localName = "GetCalendarPlusDay", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrappers.GetCalendarPlusDay") @ResponseWrapper(localName = "GetCalendarPlusDayResponse", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrappers.GetCalendarPlusDayResponse") - public Calendar getCalendarPlusDay( - @WebParam(name = "Calendar", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") Calendar calendar); + public XMLGregorianCalendar getCalendarPlusDay( + @WebParam(name = "Calendar", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") XMLGregorianCalendar calendar); @WebMethod(operationName = "getDatePlusDay", action = "urn:GetDatePlusDay") @WebResult(name = "Response", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") @@ -152,7 +152,7 @@ @WebParam(name = "StringValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") String stringValue, @WebParam(name = "QNameValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") QName qNameValue, @WebParam(name = "DateValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") Date dateValue, - @WebParam(name = "CalendarValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") Calendar calendarValue); + @WebParam(name = "CalendarValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") XMLGregorianCalendar calendarValue); @WebMethod(operationName = "valuesToComplexType", action = "urn:ValuesToComplexType") @WebResult(name = "Response", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") @@ -169,7 +169,7 @@ @WebParam(name = "StringValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") String stringValue, @WebParam(name = "QNameValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") QName qNameValue, @WebParam(name = "DateValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") Date dateValue, - @WebParam(name = "CalendarValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") Calendar calendarValue); + @WebParam(name = "CalendarValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") XMLGregorianCalendar calendarValue); @WebMethod(operationName = "modifyComplexType", action = "urn:ModifyComplexType") @WebResult(name = "Response", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedDocImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedDocImpl.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedDocImpl.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -26,17 +26,16 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; -import java.util.Calendar; import java.util.Collection; import java.util.Collections; import java.util.Date; -import java.util.GregorianCalendar; import java.util.List; import javax.jws.WebMethod; import javax.jws.WebParam; import javax.jws.WebResult; import javax.jws.WebService; //import javax.jws.soap.SOAPBinding; +import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; @@ -98,11 +97,10 @@ return retVal; } - public Calendar getCalendarPlusDay(Calendar calendar) + public XMLGregorianCalendar getCalendarPlusDay(XMLGregorianCalendar calendar) { - Calendar retVal = new GregorianCalendar(); - retVal.setTimeInMillis(calendar.getTimeInMillis() + 86400000L); - return retVal; + calendar.setDay(calendar.getDay() + 1); + return (XMLGregorianCalendar) calendar.clone(); } public Date getDatePlusDay(Date date) @@ -147,7 +145,7 @@ public String valuesToString(byte byteValue, byte[] byteArrayValue, short shortValue, int intValue, long longValue, float floatValue, double doubleValue, String stringValue, QName qNameValue, Date dateValue, - Calendar calendarValue) + XMLGregorianCalendar calendarValue) { StringBuffer sb = new StringBuffer(); sb.append("[byteValue=" + byteValue); @@ -167,7 +165,7 @@ public ComplexType valuesToComplexType(byte byteValue, byte[] byteArrayValue, short shortValue, int intValue, long longValue, float floatValue, double doubleValue, String stringValue, QName qNameValue, Date dateValue, - Calendar calendarValue) + XMLGregorianCalendar calendarValue) { return new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue, Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedRPC.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedRPC.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedRPC.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -22,9 +22,9 @@ package org.jboss.test.ws.jaxws.benchmark.test.datatypes; import java.math.BigDecimal; -import java.util.Calendar; import java.util.Date; + import javax.jws.WebMethod; import javax.jws.WebParam; import javax.jws.WebResult; @@ -34,6 +34,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; +import javax.xml.datatype.XMLGregorianCalendar; import org.jboss.test.ws.jaxws.benchmark.test.datatypes.types.ComplexType; @@ -85,8 +86,8 @@ @WebResult(name = "Response", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") @RequestWrapper(localName = "GetCalendarPlusDay", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrappers.GetCalendarPlusDay") @ResponseWrapper(localName = "GetCalendarPlusDayResponse", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrappers.GetCalendarPlusDayResponse") - public Calendar getCalendarPlusDay( - @WebParam(name = "Calendar", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") Calendar calendar); + public XMLGregorianCalendar getCalendarPlusDay( + @WebParam(name = "Calendar", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") XMLGregorianCalendar calendar); @WebMethod(operationName = "getDatePlusDay", action = "urn:GetDatePlusDay") @WebResult(name = "Response", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") @@ -152,7 +153,7 @@ @WebParam(name = "StringValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") String stringValue, @WebParam(name = "QNameValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") QName qNameValue, @WebParam(name = "DateValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") Date dateValue, - @WebParam(name = "CalendarValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") Calendar calendarValue); + @WebParam(name = "CalendarValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") XMLGregorianCalendar calendarValue); @WebMethod(operationName = "valuesToComplexType", action = "urn:ValuesToComplexType") @WebResult(name = "Response", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") @@ -169,7 +170,7 @@ @WebParam(name = "StringValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") String stringValue, @WebParam(name = "QNameValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") QName qNameValue, @WebParam(name = "DateValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") Date dateValue, - @WebParam(name = "CalendarValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") Calendar calendarValue); + @WebParam(name = "CalendarValue", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") XMLGregorianCalendar calendarValue); @WebMethod(operationName = "modifyComplexType", action = "urn:ModifyComplexType") @WebResult(name = "Response", targetNamespace = "http://datatypes.test.benchmark.jaxws.ws.test.jboss.org/") Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedRPCImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedRPCImpl.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointWrappedRPCImpl.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -25,14 +25,13 @@ import java.math.BigDecimal; import java.util.ArrayList; -import java.util.Calendar; import java.util.Collections; import java.util.Date; -import java.util.GregorianCalendar; import java.util.List; import javax.jws.WebParam; import javax.jws.WebService; //import javax.jws.soap.SOAPBinding; +import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; //import org.jboss.logging.Logger; @@ -91,11 +90,10 @@ return retVal; } - public Calendar getCalendarPlusDay(Calendar calendar) + public XMLGregorianCalendar getCalendarPlusDay(XMLGregorianCalendar calendar) { - Calendar retVal = new GregorianCalendar(); - retVal.setTimeInMillis(calendar.getTimeInMillis() + 86400000L); - return retVal; + calendar.setDay(calendar.getDay() + 1); + return (XMLGregorianCalendar) calendar.clone(); } public Date getDatePlusDay(Date date) @@ -140,7 +138,7 @@ public String valuesToString(byte byteValue, byte[] byteArrayValue, short shortValue, int intValue, long longValue, float floatValue, double doubleValue, String stringValue, QName qNameValue, Date dateValue, - Calendar calendarValue) + XMLGregorianCalendar calendarValue) { StringBuffer sb = new StringBuffer(); sb.append("[byteValue=" + byteValue); @@ -160,7 +158,7 @@ public ComplexType valuesToComplexType(byte byteValue, byte[] byteArrayValue, short shortValue, int intValue, long longValue, float floatValue, double doubleValue, String stringValue, QName qNameValue, Date dateValue, - Calendar calendarValue) + XMLGregorianCalendar calendarValue) { return new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue, Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/types/ComplexType.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/types/ComplexType.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/types/ComplexType.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -23,10 +23,10 @@ import java.util.Arrays; -import java.util.Calendar; import java.util.Date; import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; /** @@ -58,7 +58,7 @@ private Date dateValue; - private Calendar calendarValue; + private XMLGregorianCalendar calendarValue; public ComplexType() { @@ -67,7 +67,7 @@ public ComplexType(byte byteValue, byte[] byteArrayValue, short shortValue, int intValue, long longValue, float floatValue, double doubleValue, String stringValue, List<String> stringList, QName qNameValue, - Date dateValue, Calendar calendarValue) + Date dateValue, XMLGregorianCalendar calendarValue) { super(); this.byteValue = byteValue; @@ -194,12 +194,12 @@ this.dateValue = dateValue; } - public Calendar getCalendarValue() + public XMLGregorianCalendar getCalendarValue() { return calendarValue; } - public void setCalendarValue(Calendar calendarValue) + public void setCalendarValue(XMLGregorianCalendar calendarValue) { this.calendarValue = calendarValue; } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/CalendarDocTest.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/CalendarDocTest.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/CalendarDocTest.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -21,9 +21,12 @@ */ package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped; -import java.util.Calendar; import java.util.GregorianCalendar; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; + import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest; import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesDocTest; import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointDoc; @@ -34,22 +37,33 @@ */ public class CalendarDocTest extends DataTypesDocTest implements BenchmarkTest { - private static final Calendar tested; + private static final XMLGregorianCalendar tested; - private static final Calendar exp; + private static final XMLGregorianCalendar exp; static { - tested = new GregorianCalendar(); - tested.setTimeInMillis(1234567890L); + DatatypeFactory dtFactory = null; + GregorianCalendar calendar = new GregorianCalendar();; + try + { + dtFactory = DatatypeFactory.newInstance(); + } + catch (DatatypeConfigurationException e) + { - exp = new GregorianCalendar(); - exp.setTimeInMillis(tested.getTimeInMillis() + 86400000L); + e.printStackTrace(); + } + tested = dtFactory.newXMLGregorianCalendar(calendar); + + exp = dtFactory.newXMLGregorianCalendar(calendar); + exp.setDay(exp.getDay() + 1); + } public void performIteration(Object port) throws Exception { - Calendar ret = ((EndpointDoc) port).getCalendarPlusDay(tested); + XMLGregorianCalendar ret = ((EndpointDoc) port).getCalendarPlusDay(tested); if (!ret.equals(exp)) { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/CalendarRPCTest.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/CalendarRPCTest.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/unwrapped/CalendarRPCTest.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -21,8 +21,10 @@ */ package org.jboss.test.ws.jaxws.benchmark.test.datatypes.unwrapped; -import java.util.Calendar; -import java.util.GregorianCalendar; +import java.util.GregorianCalendar; //import java.util.GregorianCalendar; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest; import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesRPCTest; @@ -35,22 +37,33 @@ public class CalendarRPCTest extends DataTypesRPCTest implements BenchmarkTest { - private static final Calendar tested; + private static final XMLGregorianCalendar tested; - private static final Calendar exp; + private static final XMLGregorianCalendar exp; static { - tested = new GregorianCalendar(); - tested.setTimeInMillis(1234567890L); + DatatypeFactory dtFactory = null; + GregorianCalendar calendar = new GregorianCalendar();; + try + { + dtFactory = DatatypeFactory.newInstance(); + } + catch (DatatypeConfigurationException e) + { - exp = new GregorianCalendar(); - exp.setTimeInMillis(tested.getTimeInMillis() + 86400000L); + e.printStackTrace(); + } + tested = dtFactory.newXMLGregorianCalendar(calendar); + + exp = dtFactory.newXMLGregorianCalendar(calendar); + exp.setDay(exp.getDay() + 1); + } public void performIteration(Object port) throws Exception { - Calendar ret = ((EndpointRPC) port).getCalendarPlusDay(tested); + XMLGregorianCalendar ret = ((EndpointRPC) port).getCalendarPlusDay(tested); if (!ret.equals(exp)) { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/CalendarDocTest.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/CalendarDocTest.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/CalendarDocTest.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -21,8 +21,10 @@ */ package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped; -import java.util.Calendar; import java.util.GregorianCalendar; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest; import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesWrappedDocTest; @@ -34,22 +36,33 @@ */ public class CalendarDocTest extends DataTypesWrappedDocTest implements BenchmarkTest { - private static final Calendar tested; + private static final XMLGregorianCalendar tested; - private static final Calendar exp; + private static final XMLGregorianCalendar exp; static { - tested = new GregorianCalendar(); - tested.setTimeInMillis(1234567890L); + DatatypeFactory dtFactory = null; + GregorianCalendar calendar = new GregorianCalendar();; + try + { + dtFactory = DatatypeFactory.newInstance(); + } + catch (DatatypeConfigurationException e) + { - exp = new GregorianCalendar(); - exp.setTimeInMillis(tested.getTimeInMillis() + 86400000L); + e.printStackTrace(); + } + tested = dtFactory.newXMLGregorianCalendar(calendar); + + exp = dtFactory.newXMLGregorianCalendar(calendar); + exp.setDay(exp.getDay() + 1); + } public void performIteration(Object port) throws Exception { - Calendar ret = ((EndpointWrappedDoc) port).getCalendarPlusDay(tested); + XMLGregorianCalendar ret = ((EndpointWrappedDoc) port).getCalendarPlusDay(tested); if (!ret.equals(exp)) { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/CalendarRPCTest.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/CalendarRPCTest.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/CalendarRPCTest.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -21,9 +21,12 @@ */ package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped; -import java.util.Calendar; import java.util.GregorianCalendar; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; + import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest; import org.jboss.test.ws.jaxws.benchmark.test.datatypes.DataTypesWrappedRPCTest; import org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC; @@ -35,22 +38,33 @@ public class CalendarRPCTest extends DataTypesWrappedRPCTest implements BenchmarkTest { - private static final Calendar tested; + private static final XMLGregorianCalendar tested; - private static final Calendar exp; + private static final XMLGregorianCalendar exp; static { - tested = new GregorianCalendar(); - tested.setTimeInMillis(1234567890L); + DatatypeFactory dtFactory = null; + GregorianCalendar calendar = new GregorianCalendar();; + try + { + dtFactory = DatatypeFactory.newInstance(); + } + catch (DatatypeConfigurationException e) + { - exp = new GregorianCalendar(); - exp.setTimeInMillis(tested.getTimeInMillis() + 86400000L); + e.printStackTrace(); + } + tested = dtFactory.newXMLGregorianCalendar(calendar); + + exp = dtFactory.newXMLGregorianCalendar(calendar); + exp.setDay(exp.getDay() + 1); + } public void performIteration(Object port) throws Exception { - Calendar ret = ((EndpointWrappedRPC) port).getCalendarPlusDay(tested); + XMLGregorianCalendar ret = ((EndpointWrappedRPC) port).getCalendarPlusDay(tested); if (!ret.equals(exp)) { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ComplexTypeDocTest.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ComplexTypeDocTest.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ComplexTypeDocTest.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -22,11 +22,13 @@ package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped; import java.util.ArrayList; -import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest; @@ -63,7 +65,7 @@ private static final Date dateValue = new Date(); - private static final Calendar calendarValue, modifiedCalendarValue; + private static final XMLGregorianCalendar calendarValue, modifiedCalendarValue; private static final ComplexType tested, exp; @@ -84,12 +86,22 @@ modifiedByteArrayValue[i] = byteArrayValue[length - i - 1]; } - calendarValue = new GregorianCalendar(); - calendarValue.setTimeInMillis(System.currentTimeMillis()); + DatatypeFactory dtFactory = null; + GregorianCalendar calendar = new GregorianCalendar();; + try + { + dtFactory = DatatypeFactory.newInstance(); + } + catch (DatatypeConfigurationException e) + { - modifiedCalendarValue = new GregorianCalendar(); - modifiedCalendarValue.setTimeInMillis(calendarValue.getTimeInMillis() + 86400000L); + e.printStackTrace(); + } + calendarValue = dtFactory.newXMLGregorianCalendar(calendar); + modifiedCalendarValue = dtFactory.newXMLGregorianCalendar(calendar); + modifiedCalendarValue.setDay(modifiedCalendarValue.getDay() + 1); + tested = new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue, stringValue, stringList, qNameValue, dateValue, calendarValue); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ComplexTypeRPCTest.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ComplexTypeRPCTest.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ComplexTypeRPCTest.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -22,11 +22,13 @@ package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped; import java.util.ArrayList; -import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest; @@ -63,7 +65,7 @@ private static final Date dateValue = new Date(); - private static final Calendar calendarValue, modifiedCalendarValue; + private static final XMLGregorianCalendar calendarValue, modifiedCalendarValue; private static final ComplexType tested, exp; @@ -84,12 +86,22 @@ modifiedByteArrayValue[i] = byteArrayValue[length - i - 1]; } - calendarValue = new GregorianCalendar(); - calendarValue.setTimeInMillis(System.currentTimeMillis()); + DatatypeFactory dtFactory = null; + GregorianCalendar calendar = new GregorianCalendar();; + try + { + dtFactory = DatatypeFactory.newInstance(); + } + catch (DatatypeConfigurationException e) + { - modifiedCalendarValue = new GregorianCalendar(); - modifiedCalendarValue.setTimeInMillis(calendarValue.getTimeInMillis() + 86400000L); + e.printStackTrace(); + } + calendarValue = dtFactory.newXMLGregorianCalendar(calendar); + modifiedCalendarValue = dtFactory.newXMLGregorianCalendar(calendar); + modifiedCalendarValue.setDay(modifiedCalendarValue.getDay() + 1); + tested = new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue, stringValue, stringList, qNameValue, dateValue, calendarValue); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToComplexTypeDocTest.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToComplexTypeDocTest.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToComplexTypeDocTest.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -22,11 +22,13 @@ package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped; import java.util.ArrayList; -import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest; @@ -45,7 +47,7 @@ private static final byte byteValue = (byte) 1; private static final byte[] byteArrayValue = "!@#$%^°*()_+-=[]{}:\",.?/`~Pada,pada_jahoda,kterou_sěščřžýáíégggaabcdefghijklmnopqrstuvwxyz0123456789" - .getBytes(); + .getBytes(); private static final short shortValue = (short) 3; @@ -61,7 +63,7 @@ private static final Date dateValue = new Date(); - private static final Calendar calendarValue; + private static final XMLGregorianCalendar calendarValue; private static final ComplexType exp; @@ -74,9 +76,19 @@ stringList.add("item " + i); } - calendarValue = new GregorianCalendar(); - calendarValue.setTimeInMillis(System.currentTimeMillis()); + DatatypeFactory dtFactory = null; + GregorianCalendar calendar = new GregorianCalendar();; + try + { + dtFactory = DatatypeFactory.newInstance(); + } + catch (DatatypeConfigurationException e) + { + e.printStackTrace(); + } + calendarValue = dtFactory.newXMLGregorianCalendar(calendar); + exp = new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue, stringValue, stringList, qNameValue, dateValue, calendarValue); } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToComplexTypeRPCTest.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToComplexTypeRPCTest.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToComplexTypeRPCTest.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -22,11 +22,13 @@ package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped; import java.util.ArrayList; -import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest; @@ -61,7 +63,7 @@ private static final Date dateValue = new Date(); - private static final Calendar calendarValue, modifiedCalendarValue; + private static final XMLGregorianCalendar calendarValue, modifiedCalendarValue; private static final ComplexType exp; @@ -74,12 +76,22 @@ stringList.add("item " + i); } - calendarValue = new GregorianCalendar(); - calendarValue.setTimeInMillis(System.currentTimeMillis()); + DatatypeFactory dtFactory = null; + GregorianCalendar calendar = new GregorianCalendar();; + try + { + dtFactory = DatatypeFactory.newInstance(); + } + catch (DatatypeConfigurationException e) + { - modifiedCalendarValue = new GregorianCalendar(); - modifiedCalendarValue.setTimeInMillis(calendarValue.getTimeInMillis() + 86400000L); + e.printStackTrace(); + } + calendarValue = dtFactory.newXMLGregorianCalendar(calendar); + modifiedCalendarValue = dtFactory.newXMLGregorianCalendar(calendar); + modifiedCalendarValue.setDay(modifiedCalendarValue.getDay() + 1); + exp = new ComplexType(byteValue, byteArrayValue, shortValue, intValue, longValue, floatValue, doubleValue, stringValue, stringList, qNameValue, dateValue, calendarValue); } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToStringDocTest.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToStringDocTest.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToStringDocTest.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -21,10 +21,12 @@ */ package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped; -import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest; @@ -58,15 +60,25 @@ private static final Date dateValue = new Date(); - private static final Calendar calendarValue; + private static final XMLGregorianCalendar calendarValue; private static final String exp; static { - calendarValue = new GregorianCalendar(); - calendarValue.setTimeInMillis(System.currentTimeMillis()); + DatatypeFactory dtFactory = null; + GregorianCalendar calendar = new GregorianCalendar();; + try + { + dtFactory = DatatypeFactory.newInstance(); + } + catch (DatatypeConfigurationException e) + { + e.printStackTrace(); + } + calendarValue = dtFactory.newXMLGregorianCalendar(calendar); + StringBuffer sb = new StringBuffer(); sb.append("[byteValue=" + byteValue); sb.append(" byteArrayValue=" + new String(byteArrayValue)); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToStringRPCTest.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToStringRPCTest.java 2010-03-22 06:36:43 UTC (rev 11831) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/wrapped/ValuesToStringRPCTest.java 2010-03-22 10:51:24 UTC (rev 11832) @@ -21,10 +21,12 @@ */ package org.jboss.test.ws.jaxws.benchmark.test.datatypes.wrapped; -import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest; @@ -58,15 +60,25 @@ private static final Date dateValue = new Date(); - private static final Calendar calendarValue; + private static final XMLGregorianCalendar calendarValue; private static final String exp; static { - calendarValue = new GregorianCalendar(); - calendarValue.setTimeInMillis(System.currentTimeMillis()); + DatatypeFactory dtFactory = null; + GregorianCalendar calendar = new GregorianCalendar();; + try + { + dtFactory = DatatypeFactory.newInstance(); + } + catch (DatatypeConfigurationException e) + { + e.printStackTrace(); + } + calendarValue = dtFactory.newXMLGregorianCalendar(calendar); + StringBuffer sb = new StringBuffer(); sb.append("[byteValue=" + byteValue); sb.append(" byteArrayValue=" + new String(byteArrayValue));

14 years, 9 months

1
0
0 / 0

JBossWS SVN: r11831 - in stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943: modules/testsuite/native-tests/scripts and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2010-03-22 02:36:43 -0400 (Mon, 22 Mar 2010) New Revision: 11831 Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/pom.xml Log: Fix test case failures Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2010-03-22 06:02:27 UTC (rev 11830) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2010-03-22 06:36:43 UTC (rev 11831) @@ -65,7 +65,7 @@ http://jira.codehaus.org/browse/MANTRUN-91 --> <javac destdir="${tests.output.dir}/test-classes" debug="true" encoding="utf-8" deprecation="true" fork="true" - executable="${java.jdk15.home}/bin/javac" compiler="javac1.5"> + source="1.5" target="1.5"> <src path="${tests.output.dir}/wstools/java"/> <classpath> <pathelement path="${maven.test.classpath}"/> Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2010-03-22 06:02:27 UTC (rev 11830) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2010-03-22 06:36:43 UTC (rev 11831) @@ -100,6 +100,11 @@ { try { + //When testUsernameToken() execute before, need to clear reqContext + Map<String, Object> reqContext = usernameDispatch.getRequestContext(); + reqContext.remove(BindingProvider.USERNAME_PROPERTY); + reqContext.remove(BindingProvider.PASSWORD_PROPERTY); + String payload = "<ns1:getUsernameToken xmlns:ns1='http://org.jboss.ws/samples/wssecurity'/>"; usernameDispatch.invoke(new StreamSource(new StringReader(payload))); fail("Server should respond with [401] - Unauthorized"); Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2010-03-22 06:02:27 UTC (rev 11830) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2010-03-22 06:36:43 UTC (rev 11831) @@ -72,6 +72,11 @@ { try { + //When testUsernameToken() execute before, need to clear reqContext + Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); + reqContext.remove(BindingProvider.USERNAME_PROPERTY); + reqContext.remove(BindingProvider.PASSWORD_PROPERTY); + port.getUsernameToken(); fail("Server should respond with [401] - Unauthorized"); } @@ -90,4 +95,4 @@ String retObj = port.getUsernameToken(); assertEquals("kermit", retObj); } -} +} \ No newline at end of file Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/pom.xml 2010-03-22 06:02:27 UTC (rev 11830) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/pom.xml 2010-03-22 06:36:43 UTC (rev 11831) @@ -64,7 +64,7 @@ <jboss.common.version>1.2.1.GA</jboss.common.version> <jboss.jaxbintros.version>1.0.0.GA</jboss.jaxbintros.version> <jboss.logging.version>2.0.5.GA</jboss.logging.version> - <jboss.remoting.version>2.5.0.SP2</jboss.remoting.version> + <jboss.remoting.version>2.5.2</jboss.remoting.version> <jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version> <apache.scout.version>0.7rc2</apache.scout.version> <juddi.version>0.9RC4</juddi.version> @@ -286,6 +286,13 @@ <build> <plugins> <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.4</version> + <configuration> + <escapeWindowsPaths>false</escapeWindowsPaths> + </configuration> + </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> @@ -433,8 +440,8 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <compilerVersion>1.5</compilerVersion> - <executable>${java.jdk15.home}/bin/javac</executable> + <source>1.5</source> + <target>1.5</target> <fork>true</fork> </configuration> </plugin>

14 years, 9 months

1
0
0 / 0

JBossWS SVN: r11830 - in stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules: core/src/main/java/org/jboss/ws/extensions/security and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2010-03-22 02:02:27 -0400 (Mon, 22 Mar 2010) New Revision: 11830 Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java Log: [JBPAPP-3943] - Wrong namespace on SOAP operation when a method with header parameter having a new namespace is invoked, "second" after a method that does not have this namespace'd parameter Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2010-03-21 20:34:42 UTC (rev 11829) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2010-03-22 06:02:27 UTC (rev 11830) @@ -34,11 +34,13 @@ import javax.xml.soap.AttachmentPart; import javax.xml.soap.MimeHeader; import javax.xml.soap.MimeHeaders; +import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPConstants; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPFault; +import javax.xml.soap.SOAPHeader; import javax.xml.soap.SOAPMessage; import javax.xml.soap.SOAPPart; @@ -47,6 +49,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.SOAPMessageAbstraction; +import org.jboss.ws.core.soap.SOAPContent.State; import org.jboss.ws.core.soap.attachment.AttachmentPartImpl; import org.jboss.ws.core.soap.attachment.CIDGenerator; import org.jboss.ws.core.soap.attachment.MimeConstants; @@ -56,6 +59,8 @@ import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * The root class for all SOAP messages. As transmitted on the "wire", a SOAP message is an XML document or a @@ -523,7 +528,7 @@ if (attachment == null) { - // autogenerated CID based on part name + // auto-generated CID based on part name attachment = getAttachmentByPartName(ref); } @@ -557,4 +562,41 @@ while (attachmentItr.next() != null) attachmentItr.remove(); } + + public void prepareForDOMAccess() throws SOAPException + { + prepareForSpecificAccess(State.DOM_VALID); + } + + private void prepareForSpecificAccess(State state) throws SOAPException + { + List<SOAPContentElement> contentElements = new LinkedList<SOAPContentElement>(); + SOAPBody soapBody = this.getSOAPBody(); + NodeList nodes = soapBody.getChildNodes(); + for (int i = 0; i < nodes.getLength(); i++) + { + Node current = nodes.item(i); + if (current instanceof SOAPContentElement) + { + contentElements.add((SOAPContentElement)current); + break; + } + } + SOAPHeader soapHeader = this.getSOAPHeader(); + nodes = soapHeader.getChildNodes(); + for (int i = 0; i < nodes.getLength(); i++) + { + Node current = nodes.item(i); + if (current instanceof SOAPContentElement) + { + contentElements.add((SOAPContentElement)current); + break; + } + } + for (SOAPContentElement sce : contentElements) + { + sce.transitionTo(state); + } + } + } Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2010-03-21 20:34:42 UTC (rev 11829) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2010-03-22 06:02:27 UTC (rev 11830) @@ -39,8 +39,8 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.binding.AbstractDeserializerFactory; import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.AbstractDeserializerFactory; import org.jboss.ws.core.binding.DeserializerSupport; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.TypeMappingImpl; @@ -309,18 +309,28 @@ // Remove all child nodes container.removeContents(); - // In case of dispatch and provider we use artifical element names + // In case of dispatch and provider we use artificial element names // These need to be replaced (costly!) if (artificalElement) { container.setElementQNameInternal(contentRootName); } - Document ownerDoc = container.getOwnerDocument(); + // Process attributes: we copy from the fragment element to the previous container element, after having cleaned the latter + // to prevent useless / redundant namespace declarations with multiple prefixes. We also update the prefix of the container + // element to ensure proper namespace is configured for it + String oldPrefix = container.getPrefix(); + if (oldPrefix != null) + { + container.removeNamespaceDeclaration(oldPrefix); + } DOMUtils.copyAttributes(container, domElement); + container.setPrefix(domElement.getPrefix()); SOAPFactoryImpl soapFactory = new SOAPFactoryImpl(); + // Add new child nodes + Document ownerDoc = container.getOwnerDocument(); NodeList nlist = domElement.getChildNodes(); for (int i = 0; i < nlist.getLength(); i++) { Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2010-03-21 20:34:42 UTC (rev 11829) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2010-03-22 06:02:27 UTC (rev 11830) @@ -214,6 +214,11 @@ SecurityStore securityStore = new SecurityStore(configuration.getKeyStoreURL(), configuration.getKeyStoreType(), configuration.getKeyStorePassword(), configuration.getKeyPasswords(), configuration.getTrustStoreURL(), configuration.getTrustStoreType(), configuration.getTrustStorePassword()); SecurityEncoder encoder = new SecurityEncoder(operations, securityStore); + + if ((sign != null || encrypt != null) && message instanceof SOAPMessageImpl) + { + ((SOAPMessageImpl)message).prepareForDOMAccess(); + } encoder.encode(message.getSOAPPart()); } catch (WSSecurityException e) Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2010-03-21 20:34:42 UTC (rev 11829) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2010-03-22 06:02:27 UTC (rev 11830) @@ -32,10 +32,16 @@ import javax.xml.soap.SOAPMessage; import javax.xml.soap.Text; +import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; +import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPContentElement; +import org.jboss.ws.core.soap.SOAPElementImpl; +import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.XMLFragment; import org.jboss.wsf.test.JBossWSTest; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * Test the SOAPContentElement @@ -187,4 +193,53 @@ String expEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Body><ns1:hello xmlns:ns1='http://handlerservice1.org/wsdl'><String_1>world::SOAP header was added</String_1></ns1:hello></env:Body></env:Envelope>"; assertEquals(expEnv, baos.toString()); } + + + //JBWS-2940: JAXB marshalling of object model can lead to a slightly different yet equivalent XMLFragment + //The new fragment can have different namespace prefix declarations, which can cause major issues in unlucky situations like below + public void testAttributesHandlingOnModelTransition() throws Exception + { + String envStr = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + "<env:Body>" + + "<ns2:Foo xmlns:ns2='firstNS'/>" + + "</env:Body>" + + "</env:Envelope>"; + + MessageFactoryImpl factory = new MessageFactoryImpl(); + factory.setStyle(Style.DOCUMENT); + SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); + + SOAPContentElement sce = getSOAPContentElement(soapMessage); + + //force transition to XML_VALID and set an equivalent XMLFragment (but having a new ns declaration that would overwrite the one in the original fragment) + sce.setXMLFragment(new XMLFragment("<Foo xmlns='firstNS' xmlns:ns2='secondNs'/>")); + + SOAPBody soapBody = soapMessage.getSOAPBody(); + //force transition to DOM_VALID + soapBody.getFirstChild().getChildNodes(); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + soapMessage.writeTo(baos); + + soapMessage = factory.createMessage(null, new ByteArrayInputStream(baos.toByteArray())); + Node foo = soapMessage.getSOAPBody().getFirstChild(); + assertEquals("firstNS", foo.getNamespaceURI()); + } + + private SOAPContentElement getSOAPContentElement(final SOAPMessage soapMessage) throws Exception + { + SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody(); + SOAPElementImpl bodyElement = null; + NodeList nodes = soapBody.getChildNodes(); + for (int i = 0; i < nodes.getLength() && bodyElement == null; i++) + { + Node current = nodes.item(i); + if (current instanceof SOAPElementImpl) + { + bodyElement = (SOAPElementImpl)current; + } + } + return (SOAPContentElement)bodyElement; + } }

14 years, 9 months

1
0
0 / 0

JBossWS SVN: r11829 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-03-21 16:34:42 -0400 (Sun, 21 Mar 2010) New Revision: 11829 Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt Log: [JBWS-2872] Enable anonymous tests on CXF stack Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-03-21 20:03:54 UTC (rev 11828) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-03-21 20:34:42 UTC (rev 11829) @@ -5,9 +5,6 @@ org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - # [CXF-1516] Type inheritance with document/literal/bare org/jboss/test/ws/jaxws/jbws1702/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-03-21 20:03:54 UTC (rev 11828) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-03-21 20:34:42 UTC (rev 11829) @@ -5,9 +5,6 @@ org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - # [CXF-1516] Type inheritance with document/literal/bare org/jboss/test/ws/jaxws/jbws1702/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-03-21 20:03:54 UTC (rev 11828) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-03-21 20:34:42 UTC (rev 11829) @@ -5,9 +5,6 @@ org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - # [CXF-1516] Type inheritance with document/literal/bare org/jboss/test/ws/jaxws/jbws1702/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-03-21 20:03:54 UTC (rev 11828) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-03-21 20:34:42 UTC (rev 11829) @@ -5,9 +5,6 @@ org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - # [CXF-1516] Type inheritance with document/literal/bare org/jboss/test/ws/jaxws/jbws1702/**

14 years, 9 months

1
0
0 / 0

JBossWS SVN: r11828 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-03-21 16:03:54 -0400 (Sun, 21 Mar 2010) New Revision: 11828 Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt Log: [CXF-2723] Exclude test Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-03-20 09:01:48 UTC (rev 11827) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-03-21 20:03:54 UTC (rev 11828) @@ -23,6 +23,9 @@ # [CXF-2006] RespectBinding feature and not understood required extensibility elements org/jboss/test/ws/jaxws/jbws2449/** +# [CXF-2723] Allow configuration of JaxWsClientFactoryBean during port creation +org/jboss/test/ws/jaxws/cxf/jaxbintros/** + # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-03-20 09:01:48 UTC (rev 11827) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-03-21 20:03:54 UTC (rev 11828) @@ -23,6 +23,9 @@ # [CXF-2006] RespectBinding feature and not understood required extensibility elements org/jboss/test/ws/jaxws/jbws2449/** +# [CXF-2723] Allow configuration of JaxWsClientFactoryBean during port creation +org/jboss/test/ws/jaxws/cxf/jaxbintros/** + # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-03-20 09:01:48 UTC (rev 11827) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-03-21 20:03:54 UTC (rev 11828) @@ -23,6 +23,9 @@ # [CXF-2006] RespectBinding feature and not understood required extensibility elements org/jboss/test/ws/jaxws/jbws2449/** +# [CXF-2723] Allow configuration of JaxWsClientFactoryBean during port creation +org/jboss/test/ws/jaxws/cxf/jaxbintros/** + # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-03-20 09:01:48 UTC (rev 11827) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-03-21 20:03:54 UTC (rev 11828) @@ -23,6 +23,9 @@ # [CXF-2006] RespectBinding feature and not understood required extensibility elements org/jboss/test/ws/jaxws/jbws2449/** +# [CXF-2723] Allow configuration of JaxWsClientFactoryBean during port creation +org/jboss/test/ws/jaxws/cxf/jaxbintros/** + # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*

14 years, 9 months

1
0
0 / 0

JBossWS SVN: r11827 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmstransport/META-INF.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-03-20 05:01:48 -0400 (Sat, 20 Mar 2010) New Revision: 11827 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/hornetq-jms.xml Log: [JBWS-2966]Adding queue declaration Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/hornetq-jms.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/hornetq-jms.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/hornetq-jms.xml 2010-03-20 09:01:48 UTC (rev 11827) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> + <queue name="RequestQueue"> + <entry name="/queue/RequestQueue"/> + </queue> + <queue name="ResponseQueue"> + <entry name="/queue/ResponseQueue"/> + </queue> +</configuration> \ No newline at end of file

14 years, 9 months

1
0
0 / 0

JBossWS SVN: r11826 - stack/native/trunk/modules/testsuite/framework-tests/scripts.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-03-19 10:30:36 -0400 (Fri, 19 Mar 2010) New Revision: 11826 Modified: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml Log: [JBWS-2960] setting desdir for generated java artifacts Modified: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml 2010-03-19 14:21:16 UTC (rev 11825) +++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml 2010-03-19 14:30:36 UTC (rev 11826) @@ -12,11 +12,11 @@   - <target name="wsprovide" depends="prepend-jars" description="Provide JAX-WS contracts"> + <target name="wsprovide" description="Provide JAX-WS contracts"> <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask"> <classpath> - <pathelement path="${wsprovide.classpath}"/> + <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> @@ -24,12 +24,9 @@ genwsdl="true" sei="org.jboss.test.ws.jaxws.jbws2960.AddNumbersImpl" classpath="${tests.output.dir}/test-classes" + destdir="${tests.output.dir}/test-resources/jaxws/jbws2960" resourcedestdir="${tests.output.dir}/test-resources/jaxws/jbws2960" /> </target> - <target name="prepend-jars"> - <property name="wsprovide.classpath" value="${maven.test.classpath}"/> - </target> - </project>

14 years, 9 months

1
0
0 / 0

JBossWS SVN: r11825 - in stack/cxf/trunk/modules/testsuite: cxf-tests/scripts and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-03-19 10:21:16 -0400 (Fri, 19 Mar 2010) New Revision: 11825 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-2966] Provide different queue configurations when using HornetQ on AS trunk Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2010-03-19 14:16:49 UTC (rev 11824) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2010-03-19 14:21:16 UTC (rev 11825) @@ -37,6 +37,14 @@ <include name="jboss-service.xml"/> </metainf> </jar> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport-as6.sar"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxws-samples-jmstransport.war"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF"> + <include name="hornetq-jms.xml"/> + </metainf> + </jar>  <war @@ -59,6 +67,14 @@ <include name="jboss-service.xml"/> </metainf> </jar> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-fromjava-jmstransport-as6.sar"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxws-fromjava-jmstransport.war"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF"> + <include name="hornetq-jms.xml"/> + </metainf> + </jar> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java 2010-03-19 14:16:49 UTC (rev 11824) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java 2010-03-19 14:21:16 UTC (rev 11825) @@ -31,12 +31,15 @@ import javax.jms.QueueSession; import javax.jms.Session; import javax.jms.TextMessage; +import javax.management.ObjectName; import javax.naming.InitialContext; import junit.framework.Test; import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -50,8 +53,22 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(FromJavaJMSTransportTestCase.class, "jaxws-fromjava-jmstransport.sar"); + return new JBossWSTestSetup(FromJavaJMSTransportTestCase.class, isHornetQAvailable() ? "jaxws-fromjava-jmstransport-as6.sar" : "jaxws-fromjava-jmstransport.sar"); } + + private static boolean isHornetQAvailable() + { + try + { + ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server"); + String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber"); + return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2"); + } + catch (Exception e) + { + return false; + } + } public void testMessagingClient() throws Exception { @@ -104,6 +121,8 @@ assertNotNull("Expected response message", responseListener.resMessage); assertEquals(DOMUtils.parse(resMessage), DOMUtils.parse(responseListener.resMessage)); + sender.close(); + receiver.close(); con.stop(); session.close(); con.close(); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-03-19 14:16:49 UTC (rev 11824) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-03-19 14:21:16 UTC (rev 11825) @@ -33,6 +33,7 @@ import javax.jms.QueueSession; import javax.jms.Session; import javax.jms.TextMessage; +import javax.management.ObjectName; import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -40,7 +41,9 @@ import junit.framework.Test; import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -54,9 +57,22 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JMSTransportTestCase.class, "jaxws-samples-jmstransport.sar"); + return new JBossWSTestSetup(JMSTransportTestCase.class, isHornetQAvailable() ? "jaxws-samples-jmstransport-as6.sar" : "jaxws-samples-jmstransport.sar"); } + private static boolean isHornetQAvailable() + { + try + { + ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server"); + String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber"); + return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2"); + } + catch (Exception e) + { + return false; + } + } public void testJMSEndpointPort() throws Exception { @@ -136,6 +152,8 @@ assertNotNull("Expected response message", responseListener.resMessage); assertEquals(DOMUtils.parse(resMessage), DOMUtils.parse(responseListener.resMessage)); + sender.close(); + receiver.close(); con.stop(); session.close(); con.close(); Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2010-03-19 14:16:49 UTC (rev 11824) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2010-03-19 14:21:16 UTC (rev 11825) @@ -26,6 +26,7 @@ <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <hibernate.version>3.2.4.sp1</hibernate.version> <asm.version>2.2.3</asm.version> + <hornetq.version>2.1.0.r8931</hornetq.version> <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> </properties> @@ -550,6 +551,16 @@ <artifactId>jboss-as-system</artifactId> <version>${jboss.version}</version> </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-transports</artifactId> + <version>${hornetq.version}</version> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms-client</artifactId> + <version>${hornetq.version}</version> + </dependency> </dependencies> <build> <plugins>

14 years, 9 months

1
0
0 / 0

JBossWS SVN: r11824 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws: jaxws/samples/jmstransport and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-03-19 10:16:49 -0400 (Fri, 19 Mar 2010) New Revision: 11824 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java Log: [JBWS-2966] Also close sender/receiver Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2010-03-19 12:26:53 UTC (rev 11823) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2010-03-19 14:16:49 UTC (rev 11824) @@ -128,6 +128,8 @@ assertNotNull("Expected response message", responseListener.resMessage); assertEquals(DOMUtils.parse(resMessage), DOMUtils.parse(responseListener.resMessage)); + sender.close(); + receiver.close(); con.stop(); session.close(); con.close(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-03-19 12:26:53 UTC (rev 11823) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-03-19 14:16:49 UTC (rev 11824) @@ -170,6 +170,8 @@ assertNotNull("Expected response message", responseListener.resMessage); assertEquals(DOMUtils.parse(resMessage), DOMUtils.parse(responseListener.resMessage)); + sender.close(); + receiver.close(); con.stop(); session.close(); con.close();

14 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2010