July 2011 - jbossws-commits - Jboss List Archives

JBossWS SVN: r14754 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/jbws2074/handler and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-07-27 08:44:16 -0400 (Wed, 27 Jul 2011) New Revision: 14754 Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4/META-INF/ejb-jar.xml Log: [JBWS-3334] fixing injection method lookup algorithm Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java 2011-07-27 12:22:45 UTC (rev 14753) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java 2011-07-27 12:44:16 UTC (rev 14754) @@ -42,23 +42,23 @@ @WebServiceRef(value = EndpointService.class, mappedName="jbossws-client/service/TestService", wsdlLocation="META-INF/wsdl/TestService.wsdl") EndpointInterface endpoint1; - EndpointInterface endpoint2; + EndpointInterface _endpoint2; @WebServiceRef(value = EndpointService.class, mappedName="jbossws-client/service/TestService", wsdlLocation="META-INF/wsdl/TestService.wsdl") public void setEndpoint2(EndpointInterface endpoint2) { - this.endpoint2 = endpoint2; + this._endpoint2 = endpoint2; } // via XML EndpointInterface endpoint3; // via XML - EndpointInterface endpoint4; + EndpointInterface _endpoint4; public void setEndpoint4(EndpointInterface endpoint4) { - this.endpoint4 = endpoint4; + this._endpoint4 = endpoint4; } @@ -72,10 +72,10 @@ public String echo2(String string) throws Exception { - if(null==endpoint2) + if(null==_endpoint2) throw new IllegalArgumentException("Serviceref for property 'endpoint2' not injected"); - return endpoint2.echo(string); + return _endpoint2.echo(string); } public String echo3(String string) throws Exception @@ -88,10 +88,10 @@ public String echo4(String string) throws Exception { - if(null==endpoint4) + if(null==_endpoint4) throw new IllegalArgumentException("Serviceref for property 'endpoint4' not injected"); - return endpoint4.echo(string); + return _endpoint4.echo(string); } } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java 2011-07-27 12:22:45 UTC (rev 14753) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java 2011-07-27 12:44:16 UTC (rev 14754) @@ -52,12 +52,12 @@ // XML driven injection private Boolean boolean0; - private Boolean boolean1; + private Boolean _boolean1; // XML driven injection private void setBoolean1(Boolean b) { - this.boolean1 = b; + this._boolean1 = b; } /** @@ -67,12 +67,12 @@ // XML driven injection private Byte byte0; - private Byte byte1; + private Byte _byte1; // XML driven injection private void setByte1(Byte b) { - this.byte1 = b; + this._byte1 = b; } /** @@ -82,12 +82,12 @@ // XML driven injection private Character character0; - private Character character1; + private Character _character1; // XML driven injection private void setCharacter1(Character c) { - this.character1 = c; + this._character1 = c; } /** @@ -97,12 +97,12 @@ // XML driven injection private Short short0; - private Short short1; + private Short _short1; // XML driven injection private void setShort1(Short i) { - this.short1 = i; + this._short1 = i; } /** @@ -112,12 +112,12 @@ // XML driven injection private Integer integer0; - private Integer integer1; + private Integer _integer1; // XML driven injection private void setInteger1(Integer i) { - this.integer1 = i; + this._integer1 = i; } /** @@ -127,12 +127,12 @@ // XML driven injection private Long long0; - private Long long1; + private Long _long1; // XML driven injection private void setLong1(Long l) { - this.long1 = l; + this._long1 = l; } /** @@ -142,12 +142,12 @@ // XML driven injection private Float float0; - private Float float1; + private Float _float1; // XML driven injection private void setFloat1(Float f) { - this.float1 = f; + this._float1 = f; } /** @@ -157,12 +157,12 @@ // XML driven injection private Double double0; - private Double double1; + private Double _double1; // XML driven injection private void setDouble1(Double d) { - this.double1 = d; + this._double1 = d; } /** @@ -172,12 +172,12 @@ // XML driven injection private String string0; - private String string1; + private String _string1; // XML driven injection private void setString1(String s) { - this.string1 = s; + this._string1 = s; } /** @@ -196,7 +196,7 @@ log.error("Descriptor driven initialization for boolean0 failed"); correctInitialization = false; } - if (this.boolean1 == null || this.boolean1 != true) + if (this._boolean1 == null || this._boolean1 != true) { log.error("Descriptor driven initialization for boolean1 failed"); correctInitialization = false; @@ -208,7 +208,7 @@ log.error("Descriptor driven initialization for byte0 failed"); correctInitialization = false; } - if (this.byte1 == null || this.byte1 != (byte)1) + if (this._byte1 == null || this._byte1 != (byte)1) { log.error("Descriptor driven initialization for byte1 failed"); correctInitialization = false; @@ -220,7 +220,7 @@ log.error("Descriptor driven initialization for character0 failed"); correctInitialization = false; } - if (this.character1 == null || this.character1 != 'c') + if (this._character1 == null || this._character1 != 'c') { log.error("Descriptor driven initialization for character1 failed"); correctInitialization = false; @@ -232,7 +232,7 @@ log.error("Descriptor driven initialization for short0 failed"); correctInitialization = false; } - if (this.short1 == null || this.short1 != (short)5) + if (this._short1 == null || this._short1 != (short)5) { log.error("Descriptor driven initialization for short1 failed"); correctInitialization = false; @@ -244,7 +244,7 @@ log.error("Descriptor driven initialization for integer0 failed"); correctInitialization = false; } - if (this.integer1 == null || this.integer1 != 7) + if (this._integer1 == null || this._integer1 != 7) { log.error("Descriptor driven initialization for integer1 failed"); correctInitialization = false; @@ -256,7 +256,7 @@ log.error("Descriptor driven initialization for long0 failed"); correctInitialization = false; } - if (this.long1 == null || this.long1 != 11L) + if (this._long1 == null || this._long1 != 11L) { log.error("Descriptor driven initialization for long1 failed"); correctInitialization = false; @@ -268,7 +268,7 @@ log.error("Descriptor driven initialization for float0 failed"); correctInitialization = false; } - if (this.float1 == null || this.float1 != 13.0f) + if (this._float1 == null || this._float1 != 13.0f) { log.error("Descriptor driven initialization for float1 failed"); correctInitialization = false; @@ -280,7 +280,7 @@ log.error("Descriptor driven initialization for double0 failed"); correctInitialization = false; } - if (this.double1 == null || this.double1 != 17.0) + if (this._double1 == null || this._double1 != 17.0) { log.error("Descriptor driven initialization for double1 failed"); correctInitialization = false; @@ -292,7 +292,7 @@ log.error("Descriptor driven initialization for string0 failed"); correctInitialization = false; } - if ("s".equals(this.string1) == false) + if ("s".equals(this._string1) == false) { log.error("Descriptor driven initialization for string1 failed"); correctInitialization = false; Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java 2011-07-27 12:22:45 UTC (rev 14753) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.java 2011-07-27 12:44:16 UTC (rev 14754) @@ -53,12 +53,12 @@ @Resource(name = "boolean") private Boolean boolean0; - private Boolean boolean1; + private Boolean _boolean1; @Resource(name = "boolean") private void setBoolean1(Boolean b) { - this.boolean1 = b; + this._boolean1 = b; } /** @@ -68,12 +68,12 @@ @Resource(name = "byte") private Byte byte0; - private Byte byte1; + private Byte _byte1; @Resource(name = "byte") private void setByte1(Byte b) { - this.byte1 = b; + this._byte1 = b; } /** @@ -83,12 +83,12 @@ @Resource(name = "character") private Character character0; - private Character character1; + private Character _character1; @Resource(name = "character") private void setCharacter1(Character c) { - this.character1 = c; + this._character1 = c; } /** @@ -98,12 +98,12 @@ @Resource(name = "short") private Short short0; - private Short short1; + private Short _short1; @Resource(name = "short") private void setShort1(Short i) { - this.short1 = i; + this._short1 = i; } /** @@ -113,12 +113,12 @@ @Resource(name = "integer") private Integer integer0; - private Integer integer1; + private Integer _integer1; @Resource(name = "integer") private void setInteger1(Integer i) { - this.integer1 = i; + this._integer1 = i; } /** @@ -128,12 +128,12 @@ @Resource(name = "long") private Long long0; - private Long long1; + private Long _long1; @Resource(name = "long") private void setLong1(Long l) { - this.long1 = l; + this._long1 = l; } /** @@ -143,12 +143,12 @@ @Resource(name = "float") private Float float0; - private Float float1; + private Float _float1; @Resource(name = "float") private void setFloat1(Float f) { - this.float1 = f; + this._float1 = f; } /** @@ -158,12 +158,12 @@ @Resource(name = "double") private Double double0; - private Double double1; + private Double _double1; @Resource(name = "double") private void setDouble1(Double d) { - this.double1 = d; + this._double1 = d; } /** @@ -173,12 +173,12 @@ @Resource private String string; - private String string1; + private String _string1; @Resource private void setString(String s) { - this.string1 = s; + this._string1 = s; } /** @@ -197,7 +197,7 @@ log.error("@Resource initialization for boolean0 failed"); correctInitialization = false; } - if (this.boolean1 == null || this.boolean1 != true) + if (this._boolean1 == null || this._boolean1 != true) { log.error("@Resource initialization for boolean1 failed"); correctInitialization = false; @@ -209,7 +209,7 @@ log.error("@Resource initialization for byte0 failed"); correctInitialization = false; } - if (this.byte1 == null || this.byte1 != (byte)1) + if (this._byte1 == null || this._byte1 != (byte)1) { log.error("@Resource initialization for byte1 failed"); correctInitialization = false; @@ -221,7 +221,7 @@ log.error("@Resource initialization for character0 failed"); correctInitialization = false; } - if (this.character1 == null || this.character1 != 'c') + if (this._character1 == null || this._character1 != 'c') { log.error("@Resource initialization for character1 failed"); correctInitialization = false; @@ -233,7 +233,7 @@ log.error("@Resource initialization for short0 failed"); correctInitialization = false; } - if (this.short1 == null || this.short1 != (short)5) + if (this._short1 == null || this._short1 != (short)5) { log.error("@Resource initialization for short1 failed"); correctInitialization = false; @@ -245,7 +245,7 @@ log.error("@Resource initialization for integer0 failed"); correctInitialization = false; } - if (this.integer1 == null || this.integer1 != 7) + if (this._integer1 == null || this._integer1 != 7) { log.error("@Resource initialization for integer1 failed"); correctInitialization = false; @@ -257,7 +257,7 @@ log.error("@Resource initialization for long0 failed"); correctInitialization = false; } - if (this.long1 == null || this.long1 != 11L) + if (this._long1 == null || this._long1 != 11L) { log.error("@Resource initialization for long1 failed"); correctInitialization = false; @@ -269,7 +269,7 @@ log.error("@Resource initialization for float0 failed"); correctInitialization = false; } - if (this.float1 == null || this.float1 != 13.0f) + if (this._float1 == null || this._float1 != 13.0f) { log.error("@Resource initialization for float1 failed"); correctInitialization = false; @@ -281,7 +281,7 @@ log.error("@Resource initialization for double0 failed"); correctInitialization = false; } - if (this.double1 == null || this.double1 != 17.0) + if (this._double1 == null || this._double1 != 17.0) { log.error("@Resource initialization for double1 failed"); correctInitialization = false; @@ -293,7 +293,7 @@ log.error("@Resource initialization for string0 failed"); correctInitialization = false; } - if ("s".equals(this.string1) == false) + if ("s".equals(this._string1) == false) { log.error("@Resource initialization for string1 failed"); correctInitialization = false; Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java 2011-07-27 12:22:45 UTC (rev 14753) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java 2011-07-27 12:44:16 UTC (rev 14754) @@ -54,12 +54,12 @@ // XML driven injection private Boolean boolean0; - private Boolean boolean1; + private Boolean _boolean1; // XML driven injection private void setBoolean1(Boolean b) { - this.boolean1 = b; + this._boolean1 = b; } /** @@ -69,12 +69,12 @@ // XML driven injection private Byte byte0; - private Byte byte1; + private Byte _byte1; // XML driven injection private void setByte1(Byte b) { - this.byte1 = b; + this._byte1 = b; } /** @@ -84,12 +84,12 @@ // XML driven injection private Character character0; - private Character character1; + private Character _character1; // XML driven injection private void setCharacter1(Character c) { - this.character1 = c; + this._character1 = c; } /** @@ -99,12 +99,12 @@ // XML driven injection private Short short0; - private Short short1; + private Short _short1; // XML driven injection private void setShort1(Short i) { - this.short1 = i; + this._short1 = i; } /** @@ -114,12 +114,12 @@ @Resource(name = "integer") private Integer integer0; - private Integer integer1; + private Integer _integer1; @Resource(name = "integer") private void setInteger1(Integer i) { - this.integer1 = i; + this._integer1 = i; } /** @@ -129,12 +129,12 @@ @Resource(name = "long") private Long long0; - private Long long1; + private Long _long1; @Resource(name = "long") private void setLong1(Long l) { - this.long1 = l; + this._long1 = l; } /** @@ -144,12 +144,12 @@ @Resource(name = "float") private Float float0; - private Float float1; + private Float _float1; @Resource(name = "float") private void setFloat1(Float f) { - this.float1 = f; + this._float1 = f; } /** @@ -159,12 +159,12 @@ @Resource(name = "double") private Double double0; - private Double double1; + private Double _double1; @Resource(name = "double") private void setDouble1(Double d) { - this.double1 = d; + this._double1 = d; } /** @@ -174,12 +174,12 @@ @Resource(name = "string") private String string; - private String string1; + private String _string1; @Resource(name = "string") private void setString1(String s) { - this.string1 = s; + this._string1 = s; } /** @@ -198,7 +198,7 @@ log.error("Descriptor driven initialization for boolean0 failed"); correctInitialization = false; } - if (this.boolean1 == null || this.boolean1 != true) + if (this._boolean1 == null || this._boolean1 != true) { log.error("Descriptor driven initialization for boolean1 failed"); correctInitialization = false; @@ -210,7 +210,7 @@ log.error("Descriptor driven initialization for byte0 failed"); correctInitialization = false; } - if (this.byte1 == null || this.byte1 != (byte)1) + if (this._byte1 == null || this._byte1 != (byte)1) { log.error("Descriptor driven initialization for byte1 failed"); correctInitialization = false; @@ -222,7 +222,7 @@ log.error("Descriptor driven initialization for character0 failed"); correctInitialization = false; } - if (this.character1 == null || this.character1 != 'c') + if (this._character1 == null || this._character1 != 'c') { log.error("Descriptor driven initialization for character1 failed"); correctInitialization = false; @@ -234,7 +234,7 @@ log.error("Descriptor driven initialization for short0 failed"); correctInitialization = false; } - if (this.short1 == null || this.short1 != (short)5) + if (this._short1 == null || this._short1 != (short)5) { log.error("Descriptor driven initialization for short1 failed"); correctInitialization = false; @@ -246,7 +246,7 @@ log.error("@Resource initialization for integer0 failed"); correctInitialization = false; } - if (this.integer1 == null || this.integer1 != 7) + if (this._integer1 == null || this._integer1 != 7) { log.error("@Resource initialization for integer1 failed"); correctInitialization = false; @@ -258,7 +258,7 @@ log.error("@Resource initialization for long0 failed"); correctInitialization = false; } - if (this.long1 == null || this.long1 != 11L) + if (this._long1 == null || this._long1 != 11L) { log.error("@Resource initialization for long1 failed"); correctInitialization = false; @@ -270,7 +270,7 @@ log.error("@Resource initialization for float0 failed"); correctInitialization = false; } - if (this.float1 == null || this.float1 != 13.0f) + if (this._float1 == null || this._float1 != 13.0f) { log.error("@Resource initialization for float1 failed"); correctInitialization = false; @@ -282,7 +282,7 @@ log.error("@Resource initialization for double0 failed"); correctInitialization = false; } - if (this.double1 == null || this.double1 != 17.0) + if (this._double1 == null || this._double1 != 17.0) { log.error("@Resource initialization for double1 failed"); correctInitialization = false; @@ -294,7 +294,7 @@ log.error("@Resource initialization for string0 failed"); correctInitialization = false; } - if ("s".equals(this.string1) == false) + if ("s".equals(this._string1) == false) { log.error("@Resource initialization for string1 failed"); correctInitialization = false; Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java 2011-07-27 12:22:45 UTC (rev 14753) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java 2011-07-27 12:44:16 UTC (rev 14754) @@ -47,12 +47,12 @@ // XML driven injection private Boolean boolean0; - private Boolean boolean1; + private Boolean _boolean1; // XML driven injection private void setBoolean1(Boolean b) { - this.boolean1 = b; + this._boolean1 = b; } /** @@ -62,12 +62,12 @@ // XML driven injection private Byte byte0; - private Byte byte1; + private Byte _byte1; // XML driven injection private void setByte1(Byte b) { - this.byte1 = b; + this._byte1 = b; } /** @@ -77,12 +77,12 @@ // XML driven injection private Character character0; - private Character character1; + private Character _character1; // XML driven injection private void setCharacter1(Character c) { - this.character1 = c; + this._character1 = c; } /** @@ -92,12 +92,12 @@ // XML driven injection private Short short0; - private Short short1; + private Short _short1; // XML driven injection private void setShort1(Short i) { - this.short1 = i; + this._short1 = i; } /** @@ -107,12 +107,12 @@ @Resource(name = "integer") private Integer integer0; - private Integer integer1; + private Integer _integer1; @Resource(name = "integer") private void setInteger1(Integer i) { - this.integer1 = i; + this._integer1 = i; } /** @@ -122,12 +122,12 @@ @Resource(name = "long") private Long long0; - private Long long1; + private Long _long1; @Resource(name = "long") private void setLong1(Long l) { - this.long1 = l; + this._long1 = l; } /** @@ -137,12 +137,12 @@ @Resource(name = "float") private Float float0; - private Float float1; + private Float _float1; @Resource(name = "float") private void setFloat1(Float f) { - this.float1 = f; + this._float1 = f; } /** @@ -152,12 +152,12 @@ @Resource(name = "double") private Double double0; - private Double double1; + private Double _double1; @Resource(name = "double") private void setDouble1(Double d) { - this.double1 = d; + this._double1 = d; } /** @@ -167,12 +167,12 @@ @Resource private String string; - private String string1; + private String _string1; @Resource private void setString(String s) { - this.string1 = s; + this._string1 = s; } /** @@ -191,7 +191,7 @@ log.error("Descriptor driven initialization for boolean0 failed"); correctInitialization = false; } - if (this.boolean1 == null || this.boolean1 != true) + if (this._boolean1 == null || this._boolean1 != true) { log.error("Descriptor driven initialization for boolean1 failed"); correctInitialization = false; @@ -203,7 +203,7 @@ log.error("Descriptor driven initialization for byte0 failed"); correctInitialization = false; } - if (this.byte1 == null || this.byte1 != (byte)1) + if (this._byte1 == null || this._byte1 != (byte)1) { log.error("Descriptor driven initialization for byte1 failed"); correctInitialization = false; @@ -215,7 +215,7 @@ log.error("Descriptor driven initialization for character0 failed"); correctInitialization = false; } - if (this.character1 == null || this.character1 != 'c') + if (this._character1 == null || this._character1 != 'c') { log.error("Descriptor driven initialization for character1 failed"); correctInitialization = false; @@ -227,7 +227,7 @@ log.error("Descriptor driven initialization for short0 failed"); correctInitialization = false; } - if (this.short1 == null || this.short1 != (short)5) + if (this._short1 == null || this._short1 != (short)5) { log.error("Descriptor driven initialization for short1 failed"); correctInitialization = false; @@ -239,7 +239,7 @@ log.error("@Resource initialization for integer0 failed"); correctInitialization = false; } - if (this.integer1 == null || this.integer1 != 7) + if (this._integer1 == null || this._integer1 != 7) { log.error("@Resource initialization for integer1 failed"); correctInitialization = false; @@ -251,7 +251,7 @@ log.error("@Resource initialization for long0 failed"); correctInitialization = false; } - if (this.long1 == null || this.long1 != 11L) + if (this._long1 == null || this._long1 != 11L) { log.error("@Resource initialization for long1 failed"); correctInitialization = false; @@ -263,7 +263,7 @@ log.error("@Resource initialization for float0 failed"); correctInitialization = false; } - if (this.float1 == null || this.float1 != 13.0f) + if (this._float1 == null || this._float1 != 13.0f) { log.error("@Resource initialization for float1 failed"); correctInitialization = false; @@ -275,7 +275,7 @@ log.error("@Resource initialization for double0 failed"); correctInitialization = false; } - if (this.double1 == null || this.double1 != 17.0) + if (this._double1 == null || this._double1 != 17.0) { log.error("@Resource initialization for double1 failed"); correctInitialization = false; @@ -287,7 +287,7 @@ log.error("@Resource initialization for string0 failed"); correctInitialization = false; } - if ("s".equals(this.string1) == false) + if ("s".equals(this._string1) == false) { log.error("@Resource initialization for string1 failed"); correctInitialization = false; Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml 2011-07-27 12:22:45 UTC (rev 14753) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml 2011-07-27 12:44:16 UTC (rev 14754) @@ -24,7 +24,7 @@ <mapped-name>jbossws-client/service/TestService</mapped-name> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws1841.StatelessBean</injection-target-class> - <injection-target-name>setEndpoint4</injection-target-name> + <injection-target-name>endpoint4</injection-target-name> </injection-target> </service-ref> </session> Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml 2011-07-27 12:22:45 UTC (rev 14753) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml 2011-07-27 12:44:16 UTC (rev 14754) @@ -25,7 +25,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setBoolean1</injection-target-name> + <injection-target-name>boolean1</injection-target-name> </injection-target> </env-entry> @@ -39,7 +39,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setByte1</injection-target-name> + <injection-target-name>byte1</injection-target-name> </injection-target> </env-entry> @@ -53,7 +53,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setCharacter1</injection-target-name> + <injection-target-name>character1</injection-target-name> </injection-target> </env-entry> @@ -67,7 +67,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setShort1</injection-target-name> + <injection-target-name>short1</injection-target-name> </injection-target> </env-entry> @@ -81,7 +81,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setInteger1</injection-target-name> + <injection-target-name>integer1</injection-target-name> </injection-target> </env-entry> @@ -95,7 +95,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setLong1</injection-target-name> + <injection-target-name>long1</injection-target-name> </injection-target> </env-entry> @@ -109,7 +109,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setFloat1</injection-target-name> + <injection-target-name>float1</injection-target-name> </injection-target> </env-entry> @@ -123,7 +123,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setDouble1</injection-target-name> + <injection-target-name>double1</injection-target-name> </injection-target> </env-entry> @@ -137,7 +137,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setString1</injection-target-name> + <injection-target-name>string1</injection-target-name> </injection-target> </env-entry> Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml 2011-07-27 12:22:45 UTC (rev 14753) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml 2011-07-27 12:44:16 UTC (rev 14754) @@ -20,7 +20,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl</injection-target-class> - <injection-target-name>setBoolean1</injection-target-name> + <injection-target-name>boolean1</injection-target-name> </injection-target> </env-entry> @@ -34,7 +34,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl</injection-target-class> - <injection-target-name>setByte1</injection-target-name> + <injection-target-name>byte1</injection-target-name> </injection-target> </env-entry> @@ -48,7 +48,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl</injection-target-class> - <injection-target-name>setCharacter1</injection-target-name> + <injection-target-name>character1</injection-target-name> </injection-target> </env-entry> @@ -62,7 +62,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl</injection-target-class> - <injection-target-name>setShort1</injection-target-name> + <injection-target-name>short1</injection-target-name> </injection-target> </env-entry> Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml 2011-07-27 12:22:45 UTC (rev 14753) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml 2011-07-27 12:44:16 UTC (rev 14754) @@ -25,7 +25,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl</injection-target-class> - <injection-target-name>setBoolean1</injection-target-name> + <injection-target-name>boolean1</injection-target-name> </injection-target> </env-entry> @@ -39,7 +39,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl</injection-target-class> - <injection-target-name>setByte1</injection-target-name> + <injection-target-name>byte1</injection-target-name> </injection-target> </env-entry> @@ -53,7 +53,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl</injection-target-class> - <injection-target-name>setCharacter1</injection-target-name> + <injection-target-name>character1</injection-target-name> </injection-target> </env-entry> @@ -67,7 +67,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl</injection-target-class> - <injection-target-name>setShort1</injection-target-name> + <injection-target-name>short1</injection-target-name> </injection-target> </env-entry> Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4/META-INF/ejb-jar.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4/META-INF/ejb-jar.xml 2011-07-27 12:22:45 UTC (rev 14753) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4/META-INF/ejb-jar.xml 2011-07-27 12:44:16 UTC (rev 14754) @@ -18,7 +18,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setBoolean1</injection-target-name> + <injection-target-name>boolean1</injection-target-name> </injection-target> </env-entry> @@ -32,7 +32,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setByte1</injection-target-name> + <injection-target-name>byte1</injection-target-name> </injection-target> </env-entry> @@ -46,7 +46,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setCharacter1</injection-target-name> + <injection-target-name>character1</injection-target-name> </injection-target> </env-entry> @@ -60,7 +60,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setShort1</injection-target-name> + <injection-target-name>short1</injection-target-name> </injection-target> </env-entry> @@ -74,7 +74,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setInteger1</injection-target-name> + <injection-target-name>integer1</injection-target-name> </injection-target> </env-entry> @@ -88,7 +88,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setLong1</injection-target-name> + <injection-target-name>long1</injection-target-name> </injection-target> </env-entry> @@ -102,7 +102,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setFloat1</injection-target-name> + <injection-target-name>float1</injection-target-name> </injection-target> </env-entry> @@ -116,7 +116,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setDouble1</injection-target-name> + <injection-target-name>double1</injection-target-name> </injection-target> </env-entry> @@ -130,7 +130,7 @@ </injection-target> <injection-target> <injection-target-class>org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler</injection-target-class> - <injection-target-name>setString1</injection-target-name> + <injection-target-name>string1</injection-target-name> </injection-target> </env-entry>

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r14753 - common/trunk/src/main/java/org/jboss/ws/common/injection/finders.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-07-27 08:22:45 -0400 (Wed, 27 Jul 2011) New Revision: 14753 Modified: common/trunk/src/main/java/org/jboss/ws/common/injection/finders/InjectionMethodFinder.java Log: [JBWS-3334] fixing injection method lookup algorithm Modified: common/trunk/src/main/java/org/jboss/ws/common/injection/finders/InjectionMethodFinder.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/injection/finders/InjectionMethodFinder.java 2011-07-27 12:00:27 UTC (rev 14752) +++ common/trunk/src/main/java/org/jboss/ws/common/injection/finders/InjectionMethodFinder.java 2011-07-27 12:22:45 UTC (rev 14753) @@ -61,7 +61,9 @@ @Override public boolean matches(final Method method) { - if (method.getName().equals(injectionMD.getTargetName())) + final String targetName = injectionMD.getTargetName(); + final String methodName = "set" + targetName.substring(0, 1).toUpperCase() + targetName.substring(1); + if (method.getName().equals(methodName)) { if (injectionMD.getValueClass() != null) {

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r14752 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: mmusaji Date: 2011-07-27 08:00:27 -0400 (Wed, 27 Jul 2011) New Revision: 14752 Added: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/ Removed: stack/native/branches/jbossws-native-3.1.2_SP10_JBPAPP6864/ Log: Rename branch to correct format

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r14751 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: mmusaji Date: 2011-07-27 07:57:13 -0400 (Wed, 27 Jul 2011) New Revision: 14751 Added: stack/native/branches/jbossws-native-3.1.2_SP10_JBPAPP6864/ Log: Create JBPAPP-6864 patch branch from Jbossws-native-3.1.2.SP10

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r14750 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: mmusaji Date: 2011-07-27 07:52:14 -0400 (Wed, 27 Jul 2011) New Revision: 14750 Removed: stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-6864/ Log: Deleting branch no longer needed for one off patch for this version

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r14749 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: resolver and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-07-26 13:35:50 -0400 (Tue, 26 Jul 2011) New Revision: 14749 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/resolver/JBossWSResourceResolver.java Log: Further reducing log level: in DescriptorDeploymentAspect because nowadays the non-spring deployment mode is the default and almost all works with it, in JBossWSResourceResolver because that's just one of the resolvers installed in CXF, so it's almost always of for it not to be able to resolve CXF internals. Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2011-07-26 14:05:06 UTC (rev 14748) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2011-07-26 17:35:50 UTC (rev 14749) @@ -66,7 +66,7 @@ } else { - log.info("Spring not available, skipping check for user provided jbossws-cxf.xml / cxf.xml configuration files."); + log.debug("Spring not available, skipping check for user provided jbossws-cxf.xml / cxf.xml configuration files."); generateMetadataFromDeployment(dep); } } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/resolver/JBossWSResourceResolver.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/resolver/JBossWSResourceResolver.java 2011-07-26 14:05:06 UTC (rev 14748) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/resolver/JBossWSResourceResolver.java 2011-07-26 17:35:50 UTC (rev 14749) @@ -76,7 +76,8 @@ } catch (IOException ioe) { - log.warn(BundleUtils.getMessage(bundle, "CANNOT_RESOLVE_RESOURCE", resourcePath)); + if (log.isDebugEnabled()) + log.debug(BundleUtils.getMessage(bundle, "CANNOT_RESOLVE_RESOURCE", resourcePath)); } if (url != null && resourceType.isInstance(url)) {

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r14748 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws/webserviceref and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-07-26 10:05:06 -0400 (Tue, 26 Jul 2011) New Revision: 14748 Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java Log: Fixing regressions due to JBWS-3310 Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-07-26 11:16:01 UTC (rev 14747) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-07-26 14:05:06 UTC (rev 14748) @@ -795,7 +795,7 @@ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient" /> </manifest> </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-override-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-override-webserviceref-client.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class" /> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class" /> @@ -810,7 +810,7 @@ <include name="wsdl/**" /> </metainf> <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo" /> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo" /> </manifest> </jar> @@ -820,7 +820,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class" /> </fileset> </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-secure-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-secure-webserviceref-client.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class" /> <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class" /> @@ -834,22 +834,6 @@ <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.SecureEndpointClient" /> </manifest> </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-override-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class" /> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class" /> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/webserviceref/META-INF-override"> - <include name="jbossws-client-config.xml" /> - <include name="application-client.xml" /> - <include name="jboss-client.xml" /> - <include name="wsdl/**" /> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo" /> - </manifest> - </jar>  <war warfile="${tests.output.dir}/test-libs/jaxws-wsdd.war" webxml="${tests.output.dir}/test-resources/jaxws/wsdd/WEB-INF/web.xml"> @@ -878,7 +862,7 @@ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class" /> </classes> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-initial-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-initial-cl.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class" /> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class" /> @@ -899,7 +883,7 @@ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class" /> </classes> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto-cl.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class" /> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class" /> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2011-07-26 11:16:01 UTC (rev 14747) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2011-07-26 14:05:06 UTC (rev 14748) @@ -43,7 +43,7 @@ public static Test suite() { - return new JBossWSTestSetup(ServiceRefOverridesTestCase.class, "jaxws-webserviceref.war, jaxws-webserviceref-override-client.jar"); + return new JBossWSTestSetup(ServiceRefOverridesTestCase.class, "jaxws-webserviceref.war, jaxws-override-webserviceref-client.jar"); } public void testService1() throws Throwable Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2011-07-26 11:16:01 UTC (rev 14747) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2011-07-26 14:05:06 UTC (rev 14748) @@ -48,7 +48,7 @@ public static Test suite() { - return new JBossWSTestSetup(StubPropertyTestCase.class, "jaxws-webserviceref-secure.jar, jaxws-webserviceref-secure-client.jar"); + return new JBossWSTestSetup(StubPropertyTestCase.class, "jaxws-webserviceref-secure.jar, jaxws-secure-webserviceref-client.jar"); } public void testWSDLAccess() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2011-07-26 11:16:01 UTC (rev 14747) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2011-07-26 14:05:06 UTC (rev 14748) @@ -53,8 +53,8 @@ public static Test suite() { return new JBossWSTestSetup(AddressingReplyToTestCase.class, - "jaxws-wsaddressing-initial.war,jaxws-wsaddressing-initial-client.jar," + - "jaxws-wsaddressing-replyto.war,jaxws-wsaddressing-replyto-client.jar," + + "jaxws-wsaddressing-initial.war,jaxws-wsaddressing-initial-cl.jar," + + "jaxws-wsaddressing-replyto.war,jaxws-wsaddressing-replyto-cl.jar," + "jaxws-wsaddressing-faultto.war"); }

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r14747 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-07-26 07:16:01 -0400 (Tue, 26 Jul 2011) New Revision: 14747 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-3330] Updating excludes Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-07-26 11:14:15 UTC (rev 14746) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-07-26 11:16:01 UTC (rev 14747) @@ -815,7 +815,7 @@ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude> -  +  <exclude>org/jboss/test/ws/management/recording/**</exclude>  @@ -986,7 +986,7 @@ <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>  - <exclude>org/jboss/test/ws/management/recording/**</exclude> + <exclude>org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase*</exclude>  <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>

13 years, 5 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-07-26 07:14:15 -0400 (Tue, 26 Jul 2011) New Revision: 14746 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3330] Enabling some tests Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-07-26 10:53:34 UTC (rev 14745) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-07-26 11:14:15 UTC (rev 14746) @@ -1218,7 +1218,7 @@ <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>  - <exclude>org/jboss/test/ws/management/recording/**</exclude> + <exclude>org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase*</exclude>  <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r14745 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws: core/jaxws/client and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-07-26 06:53:34 -0400 (Tue, 26 Jul 2011) New Revision: 14745 Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceObjectFactoryJAXWS.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceRefBinderJAXWS.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceReferenceableJAXWS.java Removed: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceObjectFactoryJAXWS.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceReferenceableJAXWS.java Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java Log: refactoring Native JAXWS service ref to separate package Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java 2011-07-26 10:46:49 UTC (rev 14744) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -22,7 +22,7 @@ package org.jboss.ws.core.client; import org.jboss.ws.core.jaxrpc.client.serviceref.NativeServiceRefBinderJAXRPC; -import org.jboss.ws.core.jaxws.client.NativeServiceRefBinderJAXWS; +import org.jboss.ws.core.jaxws.client.serviceref.NativeServiceRefBinderJAXWS; import org.jboss.wsf.spi.serviceref.ServiceRefBinder; import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory; import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type; Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceObjectFactoryJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceObjectFactoryJAXWS.java 2011-07-26 10:46:49 UTC (rev 14744) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceObjectFactoryJAXWS.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -1,72 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws.client; - -import javax.xml.ws.Service; - -import org.jboss.ws.core.ConfigProvider; -import org.jboss.ws.common.serviceref.AbstractServiceObjectFactoryJAXWS; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; - -/** - * {@inheritDoc} - * - * @author Thomas.Diesler(a)jboss.org - * @author Richard.Opalka(a)jboss.org - * @author alessio.soldano(a)jboss.com - */ -public final class NativeServiceObjectFactoryJAXWS extends AbstractServiceObjectFactoryJAXWS -{ - private static final ThreadLocal<UnifiedServiceRefMetaData> serviceRefAssociation = new ThreadLocal<UnifiedServiceRefMetaData>(); - - public static UnifiedServiceRefMetaData getServiceRefAssociation() - { - return serviceRefAssociation.get(); - } - - @Override - protected void init(final UnifiedServiceRefMetaData serviceRefUMDM) - { - serviceRefAssociation.set(serviceRefUMDM); - } - - @Override - protected void configure(final UnifiedServiceRefMetaData serviceRefUMDM, final Service service) - { - final String configFile = serviceRefUMDM.getConfigFile(); - final String configName = serviceRefUMDM.getConfigName(); - if (service instanceof ConfigProvider) - { - final ConfigProvider cp = (ConfigProvider) service; - if (configName != null || configFile != null) - { - cp.setConfigName(configName, configFile); - } - } - } - - @Override - protected void destroy(final UnifiedServiceRefMetaData serviceRefUMDM) - { - serviceRefAssociation.set(null); - } -} Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java 2011-07-26 10:46:49 UTC (rev 14744) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, 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.ws.core.jaxws.client; - -import javax.naming.Referenceable; - -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.wsf.spi.serviceref.ServiceRefBinder; - -/** - * Binds a JAXWS Service object to the client's ENC. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public final class NativeServiceRefBinderJAXWS implements ServiceRefBinder -{ - @Override - public Referenceable createReferenceable(final UnifiedServiceRefMetaData serviceRefMD) - { - return new NativeServiceReferenceableJAXWS(serviceRefMD); - } -} Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceReferenceableJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceReferenceableJAXWS.java 2011-07-26 10:46:49 UTC (rev 14744) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceReferenceableJAXWS.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -1,44 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws.client; - -import org.jboss.ws.common.serviceref.AbstractServiceReferenceableJAXWS; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; - -/** - * {@inheritDoc} - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public class NativeServiceReferenceableJAXWS extends AbstractServiceReferenceableJAXWS<NativeServiceObjectFactoryJAXWS> -{ - public NativeServiceReferenceableJAXWS(final UnifiedServiceRefMetaData serviceRefMD) - { - super(serviceRefMD); - } - - @Override - protected Class<NativeServiceObjectFactoryJAXWS> getObjectFactory() - { - return NativeServiceObjectFactoryJAXWS.class; - } -} Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceObjectFactoryJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceObjectFactoryJAXWS.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceObjectFactoryJAXWS.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.jaxws.client.serviceref; + +import javax.xml.ws.Service; + +import org.jboss.ws.core.ConfigProvider; +import org.jboss.ws.common.serviceref.AbstractServiceObjectFactoryJAXWS; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +/** + * {@inheritDoc} + * + * @author Thomas.Diesler(a)jboss.org + * @author Richard.Opalka(a)jboss.org + * @author alessio.soldano(a)jboss.com + */ +public final class NativeServiceObjectFactoryJAXWS extends AbstractServiceObjectFactoryJAXWS +{ + private static final ThreadLocal<UnifiedServiceRefMetaData> serviceRefAssociation = new ThreadLocal<UnifiedServiceRefMetaData>(); + + public static UnifiedServiceRefMetaData getServiceRefAssociation() + { + return serviceRefAssociation.get(); + } + + @Override + protected void init(final UnifiedServiceRefMetaData serviceRefUMDM) + { + serviceRefAssociation.set(serviceRefUMDM); + } + + @Override + protected void configure(final UnifiedServiceRefMetaData serviceRefUMDM, final Service service) + { + final String configFile = serviceRefUMDM.getConfigFile(); + final String configName = serviceRefUMDM.getConfigName(); + if (service instanceof ConfigProvider) + { + final ConfigProvider cp = (ConfigProvider) service; + if (configName != null || configFile != null) + { + cp.setConfigName(configName, configFile); + } + } + } + + @Override + protected void destroy(final UnifiedServiceRefMetaData serviceRefUMDM) + { + serviceRefAssociation.set(null); + } +} Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceRefBinderJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceRefBinderJAXWS.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceRefBinderJAXWS.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.ws.core.jaxws.client.serviceref; + +import javax.naming.Referenceable; + +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.serviceref.ServiceRefBinder; + +/** + * Binds a JAXWS Service object to the client's ENC. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class NativeServiceRefBinderJAXWS implements ServiceRefBinder +{ + @Override + public Referenceable createReferenceable(final UnifiedServiceRefMetaData serviceRefMD) + { + return new NativeServiceReferenceableJAXWS(serviceRefMD); + } +} Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceReferenceableJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceReferenceableJAXWS.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceReferenceableJAXWS.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.jaxws.client.serviceref; + +import org.jboss.ws.common.serviceref.AbstractServiceReferenceableJAXWS; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +/** + * {@inheritDoc} + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public class NativeServiceReferenceableJAXWS extends AbstractServiceReferenceableJAXWS<NativeServiceObjectFactoryJAXWS> +{ + public NativeServiceReferenceableJAXWS(final UnifiedServiceRefMetaData serviceRefMD) + { + super(serviceRefMD); + } + + @Override + protected Class<NativeServiceObjectFactoryJAXWS> getObjectFactory() + { + return NativeServiceObjectFactoryJAXWS.class; + } +} Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-07-26 10:46:49 UTC (rev 14744) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -64,7 +64,7 @@ import org.jboss.ws.core.jaxws.client.ClientImpl; import org.jboss.ws.core.jaxws.client.ClientProxy; import org.jboss.ws.core.jaxws.client.DispatchImpl; -import org.jboss.ws.core.jaxws.client.NativeServiceObjectFactoryJAXWS; +import org.jboss.ws.core.jaxws.client.serviceref.NativeServiceObjectFactoryJAXWS; import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil; import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2011-07-26 10:46:49 UTC (rev 14744) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -41,7 +41,7 @@ import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.common.ResourceLoaderAdapter; -import org.jboss.ws.core.jaxws.client.NativeServiceObjectFactoryJAXWS; +import org.jboss.ws.core.jaxws.client.serviceref.NativeServiceObjectFactoryJAXWS; import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;

13 years, 5 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits July 2011