Author: richard.opalka(a)jboss.com
Date: 2012-10-19 04:06:39 -0400 (Fri, 19 Oct 2012)
New Revision: 16923
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectCA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectFA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectGA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectMA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionCA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionFA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionGA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionMA.java
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionCA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionFA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionGA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionMA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectCA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectFA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectGA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectMA.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointIface.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointImpl.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java
Log:
[JBWS-3552] enhancing test case to take inheritance into account
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectCA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectCA.java
(rev 0)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectCA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.jbws3552;
+
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+@XmlTransient
+public class AbstractObjectCA {
+ private String message;
+ private String description;
+ private int code;
+ private ComplexObjectCA complexObject;
+
+ public AbstractObjectCA() {
+ super();
+ }
+
+ public AbstractObjectCA(String message, String description, int code, ComplexObjectCA
complexObject) {
+ this.message = message;
+ this.description = description;
+ this.code = code;
+ this.complexObject = complexObject;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public ComplexObjectCA getComplexObject() {
+ return complexObject;
+ }
+
+ public String toString() {
+ return message + "," + description + "," + code +
"," + complexObject;
+ }
+}
\ No newline at end of file
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectFA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectFA.java
(rev 0)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectFA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.jbws3552;
+
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+@XmlTransient
+public class AbstractObjectFA {
+ private String message;
+ private String description;
+ private int code;
+ @XmlJavaTypeAdapter(value = ComplexObjectFAAdapter.class)
+ private ComplexObjectFA complexObject;
+
+ public AbstractObjectFA() {
+ super();
+ }
+
+ public AbstractObjectFA(String message, String description, int code, ComplexObjectFA
complexObject) {
+ this.message = message;
+ this.description = description;
+ this.code = code;
+ this.complexObject = complexObject;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public ComplexObjectFA getComplexObject() {
+ return complexObject;
+ }
+
+ public String toString() {
+ return message + "," + description + "," + code +
"," + complexObject;
+ }
+}
\ No newline at end of file
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectGA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectGA.java
(rev 0)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectGA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.jbws3552;
+
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+@XmlTransient
+public class AbstractObjectGA {
+ private String message;
+ private String description;
+ private int code;
+ private ComplexObjectGA complexObject;
+
+ public AbstractObjectGA() {
+ super();
+ }
+
+ public AbstractObjectGA(String message, String description, int code, ComplexObjectGA
complexObject) {
+ this.message = message;
+ this.description = description;
+ this.code = code;
+ this.complexObject = complexObject;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public ComplexObjectGA getComplexObject() {
+ return complexObject;
+ }
+
+ public String toString() {
+ return message + "," + description + "," + code +
"," + complexObject;
+ }
+}
\ No newline at end of file
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectMA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectMA.java
(rev 0)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectMA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.jbws3552;
+
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+@XmlTransient
+public class AbstractObjectMA {
+ private String message;
+ private String description;
+ private int code;
+ private ComplexObjectMA complexObject;
+
+ public AbstractObjectMA() {
+ super();
+ }
+
+ public AbstractObjectMA(String message, String description, int code, ComplexObjectMA
complexObject) {
+ this.message = message;
+ this.description = description;
+ this.code = code;
+ this.complexObject = complexObject;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setComplexObject(ComplexObjectMA complexObject) {
+ this.complexObject = complexObject;
+ }
+
+ @XmlJavaTypeAdapter(value = ComplexObjectMAAdapter.class)
+ public ComplexObjectMA getComplexObject() {
+ return complexObject;
+ }
+
+ public String toString() {
+ return message + "," + description + "," + code +
"," + complexObject;
+ }
+}
\ No newline at end of file
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionCA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionCA.java 2012-10-19
07:37:43 UTC (rev 16922)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionCA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -21,11 +21,10 @@
*/
package org.jboss.test.ws.jaxws.jbws3552;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlTransient
public class AdaptedExceptionCA extends Exception {
private String message;
private String description;
@@ -33,6 +32,7 @@
private ComplexObjectCA complexObject;
public AdaptedExceptionCA() {
+ super();
}
public AdaptedExceptionCA(String message, String description, int code,
ComplexObjectCA complexObject) {
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionFA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionFA.java 2012-10-19
07:37:43 UTC (rev 16922)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionFA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -21,11 +21,10 @@
*/
package org.jboss.test.ws.jaxws.jbws3552;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlTransient
public class AdaptedExceptionFA extends Exception {
private String message;
private String description;
@@ -34,6 +33,7 @@
private ComplexObjectFA complexObject;
public AdaptedExceptionFA() {
+ super();
}
public AdaptedExceptionFA(String message, String description, int code,
ComplexObjectFA complexObject) {
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionGA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionGA.java 2012-10-19
07:37:43 UTC (rev 16922)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionGA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -21,11 +21,10 @@
*/
package org.jboss.test.ws.jaxws.jbws3552;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlTransient
public class AdaptedExceptionGA extends Exception {
private String message;
private String description;
@@ -33,6 +32,7 @@
private ComplexObjectGA complexObject;
public AdaptedExceptionGA() {
+ super();
}
public AdaptedExceptionGA(String message, String description, int code,
ComplexObjectGA complexObject) {
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionMA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionMA.java 2012-10-19
07:37:43 UTC (rev 16922)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionMA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -21,11 +21,10 @@
*/
package org.jboss.test.ws.jaxws.jbws3552;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-(a)XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
+@XmlTransient
public class AdaptedExceptionMA extends Exception {
private String message;
private String description;
@@ -33,6 +32,7 @@
private ComplexObjectMA complexObject;
public AdaptedExceptionMA() {
+ super();
}
public AdaptedExceptionMA(String message, String description, int code,
ComplexObjectMA complexObject) {
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectCA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectCA.java 2012-10-19
07:37:43 UTC (rev 16922)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectCA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -23,42 +23,15 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@XmlAccessorType(XmlAccessType.FIELD)
-public class AdaptedObjectCA {
- private String message;
- private String description;
- private int code;
- private ComplexObjectCA complexObject;
+public class AdaptedObjectCA extends AbstractObjectCA {
public AdaptedObjectCA() {
+ super();
}
public AdaptedObjectCA(String message, String description, int code, ComplexObjectCA
complexObject) {
- this.message = message;
- this.description = description;
- this.code = code;
- this.complexObject = complexObject;
+ super(message, description, code, complexObject);
}
-
- public String getMessage() {
- return message;
- }
-
- public String getDescription() {
- return description;
- }
-
- public int getCode() {
- return code;
- }
-
- public ComplexObjectCA getComplexObject() {
- return complexObject;
- }
-
- public String toString() {
- return message + "," + description + "," + code +
"," + complexObject;
- }
}
\ No newline at end of file
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectFA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectFA.java 2012-10-19
07:37:43 UTC (rev 16922)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectFA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -23,43 +23,15 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@XmlAccessorType(XmlAccessType.FIELD)
-public class AdaptedObjectFA {
- private String message;
- private String description;
- private int code;
- @XmlJavaTypeAdapter(value = ComplexObjectFAAdapter.class)
- private ComplexObjectFA complexObject;
+public class AdaptedObjectFA extends AbstractObjectFA {
public AdaptedObjectFA() {
+ super();
}
public AdaptedObjectFA(String message, String description, int code, ComplexObjectFA
complexObject) {
- this.message = message;
- this.description = description;
- this.code = code;
- this.complexObject = complexObject;
+ super(message, description, code, complexObject);
}
-
- public String getMessage() {
- return message;
- }
-
- public String getDescription() {
- return description;
- }
-
- public int getCode() {
- return code;
- }
-
- public ComplexObjectFA getComplexObject() {
- return complexObject;
- }
-
- public String toString() {
- return message + "," + description + "," + code +
"," + complexObject;
- }
}
\ No newline at end of file
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectGA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectGA.java 2012-10-19
07:37:43 UTC (rev 16922)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectGA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -25,39 +25,13 @@
import javax.xml.bind.annotation.XmlAccessorType;
@XmlAccessorType(XmlAccessType.FIELD)
-public class AdaptedObjectGA {
- private String message;
- private String description;
- private int code;
- private ComplexObjectGA complexObject;
+public class AdaptedObjectGA extends AbstractObjectGA {
public AdaptedObjectGA() {
+ super();
}
public AdaptedObjectGA(String message, String description, int code, ComplexObjectGA
complexObject) {
- this.message = message;
- this.description = description;
- this.code = code;
- this.complexObject = complexObject;
+ super(message, description, code, complexObject);
}
-
- public String getMessage() {
- return message;
- }
-
- public String getDescription() {
- return description;
- }
-
- public int getCode() {
- return code;
- }
-
- public ComplexObjectGA getComplexObject() {
- return complexObject;
- }
-
- public String toString() {
- return message + "," + description + "," + code +
"," + complexObject;
- }
}
\ No newline at end of file
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectMA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectMA.java 2012-10-19
07:37:43 UTC (rev 16922)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectMA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -23,59 +23,15 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
-public class AdaptedObjectMA {
- private String message;
- private String description;
- private int code;
- private ComplexObjectMA complexObject;
+public class AdaptedObjectMA extends AbstractObjectMA {
public AdaptedObjectMA() {
+ super();
}
public AdaptedObjectMA(String message, String description, int code, ComplexObjectMA
complexObject) {
- this.message = message;
- this.description = description;
- this.code = code;
- this.complexObject = complexObject;
+ super(message, description, code, complexObject);
}
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setCode(int code) {
- this.code = code;
- }
-
- public int getCode() {
- return code;
- }
-
- public void setComplexObject(ComplexObjectMA complexObject) {
- this.complexObject = complexObject;
- }
-
- @XmlJavaTypeAdapter(value = ComplexObjectMAAdapter.class)
- public ComplexObjectMA getComplexObject() {
- return complexObject;
- }
-
- public String toString() {
- return message + "," + description + "," + code +
"," + complexObject;
- }
}
\ No newline at end of file
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointIface.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointIface.java 2012-10-19
07:37:43 UTC (rev 16922)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointIface.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -27,17 +27,33 @@
public interface EndpointIface {
AdaptedObjectCA echoCA(AdaptedObjectCA ao);
+ AbstractObjectCA echoAbstractCA(AbstractObjectCA ao);
+
AdaptedObjectFA echoFA(AdaptedObjectFA ao);
+ AbstractObjectFA echoAbstractFA(AbstractObjectFA ao);
+
AdaptedObjectGA echoGA(AdaptedObjectGA ao);
+ AbstractObjectGA echoAbstractGA(AbstractObjectGA ao);
+
AdaptedObjectMA echoMA(AdaptedObjectMA ao);
+ AbstractObjectMA echoAbstractMA(AbstractObjectMA ao);
+
void throwExceptionCA() throws AdaptedExceptionCA;
+ void throwExtendedExceptionCA() throws ExtendedAdaptedExceptionCA;
+
void throwExceptionFA() throws AdaptedExceptionFA;
+
+ void throwExtendedExceptionFA() throws ExtendedAdaptedExceptionFA;
void throwExceptionGA() throws AdaptedExceptionGA;
+ void throwExtendedExceptionGA() throws ExtendedAdaptedExceptionGA;
+
void throwExceptionMA() throws AdaptedExceptionMA;
+
+ void throwExtendedExceptionMA() throws ExtendedAdaptedExceptionMA;
}
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointImpl.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointImpl.java 2012-10-19
07:37:43 UTC (rev 16922)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointImpl.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -29,31 +29,63 @@
return ao;
}
+ public AbstractObjectCA echoAbstractCA(AbstractObjectCA ao) {
+ return ao;
+ }
+
public AdaptedObjectFA echoFA(AdaptedObjectFA ao) {
return ao;
}
+ public AbstractObjectFA echoAbstractFA(AbstractObjectFA ao) {
+ return ao;
+ }
+
public AdaptedObjectGA echoGA(AdaptedObjectGA ao) {
return ao;
}
+ public AbstractObjectGA echoAbstractGA(AbstractObjectGA ao) {
+ return ao;
+ }
+
public AdaptedObjectMA echoMA(AdaptedObjectMA ao) {
return ao;
}
+ public AbstractObjectMA echoAbstractMA(AbstractObjectMA ao) {
+ return ao;
+ }
+
public void throwExceptionCA() throws AdaptedExceptionCA {
- throw new AdaptedExceptionCA("exception message", "exception
description", 666, new ComplexObjectCA("c", "d"));
+ throw new ExtendedAdaptedExceptionCA("exception message",
"exception description", 666, new ComplexObjectCA("c",
"d"));
}
+ public void throwExtendedExceptionCA() throws AdaptedExceptionCA {
+ throw new ExtendedAdaptedExceptionCA("exception message",
"exception description", 666, new ComplexObjectCA("c",
"d"));
+ }
+
public void throwExceptionFA() throws AdaptedExceptionFA {
- throw new AdaptedExceptionFA("exception message", "exception
description", 666, new ComplexObjectFA("c", "d"));
+ throw new ExtendedAdaptedExceptionFA("exception message",
"exception description", 666, new ComplexObjectFA("c",
"d"));
}
+ public void throwExtendedExceptionFA() throws ExtendedAdaptedExceptionFA {
+ throw new ExtendedAdaptedExceptionFA("exception message",
"exception description", 666, new ComplexObjectFA("c",
"d"));
+ }
+
public void throwExceptionGA() throws AdaptedExceptionGA {
- throw new AdaptedExceptionGA("exception message", "exception
description", 666, new ComplexObjectGA("c", "d"));
+ throw new ExtendedAdaptedExceptionGA("exception message",
"exception description", 666, new ComplexObjectGA("c",
"d"));
}
+ public void throwExtendedExceptionGA() throws AdaptedExceptionGA {
+ throw new ExtendedAdaptedExceptionGA("exception message",
"exception description", 666, new ComplexObjectGA("c",
"d"));
+ }
+
public void throwExceptionMA() throws AdaptedExceptionMA {
- throw new AdaptedExceptionMA("exception message", "exception
description", 666, new ComplexObjectMA("c", "d"));
+ throw new ExtendedAdaptedExceptionMA("exception message",
"exception description", 666, new ComplexObjectMA("c",
"d"));
}
+
+ public void throwExtendedExceptionMA() throws AdaptedExceptionMA {
+ throw new ExtendedAdaptedExceptionMA("exception message",
"exception description", 666, new ComplexObjectMA("c",
"d"));
+ }
}
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionCA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionCA.java
(rev 0)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionCA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.jbws3552;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class ExtendedAdaptedExceptionCA extends AdaptedExceptionCA {
+
+ public ExtendedAdaptedExceptionCA() {
+ }
+
+ public ExtendedAdaptedExceptionCA(String message, String description, int code,
ComplexObjectCA complexObject) {
+ super(message, description, code, complexObject);
+ }
+}
\ No newline at end of file
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionFA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionFA.java
(rev 0)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionFA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.jbws3552;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class ExtendedAdaptedExceptionFA extends AdaptedExceptionFA {
+ public ExtendedAdaptedExceptionFA() {
+ super();
+ }
+
+ public ExtendedAdaptedExceptionFA(String message, String description, int code,
ComplexObjectFA complexObject) {
+ super(message, description, code, complexObject);
+ }
+}
\ No newline at end of file
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionGA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionGA.java
(rev 0)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionGA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.jbws3552;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class ExtendedAdaptedExceptionGA extends AdaptedExceptionGA {
+
+ public ExtendedAdaptedExceptionGA() {
+ }
+
+ public ExtendedAdaptedExceptionGA(String message, String description, int code,
ComplexObjectGA complexObject) {
+ super(message, description, code, complexObject);
+ }
+}
\ No newline at end of file
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionMA.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionMA.java
(rev 0)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionMA.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.jbws3552;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+(a)XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
+public class ExtendedAdaptedExceptionMA extends AdaptedExceptionMA {
+
+ public ExtendedAdaptedExceptionMA() {
+ }
+
+ public ExtendedAdaptedExceptionMA(String message, String description, int code,
ComplexObjectMA complexObject) {
+ super(message, description, code, complexObject);
+ }
+}
\ No newline at end of file
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java 2012-10-19
07:37:43 UTC (rev 16922)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java 2012-10-19
08:06:39 UTC (rev 16923)
@@ -61,24 +61,48 @@
assertEquals("object message,object description,444,a b",
endpoint.echoCA(aoCA).toString());
}
+ public void testEchoAbstractCA() throws Exception {
+ EndpointIface endpoint = getProxy();
+ AdaptedObjectCA aoCA = new AdaptedObjectCA("object message",
"object description", 444, new ComplexObjectCA("a", "b"));
+ assertEquals("object message,object description,444,a b",
endpoint.echoAbstractCA(aoCA).toString());
+ }
+
public void testEchoFA() throws Exception {
EndpointIface endpoint = getProxy();
AdaptedObjectFA aoFA = new AdaptedObjectFA("object message",
"object description", 444, new ComplexObjectFA("a", "b"));
assertEquals("object message,object description,444,a b",
endpoint.echoFA(aoFA).toString());
}
+ public void testEchoAbstractFA() throws Exception {
+ EndpointIface endpoint = getProxy();
+ AdaptedObjectFA aoFA = new AdaptedObjectFA("object message",
"object description", 444, new ComplexObjectFA("a", "b"));
+ assertEquals("object message,object description,444,a b",
endpoint.echoAbstractFA(aoFA).toString());
+ }
+
public void testEchoGA() throws Exception {
EndpointIface endpoint = getProxy();
AdaptedObjectGA aoGA = new AdaptedObjectGA("object message",
"object description", 444, new ComplexObjectGA("a", "b"));
assertEquals("object message,object description,444,a b",
endpoint.echoGA(aoGA).toString());
}
+ public void testEchoAbstractGA() throws Exception {
+ EndpointIface endpoint = getProxy();
+ AdaptedObjectGA aoGA = new AdaptedObjectGA("object message",
"object description", 444, new ComplexObjectGA("a", "b"));
+ assertEquals("object message,object description,444,a b",
endpoint.echoAbstractGA(aoGA).toString());
+ }
+
public void testEchoMA() throws Exception {
EndpointIface endpoint = getProxy();
AdaptedObjectMA aoMA = new AdaptedObjectMA("object message",
"object description", 444, new ComplexObjectMA("a", "b"));
assertEquals("object message,object description,444,a b",
endpoint.echoMA(aoMA).toString());
}
+ public void testEchoAbstractMA() throws Exception {
+ EndpointIface endpoint = getProxy();
+ AdaptedObjectMA aoMA = new AdaptedObjectMA("object message",
"object description", 444, new ComplexObjectMA("a", "b"));
+ assertEquals("object message,object description,444,a b",
endpoint.echoAbstractMA(aoMA).toString());
+ }
+
public void testExceptionCA() throws Exception {
EndpointIface endpoint = getProxy();
try {
@@ -89,6 +113,16 @@
}
}
+ public void testExtendedExceptionCA() throws Exception {
+ EndpointIface endpoint = getProxy();
+ try {
+ endpoint.throwExtendedExceptionCA();
+ fail("Expected exception not thrown");
+ } catch (ExtendedAdaptedExceptionCA e) {
+ assertEquals("exception message,exception description,666,c d",
e.toString());
+ }
+ }
+
public void testExceptionFA() throws Exception {
EndpointIface endpoint = getProxy();
try {
@@ -99,6 +133,16 @@
}
}
+ public void testExtendedExceptionFA() throws Exception {
+ EndpointIface endpoint = getProxy();
+ try {
+ endpoint.throwExtendedExceptionFA();
+ fail("Expected exception not thrown");
+ } catch (ExtendedAdaptedExceptionFA e) {
+ assertEquals("exception message,exception description,666,c d",
e.toString());
+ }
+ }
+
public void testExceptionGA() throws Exception {
EndpointIface endpoint = getProxy();
try {
@@ -109,6 +153,16 @@
}
}
+ public void testExtendedExceptionGA() throws Exception {
+ EndpointIface endpoint = getProxy();
+ try {
+ endpoint.throwExtendedExceptionGA();
+ fail("Expected exception not thrown");
+ } catch (ExtendedAdaptedExceptionGA e) {
+ assertEquals("exception message,exception description,666,c d",
e.toString());
+ }
+ }
+
public void testExceptionMA() throws Exception {
EndpointIface endpoint = getProxy();
try {
@@ -118,4 +172,14 @@
assertEquals("exception message,exception description,666,c d",
e.toString());
}
}
+
+ public void testExtendedExceptionMA() throws Exception {
+ EndpointIface endpoint = getProxy();
+ try {
+ endpoint.throwExtendedExceptionMA();
+ fail("Expected exception not thrown");
+ } catch (ExtendedAdaptedExceptionMA e) {
+ assertEquals("exception message,exception description,666,c d",
e.toString());
+ }
+ }
}