butek 02/04/03 07:28:36
Modified: java/samples/bidbuy PurchaseOrder.java TestClient.java
java/test/wsdl/roundtrip RoundtripPortType.java
RoundtripTestServiceTestCase.java
RoundtripTestSoapBindingImpl.java
java/test/wsdl/types ComprehensiveTypes.wsdl
VerifyTestCase.java
Removed: java/src/javax/xml/rpc/holders DateHolder.java
Log:
I've removed the mapping of xsd:date to java.util.Date (Sam started this
yesterday, but it broke the build). This mapping isn't part of JAX-RPC and
it kept us from some backward interoperability.
Doing this work I also discovered one sample - bidbuy - that still used the
old mapping of xsd:dateTime to Date which I changed to Calendar.
Revision Changes Path
1.2 +5 -5 xml-axis/java/samples/bidbuy/PurchaseOrder.java
Index: PurchaseOrder.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/bidbuy/PurchaseOrder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PurchaseOrder.java 9 May 2001 19:19:52 -0000 1.1
+++ PurchaseOrder.java 3 Apr 2002 15:28:36 -0000 1.2
@@ -1,6 +1,6 @@
package samples.bidbuy;
-import java.util.Date;
+import java.util.Calendar;
public class PurchaseOrder {
@@ -8,7 +8,7 @@
public PurchaseOrder() {};
- public PurchaseOrder(String id, Date createDate, Address shipTo,
+ public PurchaseOrder(String id, Calendar createDate, Address shipTo,
Address billTo, LineItem[] items)
{
this.poID=id;
@@ -24,9 +24,9 @@
public String getPoID() { return poID; }
public void setPoID(String value) { poID=value; }
- private Date createDate;
- public Date getCreateDate() { return createDate; }
- public void setCreateDate(Date value) { createDate=value; }
+ private Calendar createDate;
+ public Calendar getCreateDate() { return createDate; }
+ public void setCreateDate(Calendar value) { createDate=value; }
private Address shipTo;
public Address getShipTo() { return shipTo; }
1.23 +2 -2 xml-axis/java/samples/bidbuy/TestClient.java
Index: TestClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/bidbuy/TestClient.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TestClient.java 27 Mar 2002 16:46:55 -0000 1.22
+++ TestClient.java 3 Apr 2002 15:28:36 -0000 1.23
@@ -66,7 +66,7 @@
import javax.xml.rpc.namespace.QName;
import java.net.URL;
-import java.util.Date;
+import java.util.Calendar;
/**
@@ -134,7 +134,7 @@
PurchaseOrder po = new PurchaseOrder(
"NCC-1701",
- new Date(),
+ Calendar.getInstance(),
new Address("Sam Ruby", "Home", "Raleigh", "NC", "27676"),
new Address("Lou Gerstner", "Work", "Armonk", "NY", "15222"),
li
1.4 +0 -3 xml-axis/java/test/wsdl/roundtrip/RoundtripPortType.java
Index: RoundtripPortType.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/roundtrip/RoundtripPortType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RoundtripPortType.java 31 Mar 2002 23:09:34 -0000 1.3
+++ RoundtripPortType.java 3 Apr 2002 15:28:36 -0000 1.4
@@ -93,8 +93,6 @@
throws java.rmi.RemoteException;
public java.math.BigDecimal methodBigDecimal(java.math.BigDecimal inDecimal)
throws java.rmi.RemoteException;
- public java.util.Date methodDate(java.util.Date inDate)
- throws java.rmi.RemoteException;
public java.util.Calendar methodDateTime(java.util.Calendar inDateTime)
throws java.rmi.RemoteException;
public byte[] methodByteArray(byte[] inByteArray)
@@ -104,7 +102,6 @@
public void methodAllTypesIn(java.lang.String string,
java.math.BigInteger integer,
java.math.BigDecimal decimal,
- java.util.Date date,
java.util.Calendar dateTime,
boolean _boolean,
byte _byte,
1.7 +0 -19
xml-axis/java/test/wsdl/roundtrip/RoundtripTestServiceTestCase.java
Index: RoundtripTestServiceTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/roundtrip/RoundtripTestServiceTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RoundtripTestServiceTestCase.java 31 Mar 2002 23:09:34 -0000 1.6
+++ RoundtripTestServiceTestCase.java 3 Apr 2002 15:28:36 -0000 1.7
@@ -650,7 +650,6 @@
binding.methodAllTypesIn(new String("Request methodAllTypesIn"),
new BigInteger("545"),
new BigDecimal("546.545"),
- new Date(1017532800000L),
dateTime,
true,
(byte) 2,
@@ -717,24 +716,6 @@
}
} // testMethodByteArray
-
- /**
- * Test to insure that a Date object matches the expected values
- * on both the client and server.
- */
- public void testMethodDate() {
-
- try {
- Date expected = new Date(1017532800000L);
- Date actual = binding.methodDate(new Date(1017532800000L));
- assertEquals("The expected and actual values did not match.",
- expected,
- actual);
- } catch (RemoteException re) {
- fail("Remote Exception caught: " + re);
- }
-
- } // testMethodDateTime
/**
* Test to insure that a Calendar object matches the expected values
1.7 +0 -14
xml-axis/java/test/wsdl/roundtrip/RoundtripTestSoapBindingImpl.java
Index: RoundtripTestSoapBindingImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/roundtrip/RoundtripTestSoapBindingImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RoundtripTestSoapBindingImpl.java 31 Mar 2002 23:09:34 -0000 1.6
+++ RoundtripTestSoapBindingImpl.java 3 Apr 2002 15:28:36 -0000 1.7
@@ -391,7 +391,6 @@
public void methodAllTypesIn(String in0,
BigInteger in1,
BigDecimal in2,
- Date in3,
Calendar in35,
boolean in4,
byte in5,
@@ -416,7 +415,6 @@
if (!((in0.equals(new String("Request methodAllTypesIn"))) &&
(in1.equals(new BigInteger("545"))) &&
(in2.equals(new BigDecimal("546.545"))) &&
- (in3.equals(new Date(1017532800000L))) &&
(in35.equals(expectedDateTime)) &&
(in13.equals(new Boolean(false))) &&
(in14.equals(new Byte((byte) 11))) &&
@@ -466,18 +464,6 @@
}
} // methodByteArray
-
- public Date methodDate(Date in0) throws RemoteException {
-
- Date expectedDate = new Date(1017532800000L);
-
- if (in0.equals(expectedDate)) {
- return new Date(1017532800000L);
- } else {
- throw new RemoteException("Expecting a Date value of " + expectedDate +
".");
- }
-
- } // methodDate
public Calendar methodDateTime(Calendar in0) throws RemoteException {
1.23 +0 -30 xml-axis/java/test/wsdl/types/ComprehensiveTypes.wsdl
Index: ComprehensiveTypes.wsdl
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/types/ComprehensiveTypes.wsdl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ComprehensiveTypes.wsdl 31 Mar 2002 23:09:34 -0000 1.22
+++ ComprehensiveTypes.wsdl 3 Apr 2002 15:28:36 -0000 1.23
@@ -317,7 +317,6 @@
<part name="boolean" type="xsd:boolean"/>
<part name="byte" type="xsd:byte"/>
<part name="QName" type="xsd:QName"/>
- <part name="date" type="xsd:date"/>
<part name="dateTime" type="xsd:dateTime"/>
<part name="base64Binary" type="xsd:base64Binary"/>
<part name="hexBinary" type="xsd:hexBinary"/>
@@ -430,16 +429,6 @@
<part name="decimal" type="xsd:decimal"/>
</message>
- <message name="inputDate">
- <part name="inDate" type="xsd:date"/>
- <part name="date" type="xsd:date"/>
- </message>
-
- <message name="outputDate">
- <part name="outDate" type="xsd:date"/>
- <part name="date" type="xsd:date"/>
- </message>
-
<message name="inputDateTime">
<part name="inDateTime" type="xsd:dateTime"/>
<part name="dateTime" type="xsd:dateTime"/>
@@ -776,10 +765,6 @@
<input message="tns:inputDecimal"/>
<output message="tns:outputDecimal"/>
</operation>
- <operation name="methodDate">
- <input message="tns:inputDate"/>
- <output message="tns:outputDate"/>
- </operation>
<operation name="methodDateTime">
<input message="tns:inputDateTime"/>
<output message="tns:outputDateTime"/>
@@ -1488,21 +1473,6 @@
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
</output>
</operation>
- <operation name="methodDate">
- <soap:operation soapAction=""/>
- <input>
- <soap:body
- use="encoded"
- namespace=""
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body
- use="encoded"
- namespace=""
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
<operation name="methodDateTime">
<soap:operation soapAction=""/>
<input>
1.18 +1 -12 xml-axis/java/test/wsdl/types/VerifyTestCase.java
Index: VerifyTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/types/VerifyTestCase.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- VerifyTestCase.java 31 Mar 2002 23:09:34 -0000 1.17
+++ VerifyTestCase.java 3 Apr 2002 15:28:36 -0000 1.18
@@ -7,8 +7,8 @@
package test.wsdl.types;
-import java.util.Date;
import java.util.Calendar;
+import java.util.Date;
import javax.xml.rpc.ServiceException;
@@ -20,7 +20,6 @@
import javax.xml.rpc.holders.ByteWrapperArrayHolder;
import javax.xml.rpc.holders.ByteHolder;
import javax.xml.rpc.holders.CalendarHolder;
-import javax.xml.rpc.holders.DateHolder;
import javax.xml.rpc.holders.DoubleWrapperHolder;
import javax.xml.rpc.holders.DoubleHolder;
import javax.xml.rpc.holders.FloatWrapperHolder;
@@ -98,7 +97,6 @@
true,
(byte) 0,
new QName("hi", "ho"),
- new Date(),
Calendar.getInstance(),
new byte[]{(byte) 5},
new byte[]{(byte) 6},
@@ -126,7 +124,6 @@
new BooleanHolder(true),
new ByteHolder((byte) 7),
new QNameHolder(new QName("ho", "hi")),
- new DateHolder(new Date()),
new CalendarHolder(Calendar.getInstance()),
new ByteArrayHolder(new byte[]{(byte) 8}),
new ByteArrayHolder(new byte[]{(byte) 9}),
@@ -154,7 +151,6 @@
new BooleanHolder(),
new ByteHolder(),
new QNameHolder(),
- new DateHolder(),
new CalendarHolder(),
new ByteArrayHolder(),
new ByteArrayHolder(),
@@ -455,13 +451,6 @@
java.math.BigDecimal sendValue = new java.math.BigDecimal("1205.258");
BigDecimalHolder bdh = new BigDecimalHolder(sendValue);
java.math.BigDecimal actual = binding.methodDecimal(sendValue, bdh);
- } catch (java.rmi.RemoteException re) {
- throw new junit.framework.AssertionFailedError("Remote Exception
caught: " + re );
- }
- try {
- Date sendValue = new Date(1012182070626L);
- DateHolder dh = new DateHolder(sendValue);
- Date actual = binding.methodDate(sendValue, dh);
} catch (java.rmi.RemoteException re) {
throw new junit.framework.AssertionFailedError("Remote Exception
caught: " + re );
}
