JBossWS SVN: r17047 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-30 04:49:26 -0500 (Fri, 30 Nov 2012)
New Revision: 17047
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/EndpointImpl.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
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java
Log:
[JBWS-3552] more meaning full exception test cases
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-11-30 09:37:23 UTC (rev 17046)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionCA.java 2012-11-30 09:49:26 UTC (rev 17047)
@@ -28,17 +28,15 @@
public class AdaptedExceptionCA extends Exception {
private String message;
private String description;
- private int code;
private ComplexObjectCA complexObject;
public AdaptedExceptionCA() {
super();
}
- public AdaptedExceptionCA(String message, String description, int code, ComplexObjectCA complexObject) {
+ public AdaptedExceptionCA(String message, String description, ComplexObjectCA complexObject) {
this.message = message;
this.description = description;
- this.code = code;
this.complexObject = complexObject;
}
@@ -50,15 +48,11 @@
return description;
}
- public int getCode() {
- return code;
- }
-
public ComplexObjectCA getComplexObject() {
return complexObject;
}
public String toString() {
- return message + "," + description + "," + code + "," + complexObject;
+ return message + "," + description + "," + complexObject;
}
}
\ No newline at end of file
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-11-30 09:37:23 UTC (rev 17046)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionFA.java 2012-11-30 09:49:26 UTC (rev 17047)
@@ -28,7 +28,6 @@
public class AdaptedExceptionFA extends Exception {
private String message;
private String description;
- private int code;
@XmlJavaTypeAdapter(value = ComplexObjectFAAdapter.class)
private ComplexObjectFA complexObject;
@@ -36,10 +35,9 @@
super();
}
- public AdaptedExceptionFA(String message, String description, int code, ComplexObjectFA complexObject) {
+ public AdaptedExceptionFA(String message, String description, ComplexObjectFA complexObject) {
this.message = message;
this.description = description;
- this.code = code;
this.complexObject = complexObject;
}
@@ -51,15 +49,11 @@
return description;
}
- public int getCode() {
- return code;
- }
-
public ComplexObjectFA getComplexObject() {
return complexObject;
}
public String toString() {
- return message + "," + description + "," + code + "," + complexObject;
+ return message + "," + description + "," + complexObject;
}
}
\ No newline at end of file
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-11-30 09:37:23 UTC (rev 17046)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionGA.java 2012-11-30 09:49:26 UTC (rev 17047)
@@ -28,17 +28,15 @@
public class AdaptedExceptionGA extends Exception {
private String message;
private String description;
- private int code;
private ComplexObjectGA complexObject;
public AdaptedExceptionGA() {
super();
}
- public AdaptedExceptionGA(String message, String description, int code, ComplexObjectGA complexObject) {
+ public AdaptedExceptionGA(String message, String description, ComplexObjectGA complexObject) {
this.message = message;
this.description = description;
- this.code = code;
this.complexObject = complexObject;
}
@@ -50,15 +48,11 @@
return description;
}
- public int getCode() {
- return code;
- }
-
public ComplexObjectGA getComplexObject() {
return complexObject;
}
public String toString() {
- return message + "," + description + "," + code + "," + complexObject;
+ return message + "," + description + "," + complexObject;
}
}
\ No newline at end of file
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-11-30 09:37:23 UTC (rev 17046)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionMA.java 2012-11-30 09:49:26 UTC (rev 17047)
@@ -28,17 +28,15 @@
public class AdaptedExceptionMA extends Exception {
private String message;
private String description;
- private int code;
private ComplexObjectMA complexObject;
public AdaptedExceptionMA() {
super();
}
- public AdaptedExceptionMA(String message, String description, int code, ComplexObjectMA complexObject) {
+ public AdaptedExceptionMA(String message, String description, ComplexObjectMA complexObject) {
this.message = message;
this.description = description;
- this.code = code;
this.complexObject = complexObject;
}
@@ -58,14 +56,6 @@
return description;
}
- public void setCode(int code) {
- this.code = code;
- }
-
- public int getCode() {
- return code;
- }
-
public void setComplexObject(ComplexObjectMA complexObject) {
this.complexObject = complexObject;
}
@@ -76,6 +66,6 @@
}
public String toString() {
- return message + "," + description + "," + code + "," + complexObject;
+ return message + "," + description + "," + complexObject;
}
}
\ No newline at end of file
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-11-30 09:37:23 UTC (rev 17046)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointImpl.java 2012-11-30 09:49:26 UTC (rev 17047)
@@ -58,34 +58,34 @@
}
public void throwExceptionCA() throws AdaptedExceptionCA {
- throw new ExtendedAdaptedExceptionCA("exception message", "exception description", 666, new ComplexObjectCA("c", "d"));
+ throw new ExtendedAdaptedExceptionCA(666, "exception message", "exception description", new ComplexObjectCA("c", "d"));
}
public void throwExtendedExceptionCA() throws ExtendedAdaptedExceptionCA {
- throw new ExtendedAdaptedExceptionCA("exception message", "exception description", 666, new ComplexObjectCA("c", "d"));
+ throw new ExtendedAdaptedExceptionCA(666, "exception message", "exception description", new ComplexObjectCA("c", "d"));
}
public void throwExceptionFA() throws AdaptedExceptionFA {
- throw new ExtendedAdaptedExceptionFA("exception message", "exception description", 666, new ComplexObjectFA("c", "d"));
+ throw new ExtendedAdaptedExceptionFA(666, "exception message", "exception description", new ComplexObjectFA("c", "d"));
}
public void throwExtendedExceptionFA() throws ExtendedAdaptedExceptionFA {
- throw new ExtendedAdaptedExceptionFA("exception message", "exception description", 666, new ComplexObjectFA("c", "d"));
+ throw new ExtendedAdaptedExceptionFA(666, "exception message", "exception description", new ComplexObjectFA("c", "d"));
}
public void throwExceptionGA() throws AdaptedExceptionGA {
- throw new ExtendedAdaptedExceptionGA("exception message", "exception description", 666, new ComplexObjectGA("c", "d"));
+ throw new ExtendedAdaptedExceptionGA(666, "exception message", "exception description", new ComplexObjectGA("c", "d"));
}
public void throwExtendedExceptionGA() throws ExtendedAdaptedExceptionGA {
- throw new ExtendedAdaptedExceptionGA("exception message", "exception description", 666, new ComplexObjectGA("c", "d"));
+ throw new ExtendedAdaptedExceptionGA(666, "exception message", "exception description", new ComplexObjectGA("c", "d"));
}
public void throwExceptionMA() throws AdaptedExceptionMA {
- throw new ExtendedAdaptedExceptionMA("exception message", "exception description", 666, new ComplexObjectMA("c", "d"));
+ throw new ExtendedAdaptedExceptionMA(666, "exception message", "exception description", new ComplexObjectMA("c", "d"));
}
public void throwExtendedExceptionMA() throws ExtendedAdaptedExceptionMA {
- throw new ExtendedAdaptedExceptionMA("exception message", "exception description", 666, new ComplexObjectMA("c", "d"));
+ throw new ExtendedAdaptedExceptionMA(666, "exception message", "exception description", new ComplexObjectMA("c", "d"));
}
}
Modified: 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 2012-11-30 09:37:23 UTC (rev 17046)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionCA.java 2012-11-30 09:49:26 UTC (rev 17047)
@@ -27,11 +27,21 @@
@XmlAccessorType(XmlAccessType.FIELD)
public class ExtendedAdaptedExceptionCA extends AdaptedExceptionCA {
+ private int code;
public ExtendedAdaptedExceptionCA() {
}
- public ExtendedAdaptedExceptionCA(String message, String description, int code, ComplexObjectCA complexObject) {
- super(message, description, code, complexObject);
+ public ExtendedAdaptedExceptionCA(int code, String message, String description, ComplexObjectCA complexObject) {
+ super(message, description, complexObject);
+ this.code = code;
}
+
+ public int getCode() {
+ return code;
+ }
+
+ public String toString() {
+ return code + "," + super.toString();
+ }
}
\ No newline at end of file
Modified: 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 2012-11-30 09:37:23 UTC (rev 17046)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionFA.java 2012-11-30 09:49:26 UTC (rev 17047)
@@ -26,11 +26,22 @@
@XmlAccessorType(XmlAccessType.FIELD)
public class ExtendedAdaptedExceptionFA extends AdaptedExceptionFA {
+ private int code;
+
public ExtendedAdaptedExceptionFA() {
super();
}
- public ExtendedAdaptedExceptionFA(String message, String description, int code, ComplexObjectFA complexObject) {
- super(message, description, code, complexObject);
+ public ExtendedAdaptedExceptionFA(int code, String message, String description, ComplexObjectFA complexObject) {
+ super(message, description, complexObject);
+ this.code = code;
}
+
+ public int getCode() {
+ return code;
+ }
+
+ public String toString() {
+ return code + "," + super.toString();
+ }
}
\ No newline at end of file
Modified: 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 2012-11-30 09:37:23 UTC (rev 17046)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionGA.java 2012-11-30 09:49:26 UTC (rev 17047)
@@ -27,11 +27,21 @@
@XmlAccessorType(XmlAccessType.FIELD)
public class ExtendedAdaptedExceptionGA extends AdaptedExceptionGA {
+ private int code;
public ExtendedAdaptedExceptionGA() {
}
- public ExtendedAdaptedExceptionGA(String message, String description, int code, ComplexObjectGA complexObject) {
- super(message, description, code, complexObject);
+ public ExtendedAdaptedExceptionGA(int code, String message, String description, ComplexObjectGA complexObject) {
+ super(message, description, complexObject);
+ this.code = code;
}
+
+ public int getCode() {
+ return code;
+ }
+
+ public String toString() {
+ return code + "," + super.toString();
+ }
}
\ No newline at end of file
Modified: 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 2012-11-30 09:37:23 UTC (rev 17046)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ExtendedAdaptedExceptionMA.java 2012-11-30 09:49:26 UTC (rev 17047)
@@ -27,11 +27,25 @@
@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
public class ExtendedAdaptedExceptionMA extends AdaptedExceptionMA {
+ private int code;
public ExtendedAdaptedExceptionMA() {
}
- public ExtendedAdaptedExceptionMA(String message, String description, int code, ComplexObjectMA complexObject) {
- super(message, description, code, complexObject);
+ public ExtendedAdaptedExceptionMA(int code, String message, String description, ComplexObjectMA complexObject) {
+ super(message, description, complexObject);
+ this.code = code;
}
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public String toString() {
+ return code + "," + super.toString();
+ }
}
\ 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-11-30 09:37:23 UTC (rev 17046)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java 2012-11-30 09:49:26 UTC (rev 17047)
@@ -113,7 +113,7 @@
endpoint.throwExceptionCA();
fail("Expected exception not thrown");
} catch (AdaptedExceptionCA e) {
- assertEquals("exception message,exception description,666,c d", e.toString());
+ assertEquals("666,exception message,exception description,c d", e.toString());
}
}
@@ -123,7 +123,7 @@
endpoint.throwExtendedExceptionCA();
fail("Expected exception not thrown");
} catch (ExtendedAdaptedExceptionCA e) {
- assertEquals("exception message,exception description,666,c d", e.toString());
+ assertEquals("666,exception message,exception description,c d", e.toString());
}
}
@@ -137,7 +137,7 @@
endpoint.throwExceptionFA();
fail("Expected exception not thrown");
} catch (AdaptedExceptionFA e) {
- assertEquals("exception message,exception description,666,c d", e.toString());
+ assertEquals("666,exception message,exception description,c d", e.toString());
}
}
@@ -147,7 +147,7 @@
endpoint.throwExtendedExceptionFA();
fail("Expected exception not thrown");
} catch (ExtendedAdaptedExceptionFA e) {
- assertEquals("exception message,exception description,666,c d", e.toString());
+ assertEquals("666,exception message,exception description,c d", e.toString());
}
}
@@ -161,7 +161,7 @@
endpoint.throwExceptionGA();
fail("Expected exception not thrown");
} catch (AdaptedExceptionGA e) {
- assertEquals("exception message,exception description,666,c d", e.toString());
+ assertEquals("666,exception message,exception description,c d", e.toString());
}
}
@@ -171,7 +171,7 @@
endpoint.throwExtendedExceptionGA();
fail("Expected exception not thrown");
} catch (ExtendedAdaptedExceptionGA e) {
- assertEquals("exception message,exception description,666,c d", e.toString());
+ assertEquals("666,exception message,exception description,c d", e.toString());
}
}
@@ -185,7 +185,7 @@
endpoint.throwExceptionMA();
fail("Expected exception not thrown");
} catch (AdaptedExceptionMA e) {
- assertEquals("exception message,exception description,666,c d", e.toString());
+ assertEquals("666,exception message,exception description,c d", e.toString());
}
}
@@ -195,7 +195,7 @@
endpoint.throwExtendedExceptionMA();
fail("Expected exception not thrown");
} catch (ExtendedAdaptedExceptionMA e) {
- assertEquals("exception message,exception description,666,c d", e.toString());
+ assertEquals("666,exception message,exception description,c d", e.toString());
}
}
}
11 years, 5 months
JBossWS SVN: r17046 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-30 04:37:23 -0500 (Fri, 30 Nov 2012)
New Revision: 17046
Modified:
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/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/JBWS3552TestCase.java
Log:
[JBWS-3552] more meaning full method params test cases
Modified: 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 2012-11-29 12:20:24 UTC (rev 17045)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectCA.java 2012-11-30 09:37:23 UTC (rev 17046)
@@ -28,17 +28,15 @@
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) {
+ public AbstractObjectCA(String message, String description, ComplexObjectCA complexObject) {
this.message = message;
this.description = description;
- this.code = code;
this.complexObject = complexObject;
}
@@ -50,15 +48,11 @@
return description;
}
- public int getCode() {
- return code;
- }
-
public ComplexObjectCA getComplexObject() {
return complexObject;
}
public String toString() {
- return message + "," + description + "," + code + "," + complexObject;
+ return message + "," + description + "," + complexObject;
}
}
\ No newline at end of file
Modified: 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 2012-11-29 12:20:24 UTC (rev 17045)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectFA.java 2012-11-30 09:37:23 UTC (rev 17046)
@@ -28,7 +28,6 @@
public class AbstractObjectFA {
private String message;
private String description;
- private int code;
@XmlJavaTypeAdapter(value = ComplexObjectFAAdapter.class)
private ComplexObjectFA complexObject;
@@ -36,10 +35,9 @@
super();
}
- public AbstractObjectFA(String message, String description, int code, ComplexObjectFA complexObject) {
+ public AbstractObjectFA(String message, String description, ComplexObjectFA complexObject) {
this.message = message;
this.description = description;
- this.code = code;
this.complexObject = complexObject;
}
@@ -51,15 +49,11 @@
return description;
}
- public int getCode() {
- return code;
- }
-
public ComplexObjectFA getComplexObject() {
return complexObject;
}
public String toString() {
- return message + "," + description + "," + code + "," + complexObject;
+ return message + "," + description + "," + complexObject;
}
}
\ No newline at end of file
Modified: 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 2012-11-29 12:20:24 UTC (rev 17045)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectGA.java 2012-11-30 09:37:23 UTC (rev 17046)
@@ -28,17 +28,15 @@
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) {
+ public AbstractObjectGA(String message, String description, ComplexObjectGA complexObject) {
this.message = message;
this.description = description;
- this.code = code;
this.complexObject = complexObject;
}
@@ -50,15 +48,11 @@
return description;
}
- public int getCode() {
- return code;
- }
-
public ComplexObjectGA getComplexObject() {
return complexObject;
}
public String toString() {
- return message + "," + description + "," + code + "," + complexObject;
+ return message + "," + description + "," + complexObject;
}
}
\ No newline at end of file
Modified: 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 2012-11-29 12:20:24 UTC (rev 17045)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AbstractObjectMA.java 2012-11-30 09:37:23 UTC (rev 17046)
@@ -28,17 +28,15 @@
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) {
+ public AbstractObjectMA(String message, String description, ComplexObjectMA complexObject) {
this.message = message;
this.description = description;
- this.code = code;
this.complexObject = complexObject;
}
@@ -58,14 +56,6 @@
return description;
}
- public void setCode(int code) {
- this.code = code;
- }
-
- public int getCode() {
- return code;
- }
-
public void setComplexObject(ComplexObjectMA complexObject) {
this.complexObject = complexObject;
}
@@ -76,6 +66,6 @@
}
public String toString() {
- return message + "," + description + "," + code + "," + complexObject;
+ return message + "," + description + "," + complexObject;
}
}
\ No newline at end of file
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-11-29 12:20:24 UTC (rev 17045)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectCA.java 2012-11-30 09:37:23 UTC (rev 17046)
@@ -26,12 +26,22 @@
@XmlAccessorType(XmlAccessType.FIELD)
public class AdaptedObjectCA extends AbstractObjectCA {
+ private int code;
public AdaptedObjectCA() {
super();
}
- public AdaptedObjectCA(String message, String description, int code, ComplexObjectCA complexObject) {
- super(message, description, code, complexObject);
+ public AdaptedObjectCA(int code, String message, String description, ComplexObjectCA complexObject) {
+ super(message, description, complexObject);
+ this.code = code;
}
+
+ public int getCode() {
+ return code;
+ }
+
+ public String toString() {
+ return code + "," + super.toString();
+ }
}
\ 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-11-29 12:20:24 UTC (rev 17045)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectFA.java 2012-11-30 09:37:23 UTC (rev 17046)
@@ -26,12 +26,22 @@
@XmlAccessorType(XmlAccessType.FIELD)
public class AdaptedObjectFA extends AbstractObjectFA {
+ private int code;
public AdaptedObjectFA() {
super();
}
- public AdaptedObjectFA(String message, String description, int code, ComplexObjectFA complexObject) {
- super(message, description, code, complexObject);
+ public AdaptedObjectFA(int code, String message, String description, ComplexObjectFA complexObject) {
+ super(message, description, complexObject);
+ this.code = code;
}
+
+ public int getCode() {
+ return code;
+ }
+
+ public String toString() {
+ return code + "," + super.toString();
+ }
}
\ 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-11-29 12:20:24 UTC (rev 17045)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectGA.java 2012-11-30 09:37:23 UTC (rev 17046)
@@ -26,12 +26,22 @@
@XmlAccessorType(XmlAccessType.FIELD)
public class AdaptedObjectGA extends AbstractObjectGA {
+ private int code;
public AdaptedObjectGA() {
super();
}
- public AdaptedObjectGA(String message, String description, int code, ComplexObjectGA complexObject) {
- super(message, description, code, complexObject);
+ public AdaptedObjectGA(int code, String message, String description, ComplexObjectGA complexObject) {
+ super(message, description, complexObject);
+ this.code = code;
}
+
+ public int getCode() {
+ return code;
+ }
+
+ public String toString() {
+ return code + "," + super.toString();
+ }
}
\ 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-11-29 12:20:24 UTC (rev 17045)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectMA.java 2012-11-30 09:37:23 UTC (rev 17046)
@@ -26,12 +26,26 @@
@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
public class AdaptedObjectMA extends AbstractObjectMA {
+ private int code;
public AdaptedObjectMA() {
super();
}
- public AdaptedObjectMA(String message, String description, int code, ComplexObjectMA complexObject) {
- super(message, description, code, complexObject);
+ public AdaptedObjectMA(int code, String message, String description, ComplexObjectMA complexObject) {
+ super(message, description, complexObject);
+ this.code = code;
}
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public String toString() {
+ return code + "," + super.toString();
+ }
}
\ 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-11-29 12:20:24 UTC (rev 17045)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java 2012-11-30 09:37:23 UTC (rev 17046)
@@ -57,50 +57,50 @@
public void testEchoCA() 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.echoCA(aoCA).toString());
+ AdaptedObjectCA aoCA = new AdaptedObjectCA(444, "object message", "object description", new ComplexObjectCA("a", "b"));
+ assertEquals("444,object message,object description,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());
+ AbstractObjectCA aoCA = new AdaptedObjectCA(444, "object message", "object description", new ComplexObjectCA("a", "b"));
+ assertEquals("444,object message,object description,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());
+ AdaptedObjectFA aoFA = new AdaptedObjectFA(444, "object message", "object description", new ComplexObjectFA("a", "b"));
+ assertEquals("444,object message,object description,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());
+ AbstractObjectFA aoFA = new AdaptedObjectFA(444, "object message", "object description", new ComplexObjectFA("a", "b"));
+ assertEquals("444,object message,object description,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());
+ AdaptedObjectGA aoGA = new AdaptedObjectGA(444, "object message", "object description", new ComplexObjectGA("a", "b"));
+ assertEquals("444,object message,object description,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());
+ AbstractObjectGA aoGA = new AdaptedObjectGA(444, "object message", "object description", new ComplexObjectGA("a", "b"));
+ assertEquals("444,object message,object description,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());
+ AdaptedObjectMA aoMA = new AdaptedObjectMA(444, "object message", "object description", new ComplexObjectMA("a", "b"));
+ assertEquals("444,object message,object description,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());
+ AbstractObjectMA aoMA = new AdaptedObjectMA(444, "object message", "object description", new ComplexObjectMA("a", "b"));
+ assertEquals("444,object message,object description,a b", endpoint.echoAbstractMA(aoMA).toString());
}
public void testExceptionCA() throws Exception {
11 years, 5 months
JBossWS SVN: r17045 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-29 07:20:24 -0500 (Thu, 29 Nov 2012)
New Revision: 17045
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/EndpointImpl.java
Log:
[JBWS-3552] fixing endpoint impl methods throws clause
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-11-28 10:08:04 UTC (rev 17044)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointIface.java 2012-11-29 12:20:24 UTC (rev 17045)
@@ -46,7 +46,7 @@
void throwExtendedExceptionCA() throws ExtendedAdaptedExceptionCA;
void throwExceptionFA() throws AdaptedExceptionFA;
-
+
void throwExtendedExceptionFA() throws ExtendedAdaptedExceptionFA;
void throwExceptionGA() throws AdaptedExceptionGA;
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-11-28 10:08:04 UTC (rev 17044)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointImpl.java 2012-11-29 12:20:24 UTC (rev 17045)
@@ -61,7 +61,7 @@
throw new ExtendedAdaptedExceptionCA("exception message", "exception description", 666, new ComplexObjectCA("c", "d"));
}
- public void throwExtendedExceptionCA() throws AdaptedExceptionCA {
+ public void throwExtendedExceptionCA() throws ExtendedAdaptedExceptionCA {
throw new ExtendedAdaptedExceptionCA("exception message", "exception description", 666, new ComplexObjectCA("c", "d"));
}
@@ -77,7 +77,7 @@
throw new ExtendedAdaptedExceptionGA("exception message", "exception description", 666, new ComplexObjectGA("c", "d"));
}
- public void throwExtendedExceptionGA() throws AdaptedExceptionGA {
+ public void throwExtendedExceptionGA() throws ExtendedAdaptedExceptionGA {
throw new ExtendedAdaptedExceptionGA("exception message", "exception description", 666, new ComplexObjectGA("c", "d"));
}
@@ -85,7 +85,7 @@
throw new ExtendedAdaptedExceptionMA("exception message", "exception description", 666, new ComplexObjectMA("c", "d"));
}
- public void throwExtendedExceptionMA() throws AdaptedExceptionMA {
+ public void throwExtendedExceptionMA() throws ExtendedAdaptedExceptionMA {
throw new ExtendedAdaptedExceptionMA("exception message", "exception description", 666, new ComplexObjectMA("c", "d"));
}
}
11 years, 5 months
JBossWS SVN: r17044 - in projects/plugins/maven/jaxws-tools/trunk: src/test/resources/test-embedded/testEndorse and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-11-28 05:08:04 -0500 (Wed, 28 Nov 2012)
New Revision: 17044
Modified:
projects/plugins/maven/jaxws-tools/trunk/pom.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml
Log:
Moving maven jaxws-tools plugin to latest jbossws-cxf 4.1.0.Final (didn't move to native 4.1.0.Final as jaxws impl has been dropped there)
Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2012-11-27 13:04:12 UTC (rev 17043)
+++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2012-11-28 10:08:04 UTC (rev 17044)
@@ -25,7 +25,7 @@
<!-- Properties -->
<properties>
- <jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version>
+ <jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version>
<getopt.version>1.0.13</getopt.version>
<log4j.version>1.2.14</log4j.version>
<maven.project.version>2.2.1</maven.project.version>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2012-11-27 13:04:12 UTC (rev 17043)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2012-11-28 10:08:04 UTC (rev 17044)
@@ -120,17 +120,17 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>4.0.0.GA</version>
+ <version>4.1.0.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-factories</artifactId>
- <version>4.0.0.GA</version>
+ <version>4.1.0.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.xml.ws</groupId>
<artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- <version>2.0.0.Final</version>
+ <version>2.0.1.Final</version>
</dependency>
</dependencies>
</project>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml 2012-11-27 13:04:12 UTC (rev 17043)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml 2012-11-28 10:08:04 UTC (rev 17044)
@@ -88,13 +88,13 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>4.0.0.GA</version>
+ <version>4.1.0.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.xml.ws</groupId>
<artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- <version>2.0.0.Final</version>
+ <version>2.0.1.Final</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2012-11-27 13:04:12 UTC (rev 17043)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2012-11-28 10:08:04 UTC (rev 17044)
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>4.0.0.GA</version>
+ <version>4.1.0.Final</version>
</dependency>
</dependencies>
</project>
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2012-11-27 13:04:12 UTC (rev 17043)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2012-11-28 10:08:04 UTC (rev 17044)
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>4.0.0.GA</version>
+ <version>4.1.0.Final</version>
</dependency>
</dependencies>
</project>
11 years, 5 months
JBossWS SVN: r17043 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-27 08:04:12 -0500 (Tue, 27 Nov 2012)
New Revision: 17043
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
enabling tests again
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-11-27 09:49:36 UTC (rev 17042)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-11-27 13:04:12 UTC (rev 17043)
@@ -656,10 +656,6 @@
<!--# [JBWS-3441] Support CDI interceptors for POJO JAX-WS services -->
<exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude>
-
- <!--# [CXF-4653] CXF continuations portability issue -->
- <exclude>org/jboss/test/ws/jaxws/cxf/continuations/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/asynch/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -718,10 +714,6 @@
<!--# [JBWS-3441] Support CDI interceptors for POJO JAX-WS services -->
<exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude>
-
- <!--# [CXF-4653] CXF continuations portability issue -->
- <exclude>org/jboss/test/ws/jaxws/cxf/continuations/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/asynch/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -780,10 +772,6 @@
<!--# [JBWS-3441] Support CDI interceptors for POJO JAX-WS services -->
<exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude>
-
- <!--# [CXF-4653] CXF continuations portability issue -->
- <exclude>org/jboss/test/ws/jaxws/cxf/continuations/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/asynch/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -837,10 +825,6 @@
<!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed -->
<exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude>
-
- <!--# [CXF-4653] CXF continuations portability issue -->
- <exclude>org/jboss/test/ws/jaxws/cxf/continuations/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/asynch/**</exclude>
</excludes>
</configuration>
</plugin>
11 years, 5 months
JBossWS SVN: r17042 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-27 04:49:36 -0500 (Tue, 27 Nov 2012)
New Revision: 17042
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java
Log:
fixing test case
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java 2012-11-27 09:31:16 UTC (rev 17041)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java 2012-11-27 09:49:36 UTC (rev 17042)
@@ -22,22 +22,19 @@
package org.jboss.test.ws.saaj.jbws3084;
import java.net.URL;
-import java.util.Arrays;
import java.util.Iterator;
import javax.xml.namespace.QName;
-import javax.xml.soap.AttachmentPart;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPConnection;
import javax.xml.soap.SOAPConnectionFactory;
import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPFactory;
import javax.xml.soap.SOAPMessage;
import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSCXFTestSetup;
/**
* [JBWS-3084] Enable control of chunked encoding when using SOAPConnection.
@@ -58,7 +55,10 @@
SOAPConnection con = conFac.createConnection();
URL endpoint = new URL(serviceURL);
- SOAPMessage response = con.get(endpoint);
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPMessage msg = msgFactory.createMessage();
+ msg.getSOAPBody().addBodyElement(new QName("http://www.jboss.org/jbossws/saaj", "greetMe"));
+ SOAPMessage response = con.call(msg, endpoint);
QName greetMeResp = new QName("http://www.jboss.org/jbossws/saaj", "greetMeResponse");
Iterator<?> sayHiRespIterator = response.getSOAPBody().getChildElements(greetMeResp);
11 years, 5 months
JBossWS SVN: r17041 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-27 04:31:16 -0500 (Tue, 27 Nov 2012)
New Revision: 17041
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[CXF-4653] excluding test for a while until fix is available in upstream
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-11-26 13:40:18 UTC (rev 17040)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-11-27 09:31:16 UTC (rev 17041)
@@ -656,6 +656,10 @@
<!--# [JBWS-3441] Support CDI interceptors for POJO JAX-WS services -->
<exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude>
+
+ <!--# [CXF-4653] CXF continuations portability issue -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/continuations/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/asynch/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -714,6 +718,10 @@
<!--# [JBWS-3441] Support CDI interceptors for POJO JAX-WS services -->
<exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude>
+
+ <!--# [CXF-4653] CXF continuations portability issue -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/continuations/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/asynch/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -772,6 +780,10 @@
<!--# [JBWS-3441] Support CDI interceptors for POJO JAX-WS services -->
<exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude>
+
+ <!--# [CXF-4653] CXF continuations portability issue -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/continuations/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/asynch/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -825,6 +837,10 @@
<!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed -->
<exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude>
+
+ <!--# [CXF-4653] CXF continuations portability issue -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/continuations/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/asynch/**</exclude>
</excludes>
</configuration>
</plugin>
11 years, 5 months
JBossWS SVN: r17040 - in thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-10449/rt/ws/addr/src: test/java/org/apache/cxf/ws/addressing/soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2012-11-26 08:40:18 -0500 (Mon, 26 Nov 2012)
New Revision: 17040
Modified:
thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-10449/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-10449/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
Log:
[JBPAPP-10449] Responder supports the inbound soap message with wsa MessageID and RelatesTo headers
Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-10449/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-10449/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java 2012-11-26 10:20:47 UTC (rev 17039)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-10449/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java 2012-11-26 13:40:18 UTC (rev 17040)
@@ -789,7 +789,7 @@
synchronized (correlatedExchange) {
message.setExchange(correlatedExchange);
}
- } else {
+ } else if (ContextUtils.isRequestor(message) && !message.getExchange().isOneWay()) {
if (ContextUtils.retrieveDeferUncorrelatedMessageAbort(message)) {
LOG.fine("deferring uncorrelated message abort");
ContextUtils.storeDeferredUncorrelatedMessageAbort(message);
Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-10449/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-10449/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java 2012-11-26 10:20:47 UTC (rev 17039)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-10449/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java 2012-11-26 13:40:18 UTC (rev 17040)
@@ -190,6 +190,19 @@
}
@Test
+ public void testResponderInboundWithRelatesTo() throws Exception {
+ SoapMessage message = setUpMessage(false, false, false, false, Boolean.TRUE,
+ Names.WSA_NAMESPACE_NAME);
+ //empty the uncorrelatedExchanges in responder
+ for (String key : codec.uncorrelatedExchanges.keySet()) {
+ codec.uncorrelatedExchanges.remove(key);
+ }
+ codec.handleMessage(message);
+ control.verify();
+ verifyMessage(message, false, false, false);
+ }
+
+ @Test
public void testResponderInboundNonNative() throws Exception {
String uri = VersionTransformer.Names200408.WSA_NAMESPACE_NAME;
SoapMessage message = setUpMessage(false, false, false, false, uri);
@@ -281,9 +294,16 @@
private SoapMessage setUpMessage(boolean requestor, boolean outbound, boolean invalidMAP,
boolean preExistingSOAPAction, String exposeAs) throws Exception {
+ return setUpMessage(requestor, outbound, invalidMAP, preExistingSOAPAction, null, exposeAs);
+ }
+
+ private SoapMessage setUpMessage(boolean requestor, boolean outbound, boolean invalidMAP,
+ boolean preExistingSOAPAction, Boolean generateRelatesTo,
+ String exposeAs) throws Exception {
SoapMessage message = new SoapMessage(new MessageImpl());
setUpOutbound(message, outbound);
- expectRelatesTo = (requestor && !outbound) || (!requestor && outbound);
+ expectRelatesTo = generateRelatesTo != null ? generateRelatesTo
+ : (requestor && !outbound) || (!requestor && outbound);
message.put(REQUESTOR_ROLE, Boolean.valueOf(requestor));
String mapProperty = getMAPProperty(requestor, outbound);
AddressingPropertiesImpl maps = getMAPs(requestor, outbound, exposeAs);
11 years, 5 months
JBossWS SVN: r17039 - thirdparty/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2012-11-26 05:20:47 -0500 (Mon, 26 Nov 2012)
New Revision: 17039
Added:
thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-10449/
Log:
[JBPAPP-10449] - Make one off patch branch
11 years, 5 months
JBossWS SVN: r17038 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-11-26 05:01:23 -0500 (Mon, 26 Nov 2012)
New Revision: 17038
Modified:
stack/cxf/trunk/pom.xml
Log:
[JBWS-3567] Moving to wss4j 1.6.8-SNAPSHOT
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-11-26 09:48:15 UTC (rev 17037)
+++ stack/cxf/trunk/pom.xml 2012-11-26 10:01:23 UTC (rev 17038)
@@ -104,7 +104,7 @@
<velocity.version>1.7</velocity.version>
<xerces.version>2.9.1</xerces.version>
<xmlsec.version>1.5.2</xmlsec.version>
- <wss4j.version>1.6.7</wss4j.version>
+ <wss4j.version>1.6.8-SNAPSHOT</wss4j.version>
<wstx.version>4.1.1</wstx.version>
<spring.version>3.0.7.RELEASE</spring.version>
</properties>
11 years, 5 months