wise SVN: r588 - webgui/tags/wise-webgui-1.0.2.Final.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-05 11:41:01 -0400 (Fri, 05 Jul 2013)
New Revision: 588
Modified:
webgui/tags/wise-webgui-1.0.2.Final/pom.xml
Log:
Fixing pom
Modified: webgui/tags/wise-webgui-1.0.2.Final/pom.xml
===================================================================
--- webgui/tags/wise-webgui-1.0.2.Final/pom.xml 2013-07-05 15:12:29 UTC (rev 587)
+++ webgui/tags/wise-webgui-1.0.2.Final/pom.xml 2013-07-05 15:41:01 UTC (rev 588)
@@ -14,16 +14,16 @@
<groupId>org.jboss.wise.gui</groupId>
<artifactId>wise-gui</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.2.Final</version>
<packaging>war</packaging>
<name>JBoss Wise GUI</name>
<description>A GUI for JBoss Wise Core</description>
<url>http://www.jboss.org/wise</url>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/wise/webgui/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/wise/webgui/trunk</developerConnection>
- <url>http://fisheye.jboss.org/viewrep/Wise/webgui/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/wise/webgui/tags/wise-webgui-1.0.2...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/wise/webgui/tags/wise-webgui-1.0.2.Final</developerConnection>
+ <url>http://fisheye.jboss.org/viewrep/Wise/webgui/tags/wise-webgui-1.0.2.Final</url>
</scm>
<licenses>
@@ -52,7 +52,7 @@
<version.org.jboss.spec.jboss.javaee.6.0>3.0.0.Final</version.org.jboss.spec.jboss.javaee.6.0>
<version.org.richfaces>4.3.2.Final</version.org.richfaces>
- <version.wise.core>2.1.0-SNAPSHOT</version.wise.core>
+ <version.wise.core>2.0.3.Final</version.wise.core>
<!-- other plugin versions -->
<version.compiler.plugin>2.3.1</version.compiler.plugin>
11 years, 6 months
- 1
- 0
wise SVN: r587 - webgui/tags.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-05 11:12:29 -0400 (Fri, 05 Jul 2013)
New Revision: 587
Added:
webgui/tags/wise-webgui-1.0.2.Final/
Log:
Tagging wise-webgui-1.0.2.Final
11 years, 6 months
- 1
- 0
wise SVN: r586 - in core/tags/wise-core-2.0.3.Final: core and 7 other directories.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-05 11:10:16 -0400 (Fri, 05 Jul 2013)
New Revision: 586
Modified:
core/tags/wise-core-2.0.3.Final/core-cxf/pom.xml
core/tags/wise-core-2.0.3.Final/core/pom.xml
core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldGroovy/runClosuresJDK7.sh
core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldGroovy/runGroovyJDK7.sh
core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldRuby/runJRubyClosuresJDK7.sh
core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldRuby/runJRubyJDK7.sh
core/tags/wise-core-2.0.3.Final/distribution/pom.xml
core/tags/wise-core-2.0.3.Final/integration-testsuite/common/pom.xml
core/tags/wise-core-2.0.3.Final/integration-testsuite/cxf/pom.xml
core/tags/wise-core-2.0.3.Final/integration-testsuite/pom.xml
core/tags/wise-core-2.0.3.Final/pom.xml
Log:
Fixing poms / distro
Modified: core/tags/wise-core-2.0.3.Final/core/pom.xml
===================================================================
--- core/tags/wise-core-2.0.3.Final/core/pom.xml 2013-07-05 14:48:21 UTC (rev 585)
+++ core/tags/wise-core-2.0.3.Final/core/pom.xml 2013-07-05 15:10:16 UTC (rev 586)
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-core</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.0.3.Final</version>
<name>Wise Core</name>
<url>http://www.jboss.org/wise</url>
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.wise</groupId>
<artifactId>wise</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.0.3.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/tags/wise-core-2.0.3.Final/core-cxf/pom.xml
===================================================================
--- core/tags/wise-core-2.0.3.Final/core-cxf/pom.xml 2013-07-05 14:48:21 UTC (rev 585)
+++ core/tags/wise-core-2.0.3.Final/core-cxf/pom.xml 2013-07-05 15:10:16 UTC (rev 586)
@@ -17,7 +17,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-core-cxf</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.0.3.Final</version>
<name>Wise Core - CXF</name>
<url>http://www.jboss.org/wise</url>
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.wise</groupId>
<artifactId>wise</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.0.3.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldGroovy/runClosuresJDK7.sh
===================================================================
--- core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldGroovy/runClosuresJDK7.sh 2013-07-05 14:48:21 UTC (rev 585)
+++ core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldGroovy/runClosuresJDK7.sh 2013-07-05 15:10:16 UTC (rev 586)
@@ -1,3 +1,3 @@
#!/bin/sh
#The classpath in the script below is generated using the classPath.groovy script and removing stax-api and asm libraries which are already included in the booclassloader of Groovy (2.1.0)
-groovy -cp ../../lib/xstream-1.2.2.jar:../../lib/cxf-rt-ws-mex-2.6.4.jar:../../lib/cxf-rt-core-2.6.4.jar:../../lib/cxf-rt-transports-http-2.6.4.jar:../../lib/cxf-xjc-dv-2.6.0.jar:../../lib/commons-logging-1.0.4.jar:../../lib/cxf-rt-frontend-jaxws-2.6.4.jar:../../lib/cxf-rt-transports-local-2.6.4.jar:../../lib/cxf-rt-bindings-coloc-2.6.4.jar:../../lib/cxf-rt-frontend-simple-2.6.4.jar:../../lib/log4j-1.2.16.jar:../../lib/cxf-api-2.6.4.jar:../../lib/jboss-saaj-api_1.3_spec-1.0.1.Final.jar:../../lib/jbossws-spi-2.1.1.Final.jar:../../lib/cxf-rt-databinding-jaxb-2.6.4.jar:../../lib/freemarker-2.3.11.jar:../../lib/cxf-rt-bindings-object-2.6.4.jar:../../lib/wsdl4j-1.6.2.jar:../../lib/jbossws-common-2.1.1.Final.jar:../../lib/cxf-tools-wsdlto-databinding-jaxb-2.6.4.jar:../../lib/jcip-annotations-1.0.jar:../../lib/cxf-rt-bindings-xml-2.6.4.jar:../../lib/commons-lang-2.4.jar:../../lib/cxf-xjc-ts-2.6.0.jar:../../lib/commons-io-1.4.jar:../../lib/neethi-3.0.2.jar:../../lib/commons-httpcli!
ent-3.1.jar:../../lib/cxf-rt-ws-addr-2.6.4.jar:../../lib/opencsv-1.8.jar:../../lib/cxf-xjc-boolean-2.6.0.jar:../../lib/javassist-3.10.0.GA.jar:../../lib/cxf-tools-wsdlto-core-2.6.4.jar:../../lib/dtdparser-1.21.jar:../../lib/jboss-jaxb-api_2.2_spec-1.0.3.Final.jar:../../lib/wise-core-2.0.1.Final.jar:../../lib/jbossws-api-1.0.1.Final.jar:../../lib/jboss-jaxws-api_2.2_spec-2.0.0.Final.jar:../../lib/cxf-rt-bindings-soap-2.6.4.jar:../../lib/jbossws-cxf-factories-4.1.1.Final.jar:../../lib/commons-collections-3.2.1.jar:../../lib/commons-codec-1.2.jar:../../lib/jaxb-xjc-2.2.5.jar:../../lib/xpp3_min-1.1.3.4.O.jar:../../lib/xml-resolver-1.2.jar:../../lib/jboss-servlet-api_3.0_spec-1.0.0.Final.jar:../../lib/jbossws-cxf-client-4.1.1.Final.jar:../../lib/cxf-tools-validator-2.6.4.jar:../../lib/cxf-rt-ws-policy-2.6.4.jar:../../lib/milyn-commons-1.2.1.jar:../../lib/milyn-smooks-core-1.2.1.jar:../../lib/jaxb-impl-2.2.5.jar:../../lib/jsr181-api-1.0-MR1.jar:../../lib/xmlschema-core-2.0.3.jar:!
../../lib/milyn-smooks-validation-1.2.1.jar:../../lib/milyn-sm!
ooks-rul
es-1.2.1.jar:../../lib/milyn-smooks-javabean-1.2.1.jar:../../lib/cxf-tools-wsdlto-frontend-jaxws-2.6.4.jar:../../lib/velocity-1.7.jar:../../lib/mvel2-2.0.9.jar:../../lib/jbossws-common-tools-1.1.0.Final.jar:../../lib/wise-core-cxf-2.0.1.Final.jar:../../lib/cxf-tools-common-2.6.4.jar -d src/client/HelloWorldClosure.groovy
+groovy -cp ../../lib/xstream-1.2.2.jar:../../lib/cxf-rt-ws-mex-2.6.4.jar:../../lib/cxf-rt-core-2.6.4.jar:../../lib/cxf-rt-transports-http-2.6.4.jar:../../lib/cxf-xjc-dv-2.6.0.jar:../../lib/commons-logging-1.0.4.jar:../../lib/cxf-rt-frontend-jaxws-2.6.4.jar:../../lib/cxf-rt-transports-local-2.6.4.jar:../../lib/cxf-rt-bindings-coloc-2.6.4.jar:../../lib/cxf-rt-frontend-simple-2.6.4.jar:../../lib/log4j-1.2.16.jar:../../lib/cxf-api-2.6.4.jar:../../lib/jboss-saaj-api_1.3_spec-1.0.1.Final.jar:../../lib/jbossws-spi-2.1.1.Final.jar:../../lib/cxf-rt-databinding-jaxb-2.6.4.jar:../../lib/freemarker-2.3.11.jar:../../lib/cxf-rt-bindings-object-2.6.4.jar:../../lib/wsdl4j-1.6.2.jar:../../lib/jbossws-common-2.1.1.Final.jar:../../lib/cxf-tools-wsdlto-databinding-jaxb-2.6.4.jar:../../lib/jcip-annotations-1.0.jar:../../lib/cxf-rt-bindings-xml-2.6.4.jar:../../lib/commons-lang-2.4.jar:../../lib/cxf-xjc-ts-2.6.0.jar:../../lib/commons-io-1.4.jar:../../lib/neethi-3.0.2.jar:../../lib/commons-httpcli!
ent-3.1.jar:../../lib/cxf-rt-ws-addr-2.6.4.jar:../../lib/opencsv-1.8.jar:../../lib/cxf-xjc-boolean-2.6.0.jar:../../lib/javassist-3.10.0.GA.jar:../../lib/cxf-tools-wsdlto-core-2.6.4.jar:../../lib/dtdparser-1.21.jar:../../lib/jboss-jaxb-api_2.2_spec-1.0.3.Final.jar:../../lib/wise-core-2.0.3.Final.jar:../../lib/jbossws-api-1.0.1.Final.jar:../../lib/jboss-jaxws-api_2.2_spec-2.0.0.Final.jar:../../lib/cxf-rt-bindings-soap-2.6.4.jar:../../lib/jbossws-cxf-factories-4.1.1.Final.jar:../../lib/commons-collections-3.2.1.jar:../../lib/commons-codec-1.2.jar:../../lib/jaxb-xjc-2.2.5.jar:../../lib/xpp3_min-1.1.3.4.O.jar:../../lib/xml-resolver-1.2.jar:../../lib/jboss-servlet-api_3.0_spec-1.0.0.Final.jar:../../lib/jbossws-cxf-client-4.1.1.Final.jar:../../lib/cxf-tools-validator-2.6.4.jar:../../lib/cxf-rt-ws-policy-2.6.4.jar:../../lib/milyn-commons-1.2.1.jar:../../lib/milyn-smooks-core-1.2.1.jar:../../lib/jaxb-impl-2.2.5.jar:../../lib/jsr181-api-1.0-MR1.jar:../../lib/xmlschema-core-2.0.3.jar:!
../../lib/milyn-smooks-validation-1.2.1.jar:../../lib/milyn-sm!
ooks-rul
es-1.2.1.jar:../../lib/milyn-smooks-javabean-1.2.1.jar:../../lib/cxf-tools-wsdlto-frontend-jaxws-2.6.4.jar:../../lib/velocity-1.7.jar:../../lib/mvel2-2.0.9.jar:../../lib/jbossws-common-tools-1.1.0.Final.jar:../../lib/wise-core-cxf-2.0.3.Final.jar:../../lib/cxf-tools-common-2.6.4.jar -d src/client/HelloWorldClosure.groovy
Modified: core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldGroovy/runGroovyJDK7.sh
===================================================================
--- core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldGroovy/runGroovyJDK7.sh 2013-07-05 14:48:21 UTC (rev 585)
+++ core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldGroovy/runGroovyJDK7.sh 2013-07-05 15:10:16 UTC (rev 586)
@@ -1,6 +1,6 @@
#!/bin/sh
#The classpath in the script below is generated using the classPath.groovy script and removing stax-api and asm libraries which are already included in the booclassloader of Groovy (2.1.0)
-groovy -cp ../../lib/xstream-1.2.2.jar:../../lib/cxf-rt-ws-mex-2.6.4.jar:../../lib/cxf-rt-core-2.6.4.jar:../../lib/cxf-rt-transports-http-2.6.4.jar:../../lib/cxf-xjc-dv-2.6.0.jar:../../lib/commons-logging-1.0.4.jar:../../lib/cxf-rt-frontend-jaxws-2.6.4.jar:../../lib/cxf-rt-transports-local-2.6.4.jar:../../lib/cxf-rt-bindings-coloc-2.6.4.jar:../../lib/cxf-rt-frontend-simple-2.6.4.jar:../../lib/log4j-1.2.16.jar:../../lib/cxf-api-2.6.4.jar:../../lib/jboss-saaj-api_1.3_spec-1.0.1.Final.jar:../../lib/jbossws-spi-2.1.1.Final.jar:../../lib/cxf-rt-databinding-jaxb-2.6.4.jar:../../lib/freemarker-2.3.11.jar:../../lib/cxf-rt-bindings-object-2.6.4.jar:../../lib/wsdl4j-1.6.2.jar:../../lib/jbossws-common-2.1.1.Final.jar:../../lib/cxf-tools-wsdlto-databinding-jaxb-2.6.4.jar:../../lib/jcip-annotations-1.0.jar:../../lib/cxf-rt-bindings-xml-2.6.4.jar:../../lib/commons-lang-2.4.jar:../../lib/cxf-xjc-ts-2.6.0.jar:../../lib/commons-io-1.4.jar:../../lib/neethi-3.0.2.jar:../../lib/commons-httpcli!
ent-3.1.jar:../../lib/cxf-rt-ws-addr-2.6.4.jar:../../lib/opencsv-1.8.jar:../../lib/cxf-xjc-boolean-2.6.0.jar:../../lib/javassist-3.10.0.GA.jar:../../lib/cxf-tools-wsdlto-core-2.6.4.jar:../../lib/dtdparser-1.21.jar:../../lib/jboss-jaxb-api_2.2_spec-1.0.3.Final.jar:../../lib/wise-core-2.0.1.Final.jar:../../lib/jbossws-api-1.0.1.Final.jar:../../lib/jboss-jaxws-api_2.2_spec-2.0.0.Final.jar:../../lib/cxf-rt-bindings-soap-2.6.4.jar:../../lib/jbossws-cxf-factories-4.1.1.Final.jar:../../lib/commons-collections-3.2.1.jar:../../lib/commons-codec-1.2.jar:../../lib/jaxb-xjc-2.2.5.jar:../../lib/xpp3_min-1.1.3.4.O.jar:../../lib/xml-resolver-1.2.jar:../../lib/jboss-servlet-api_3.0_spec-1.0.0.Final.jar:../../lib/jbossws-cxf-client-4.1.1.Final.jar:../../lib/cxf-tools-validator-2.6.4.jar:../../lib/cxf-rt-ws-policy-2.6.4.jar:../../lib/milyn-commons-1.2.1.jar:../../lib/milyn-smooks-core-1.2.1.jar:../../lib/jaxb-impl-2.2.5.jar:../../lib/jsr181-api-1.0-MR1.jar:../../lib/xmlschema-core-2.0.3.jar:!
../../lib/milyn-smooks-validation-1.2.1.jar:../../lib/milyn-sm!
ooks-rul
es-1.2.1.jar:../../lib/milyn-smooks-javabean-1.2.1.jar:../../lib/cxf-tools-wsdlto-frontend-jaxws-2.6.4.jar:../../lib/velocity-1.7.jar:../../lib/mvel2-2.0.9.jar:../../lib/jbossws-common-tools-1.1.0.Final.jar:../../lib/wise-core-cxf-2.0.1.Final.jar:../../lib/cxf-tools-common-2.6.4.jar -d src/client/HelloWorldClient.groovy
+groovy -cp ../../lib/xstream-1.2.2.jar:../../lib/cxf-rt-ws-mex-2.6.4.jar:../../lib/cxf-rt-core-2.6.4.jar:../../lib/cxf-rt-transports-http-2.6.4.jar:../../lib/cxf-xjc-dv-2.6.0.jar:../../lib/commons-logging-1.0.4.jar:../../lib/cxf-rt-frontend-jaxws-2.6.4.jar:../../lib/cxf-rt-transports-local-2.6.4.jar:../../lib/cxf-rt-bindings-coloc-2.6.4.jar:../../lib/cxf-rt-frontend-simple-2.6.4.jar:../../lib/log4j-1.2.16.jar:../../lib/cxf-api-2.6.4.jar:../../lib/jboss-saaj-api_1.3_spec-1.0.1.Final.jar:../../lib/jbossws-spi-2.1.1.Final.jar:../../lib/cxf-rt-databinding-jaxb-2.6.4.jar:../../lib/freemarker-2.3.11.jar:../../lib/cxf-rt-bindings-object-2.6.4.jar:../../lib/wsdl4j-1.6.2.jar:../../lib/jbossws-common-2.1.1.Final.jar:../../lib/cxf-tools-wsdlto-databinding-jaxb-2.6.4.jar:../../lib/jcip-annotations-1.0.jar:../../lib/cxf-rt-bindings-xml-2.6.4.jar:../../lib/commons-lang-2.4.jar:../../lib/cxf-xjc-ts-2.6.0.jar:../../lib/commons-io-1.4.jar:../../lib/neethi-3.0.2.jar:../../lib/commons-httpcli!
ent-3.1.jar:../../lib/cxf-rt-ws-addr-2.6.4.jar:../../lib/opencsv-1.8.jar:../../lib/cxf-xjc-boolean-2.6.0.jar:../../lib/javassist-3.10.0.GA.jar:../../lib/cxf-tools-wsdlto-core-2.6.4.jar:../../lib/dtdparser-1.21.jar:../../lib/jboss-jaxb-api_2.2_spec-1.0.3.Final.jar:../../lib/wise-core-2.0.3.Final.jar:../../lib/jbossws-api-1.0.1.Final.jar:../../lib/jboss-jaxws-api_2.2_spec-2.0.0.Final.jar:../../lib/cxf-rt-bindings-soap-2.6.4.jar:../../lib/jbossws-cxf-factories-4.1.1.Final.jar:../../lib/commons-collections-3.2.1.jar:../../lib/commons-codec-1.2.jar:../../lib/jaxb-xjc-2.2.5.jar:../../lib/xpp3_min-1.1.3.4.O.jar:../../lib/xml-resolver-1.2.jar:../../lib/jboss-servlet-api_3.0_spec-1.0.0.Final.jar:../../lib/jbossws-cxf-client-4.1.1.Final.jar:../../lib/cxf-tools-validator-2.6.4.jar:../../lib/cxf-rt-ws-policy-2.6.4.jar:../../lib/milyn-commons-1.2.1.jar:../../lib/milyn-smooks-core-1.2.1.jar:../../lib/jaxb-impl-2.2.5.jar:../../lib/jsr181-api-1.0-MR1.jar:../../lib/xmlschema-core-2.0.3.jar:!
../../lib/milyn-smooks-validation-1.2.1.jar:../../lib/milyn-sm!
ooks-rul
es-1.2.1.jar:../../lib/milyn-smooks-javabean-1.2.1.jar:../../lib/cxf-tools-wsdlto-frontend-jaxws-2.6.4.jar:../../lib/velocity-1.7.jar:../../lib/mvel2-2.0.9.jar:../../lib/jbossws-common-tools-1.1.0.Final.jar:../../lib/wise-core-cxf-2.0.3.Final.jar:../../lib/cxf-tools-common-2.6.4.jar -d src/client/HelloWorldClient.groovy
Modified: core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldRuby/runJRubyClosuresJDK7.sh
===================================================================
--- core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldRuby/runJRubyClosuresJDK7.sh 2013-07-05 14:48:21 UTC (rev 585)
+++ core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldRuby/runJRubyClosuresJDK7.sh 2013-07-05 15:10:16 UTC (rev 586)
@@ -1,3 +1,3 @@
#!/bin/sh
-export CLASSPATH=../../lib/xstream-1.2.2.jar:../../lib/cxf-rt-ws-mex-2.6.4.jar:../../lib/cxf-rt-core-2.6.4.jar:../../lib/cxf-rt-transports-http-2.6.4.jar:../../lib/cxf-xjc-dv-2.6.0.jar:../../lib/commons-logging-1.0.4.jar:../../lib/cxf-rt-frontend-jaxws-2.6.4.jar:../../lib/cxf-rt-transports-local-2.6.4.jar:../../lib/cxf-rt-bindings-coloc-2.6.4.jar:../../lib/cxf-rt-frontend-simple-2.6.4.jar:../../lib/log4j-1.2.16.jar:../../lib/cxf-api-2.6.4.jar:../../lib/jboss-saaj-api_1.3_spec-1.0.1.Final.jar:../../lib/jbossws-spi-2.1.1.Final.jar:../../lib/cxf-rt-databinding-jaxb-2.6.4.jar:../../lib/freemarker-2.3.11.jar:../../lib/cxf-rt-bindings-object-2.6.4.jar:../../lib/wsdl4j-1.6.2.jar:../../lib/jbossws-common-2.1.1.Final.jar:../../lib/cxf-tools-wsdlto-databinding-jaxb-2.6.4.jar:../../lib/jcip-annotations-1.0.jar:../../lib/cxf-rt-bindings-xml-2.6.4.jar:../../lib/commons-lang-2.4.jar:../../lib/cxf-xjc-ts-2.6.0.jar:../../lib/commons-io-1.4.jar:../../lib/neethi-3.0.2.jar:../../lib/commons-h!
ttpclient-3.1.jar:../../lib/cxf-rt-ws-addr-2.6.4.jar:../../lib/opencsv-1.8.jar:../../lib/cxf-xjc-boolean-2.6.0.jar:../../lib/javassist-3.10.0.GA.jar:../../lib/cxf-tools-wsdlto-core-2.6.4.jar:../../lib/dtdparser-1.21.jar:../../lib/jboss-jaxb-api_2.2_spec-1.0.3.Final.jar:../../lib/wise-core-2.0.1.Final.jar:../../lib/jbossws-api-1.0.1.Final.jar:../../lib/jboss-jaxws-api_2.2_spec-2.0.0.Final.jar:../../lib/cxf-rt-bindings-soap-2.6.4.jar:../../lib/jbossws-cxf-factories-4.1.1.Final.jar:../../lib/commons-collections-3.2.1.jar:../../lib/commons-codec-1.2.jar:../../lib/jaxb-xjc-2.2.5.jar:../../lib/xpp3_min-1.1.3.4.O.jar:../../lib/xml-resolver-1.2.jar:../../lib/jboss-servlet-api_3.0_spec-1.0.0.Final.jar:../../lib/jbossws-cxf-client-4.1.1.Final.jar:../../lib/cxf-tools-validator-2.6.4.jar:../../lib/cxf-rt-ws-policy-2.6.4.jar:../../lib/milyn-commons-1.2.1.jar:../../lib/milyn-smooks-core-1.2.1.jar:../../lib/jaxb-impl-2.2.5.jar:../../lib/jsr181-api-1.0-MR1.jar:../../lib/xmlschema-core-2.0.!
3.jar:../../lib/milyn-smooks-validation-1.2.1.jar:../../lib/mi!
lyn-smoo
ks-rules-1.2.1.jar:../../lib/milyn-smooks-javabean-1.2.1.jar:../../lib/cxf-tools-wsdlto-frontend-jaxws-2.6.4.jar:../../lib/velocity-1.7.jar:../../lib/mvel2-2.0.9.jar:../../lib/jbossws-common-tools-1.1.0.Final.jar:../../lib/wise-core-cxf-2.0.1.Final.jar:../../lib/cxf-tools-common-2.6.4.jar:$JAVA_HOME/lib/tools.jar
+export CLASSPATH=../../lib/xstream-1.2.2.jar:../../lib/cxf-rt-ws-mex-2.6.4.jar:../../lib/cxf-rt-core-2.6.4.jar:../../lib/cxf-rt-transports-http-2.6.4.jar:../../lib/cxf-xjc-dv-2.6.0.jar:../../lib/commons-logging-1.0.4.jar:../../lib/cxf-rt-frontend-jaxws-2.6.4.jar:../../lib/cxf-rt-transports-local-2.6.4.jar:../../lib/cxf-rt-bindings-coloc-2.6.4.jar:../../lib/cxf-rt-frontend-simple-2.6.4.jar:../../lib/log4j-1.2.16.jar:../../lib/cxf-api-2.6.4.jar:../../lib/jboss-saaj-api_1.3_spec-1.0.1.Final.jar:../../lib/jbossws-spi-2.1.1.Final.jar:../../lib/cxf-rt-databinding-jaxb-2.6.4.jar:../../lib/freemarker-2.3.11.jar:../../lib/cxf-rt-bindings-object-2.6.4.jar:../../lib/wsdl4j-1.6.2.jar:../../lib/jbossws-common-2.1.1.Final.jar:../../lib/cxf-tools-wsdlto-databinding-jaxb-2.6.4.jar:../../lib/jcip-annotations-1.0.jar:../../lib/cxf-rt-bindings-xml-2.6.4.jar:../../lib/commons-lang-2.4.jar:../../lib/cxf-xjc-ts-2.6.0.jar:../../lib/commons-io-1.4.jar:../../lib/neethi-3.0.2.jar:../../lib/commons-h!
ttpclient-3.1.jar:../../lib/cxf-rt-ws-addr-2.6.4.jar:../../lib/opencsv-1.8.jar:../../lib/cxf-xjc-boolean-2.6.0.jar:../../lib/javassist-3.10.0.GA.jar:../../lib/cxf-tools-wsdlto-core-2.6.4.jar:../../lib/dtdparser-1.21.jar:../../lib/jboss-jaxb-api_2.2_spec-1.0.3.Final.jar:../../lib/wise-core-2.0.3.Final.jar:../../lib/jbossws-api-1.0.1.Final.jar:../../lib/jboss-jaxws-api_2.2_spec-2.0.0.Final.jar:../../lib/cxf-rt-bindings-soap-2.6.4.jar:../../lib/jbossws-cxf-factories-4.1.1.Final.jar:../../lib/commons-collections-3.2.1.jar:../../lib/commons-codec-1.2.jar:../../lib/jaxb-xjc-2.2.5.jar:../../lib/xpp3_min-1.1.3.4.O.jar:../../lib/xml-resolver-1.2.jar:../../lib/jboss-servlet-api_3.0_spec-1.0.0.Final.jar:../../lib/jbossws-cxf-client-4.1.1.Final.jar:../../lib/cxf-tools-validator-2.6.4.jar:../../lib/cxf-rt-ws-policy-2.6.4.jar:../../lib/milyn-commons-1.2.1.jar:../../lib/milyn-smooks-core-1.2.1.jar:../../lib/jaxb-impl-2.2.5.jar:../../lib/jsr181-api-1.0-MR1.jar:../../lib/xmlschema-core-2.0.!
3.jar:../../lib/milyn-smooks-validation-1.2.1.jar:../../lib/mi!
lyn-smoo
ks-rules-1.2.1.jar:../../lib/milyn-smooks-javabean-1.2.1.jar:../../lib/cxf-tools-wsdlto-frontend-jaxws-2.6.4.jar:../../lib/velocity-1.7.jar:../../lib/mvel2-2.0.9.jar:../../lib/jbossws-common-tools-1.1.0.Final.jar:../../lib/wise-core-cxf-2.0.3.Final.jar:../../lib/cxf-tools-common-2.6.4.jar:$JAVA_HOME/lib/tools.jar
jruby src/client/HelloWorldClosure.rb
Modified: core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldRuby/runJRubyJDK7.sh
===================================================================
--- core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldRuby/runJRubyJDK7.sh 2013-07-05 14:48:21 UTC (rev 585)
+++ core/tags/wise-core-2.0.3.Final/distribution/main/resouces/samples/helloWorldRuby/runJRubyJDK7.sh 2013-07-05 15:10:16 UTC (rev 586)
@@ -1,3 +1,3 @@
#!/bin/sh
-export CLASSPATH=../../lib/xstream-1.2.2.jar:../../lib/cxf-rt-ws-mex-2.6.4.jar:../../lib/cxf-rt-core-2.6.4.jar:../../lib/cxf-rt-transports-http-2.6.4.jar:../../lib/cxf-xjc-dv-2.6.0.jar:../../lib/commons-logging-1.0.4.jar:../../lib/cxf-rt-frontend-jaxws-2.6.4.jar:../../lib/cxf-rt-transports-local-2.6.4.jar:../../lib/cxf-rt-bindings-coloc-2.6.4.jar:../../lib/cxf-rt-frontend-simple-2.6.4.jar:../../lib/log4j-1.2.16.jar:../../lib/cxf-api-2.6.4.jar:../../lib/jboss-saaj-api_1.3_spec-1.0.1.Final.jar:../../lib/jbossws-spi-2.1.1.Final.jar:../../lib/cxf-rt-databinding-jaxb-2.6.4.jar:../../lib/freemarker-2.3.11.jar:../../lib/cxf-rt-bindings-object-2.6.4.jar:../../lib/wsdl4j-1.6.2.jar:../../lib/jbossws-common-2.1.1.Final.jar:../../lib/cxf-tools-wsdlto-databinding-jaxb-2.6.4.jar:../../lib/jcip-annotations-1.0.jar:../../lib/cxf-rt-bindings-xml-2.6.4.jar:../../lib/commons-lang-2.4.jar:../../lib/cxf-xjc-ts-2.6.0.jar:../../lib/commons-io-1.4.jar:../../lib/neethi-3.0.2.jar:../../lib/commons-h!
ttpclient-3.1.jar:../../lib/cxf-rt-ws-addr-2.6.4.jar:../../lib/opencsv-1.8.jar:../../lib/cxf-xjc-boolean-2.6.0.jar:../../lib/javassist-3.10.0.GA.jar:../../lib/cxf-tools-wsdlto-core-2.6.4.jar:../../lib/dtdparser-1.21.jar:../../lib/jboss-jaxb-api_2.2_spec-1.0.3.Final.jar:../../lib/wise-core-2.0.1.Final.jar:../../lib/jbossws-api-1.0.1.Final.jar:../../lib/jboss-jaxws-api_2.2_spec-2.0.0.Final.jar:../../lib/cxf-rt-bindings-soap-2.6.4.jar:../../lib/jbossws-cxf-factories-4.1.1.Final.jar:../../lib/commons-collections-3.2.1.jar:../../lib/commons-codec-1.2.jar:../../lib/jaxb-xjc-2.2.5.jar:../../lib/xpp3_min-1.1.3.4.O.jar:../../lib/xml-resolver-1.2.jar:../../lib/jboss-servlet-api_3.0_spec-1.0.0.Final.jar:../../lib/jbossws-cxf-client-4.1.1.Final.jar:../../lib/cxf-tools-validator-2.6.4.jar:../../lib/cxf-rt-ws-policy-2.6.4.jar:../../lib/milyn-commons-1.2.1.jar:../../lib/milyn-smooks-core-1.2.1.jar:../../lib/jaxb-impl-2.2.5.jar:../../lib/jsr181-api-1.0-MR1.jar:../../lib/xmlschema-core-2.0.!
3.jar:../../lib/milyn-smooks-validation-1.2.1.jar:../../lib/mi!
lyn-smoo
ks-rules-1.2.1.jar:../../lib/milyn-smooks-javabean-1.2.1.jar:../../lib/cxf-tools-wsdlto-frontend-jaxws-2.6.4.jar:../../lib/velocity-1.7.jar:../../lib/mvel2-2.0.9.jar:../../lib/jbossws-common-tools-1.1.0.Final.jar:../../lib/wise-core-cxf-2.0.1.Final.jar:../../lib/cxf-tools-common-2.6.4.jar:$JAVA_HOME/lib/tools.jar
+export CLASSPATH=../../lib/xstream-1.2.2.jar:../../lib/cxf-rt-ws-mex-2.6.4.jar:../../lib/cxf-rt-core-2.6.4.jar:../../lib/cxf-rt-transports-http-2.6.4.jar:../../lib/cxf-xjc-dv-2.6.0.jar:../../lib/commons-logging-1.0.4.jar:../../lib/cxf-rt-frontend-jaxws-2.6.4.jar:../../lib/cxf-rt-transports-local-2.6.4.jar:../../lib/cxf-rt-bindings-coloc-2.6.4.jar:../../lib/cxf-rt-frontend-simple-2.6.4.jar:../../lib/log4j-1.2.16.jar:../../lib/cxf-api-2.6.4.jar:../../lib/jboss-saaj-api_1.3_spec-1.0.1.Final.jar:../../lib/jbossws-spi-2.1.1.Final.jar:../../lib/cxf-rt-databinding-jaxb-2.6.4.jar:../../lib/freemarker-2.3.11.jar:../../lib/cxf-rt-bindings-object-2.6.4.jar:../../lib/wsdl4j-1.6.2.jar:../../lib/jbossws-common-2.1.1.Final.jar:../../lib/cxf-tools-wsdlto-databinding-jaxb-2.6.4.jar:../../lib/jcip-annotations-1.0.jar:../../lib/cxf-rt-bindings-xml-2.6.4.jar:../../lib/commons-lang-2.4.jar:../../lib/cxf-xjc-ts-2.6.0.jar:../../lib/commons-io-1.4.jar:../../lib/neethi-3.0.2.jar:../../lib/commons-h!
ttpclient-3.1.jar:../../lib/cxf-rt-ws-addr-2.6.4.jar:../../lib/opencsv-1.8.jar:../../lib/cxf-xjc-boolean-2.6.0.jar:../../lib/javassist-3.10.0.GA.jar:../../lib/cxf-tools-wsdlto-core-2.6.4.jar:../../lib/dtdparser-1.21.jar:../../lib/jboss-jaxb-api_2.2_spec-1.0.3.Final.jar:../../lib/wise-core-2.0.3.Final.jar:../../lib/jbossws-api-1.0.1.Final.jar:../../lib/jboss-jaxws-api_2.2_spec-2.0.0.Final.jar:../../lib/cxf-rt-bindings-soap-2.6.4.jar:../../lib/jbossws-cxf-factories-4.1.1.Final.jar:../../lib/commons-collections-3.2.1.jar:../../lib/commons-codec-1.2.jar:../../lib/jaxb-xjc-2.2.5.jar:../../lib/xpp3_min-1.1.3.4.O.jar:../../lib/xml-resolver-1.2.jar:../../lib/jboss-servlet-api_3.0_spec-1.0.0.Final.jar:../../lib/jbossws-cxf-client-4.1.1.Final.jar:../../lib/cxf-tools-validator-2.6.4.jar:../../lib/cxf-rt-ws-policy-2.6.4.jar:../../lib/milyn-commons-1.2.1.jar:../../lib/milyn-smooks-core-1.2.1.jar:../../lib/jaxb-impl-2.2.5.jar:../../lib/jsr181-api-1.0-MR1.jar:../../lib/xmlschema-core-2.0.!
3.jar:../../lib/milyn-smooks-validation-1.2.1.jar:../../lib/mi!
lyn-smoo
ks-rules-1.2.1.jar:../../lib/milyn-smooks-javabean-1.2.1.jar:../../lib/cxf-tools-wsdlto-frontend-jaxws-2.6.4.jar:../../lib/velocity-1.7.jar:../../lib/mvel2-2.0.9.jar:../../lib/jbossws-common-tools-1.1.0.Final.jar:../../lib/wise-core-cxf-2.0.3.Final.jar:../../lib/cxf-tools-common-2.6.4.jar:$JAVA_HOME/lib/tools.jar
jruby src/client/HelloWorldClient.rb
Modified: core/tags/wise-core-2.0.3.Final/distribution/pom.xml
===================================================================
--- core/tags/wise-core-2.0.3.Final/distribution/pom.xml 2013-07-05 14:48:21 UTC (rev 585)
+++ core/tags/wise-core-2.0.3.Final/distribution/pom.xml 2013-07-05 15:10:16 UTC (rev 586)
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-distribution</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.0.3.Final</version>
<name>Wise Distribution</name>
<url>http://www.jboss.org/wise</url>
@@ -11,7 +11,7 @@
<parent>
<groupId>org.jboss.wise</groupId>
<artifactId>wise</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.0.3.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/tags/wise-core-2.0.3.Final/integration-testsuite/common/pom.xml
===================================================================
--- core/tags/wise-core-2.0.3.Final/integration-testsuite/common/pom.xml 2013-07-05 14:48:21 UTC (rev 585)
+++ core/tags/wise-core-2.0.3.Final/integration-testsuite/common/pom.xml 2013-07-05 15:10:16 UTC (rev 586)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-integration-testsuite</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.0.3.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/tags/wise-core-2.0.3.Final/integration-testsuite/cxf/pom.xml
===================================================================
--- core/tags/wise-core-2.0.3.Final/integration-testsuite/cxf/pom.xml 2013-07-05 14:48:21 UTC (rev 585)
+++ core/tags/wise-core-2.0.3.Final/integration-testsuite/cxf/pom.xml 2013-07-05 15:10:16 UTC (rev 586)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-integration-testsuite</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.0.3.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/tags/wise-core-2.0.3.Final/integration-testsuite/pom.xml
===================================================================
--- core/tags/wise-core-2.0.3.Final/integration-testsuite/pom.xml 2013-07-05 14:48:21 UTC (rev 585)
+++ core/tags/wise-core-2.0.3.Final/integration-testsuite/pom.xml 2013-07-05 15:10:16 UTC (rev 586)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.wise</groupId>
<artifactId>wise</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.0.3.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/tags/wise-core-2.0.3.Final/pom.xml
===================================================================
--- core/tags/wise-core-2.0.3.Final/pom.xml 2013-07-05 14:48:21 UTC (rev 585)
+++ core/tags/wise-core-2.0.3.Final/pom.xml 2013-07-05 15:10:16 UTC (rev 586)
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.wise</groupId>
<artifactId>wise</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.0.3.Final</version>
<name>Wise</name>
<description>Wise Core</description>
<url>http://www.jboss.org/wise</url>
@@ -28,9 +28,9 @@
<packaging>pom</packaging>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/wise/core/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/wise/core/trunk</developerConnection>
- <url>http://fisheye.jboss.org/viewrep/Wise/core/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/wise/core/tags/wise-core-2.0.3.Final</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/wise/core/tags/wise-core-2.0.3.Final</developerConnection>
+ <url>http://fisheye.jboss.org/viewrep/Wise/core/tags/wise-core-2.0.3.Final</url>
</scm>
<developers>
11 years, 6 months
- 1
- 0
wise SVN: r585 - core/tags.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-05 10:48:21 -0400 (Fri, 05 Jul 2013)
New Revision: 585
Added:
core/tags/wise-core-2.0.3.Final/
Log:
Tagging wise-core-2.0.3.Final
11 years, 6 months
- 1
- 0
wise SVN: r584 - in core/trunk/integration-testsuite/common: src/test/java/org/jboss/wise/test/integration and 4 other directories.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-05 08:53:28 -0400 (Fri, 05 Jul 2013)
New Revision: 584
Added:
core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/
core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/DataQuery.java
core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/Endpoint.java
core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/EndpointImpl.java
core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/EndpointService.wsdl
core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/ObjectFactory.java
core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/XmlJavaTypeAdapterIntegrationTest.java
core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/package-info.java
core/trunk/integration-testsuite/common/src/test/resources/WEB-INF/adapter/
core/trunk/integration-testsuite/common/src/test/resources/WEB-INF/adapter/web.xml
core/trunk/integration-testsuite/common/src/test/resources/WEB-INF/adapter/wsdl/
core/trunk/integration-testsuite/common/src/test/resources/WEB-INF/adapter/wsdl/EndpointService.wsdl
Modified:
core/trunk/integration-testsuite/common/pom.xml
Log:
Adding testcase using a wsdl causing Wise to fail; turned out to be a CXF bug, hence excluding the test for now.
[CXF-5110] Wrong processing of @XmlJavaTypeAdapter with RPC style endpoints
Modified: core/trunk/integration-testsuite/common/pom.xml
===================================================================
--- core/trunk/integration-testsuite/common/pom.xml 2013-07-05 12:46:14 UTC (rev 583)
+++ core/trunk/integration-testsuite/common/pom.xml 2013-07-05 12:53:28 UTC (rev 584)
@@ -134,6 +134,40 @@
</configuration>
</execution>
<execution>
+ <id>war-it-adapter</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <configuration>
+ <webXml>${basedir}/src/test/resources/WEB-INF/adapter/web.xml</webXml>
+ <warName>adapter</warName>
+ <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ <webappDirectory>${project.build.directory}/adapter</webappDirectory>
+ <warSourceExcludes>**/lib/**</warSourceExcludes>
+ <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+ <webResources>
+ <webResource>
+ <targetPath>WEB-INF/classes</targetPath>
+ <directory>${basedir}/target/test-classes/</directory>
+ <includes>
+ <include>**/adapter/*.class</include>
+ </includes>
+ <excludes>
+ <exclude>**/*Test.class</exclude>
+ </excludes>
+ </webResource>
+ <webResource>
+ <targetPath>WEB-INF</targetPath>
+ <directory>${basedir}/src/test/resources/WEB-INF/adapter/</directory>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </webResource>
+ </webResources>
+ </configuration>
+ </execution>
+ <execution>
<id>war-it-complex</id>
<phase>pre-integration-test</phase>
<goals>
Added: core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/DataQuery.java
===================================================================
--- core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/DataQuery.java (rev 0)
+++ core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/DataQuery.java 2013-07-05 12:53:28 UTC (rev 584)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., 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.wise.test.integration.adapter;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for dataQuery complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="dataQuery">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="query" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "dataQuery", propOrder = {
+ "query"
+})
+public class DataQuery {
+
+ protected String query;
+
+ /**
+ * Gets the value of the query property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getQuery() {
+ return query;
+ }
+
+ /**
+ * Sets the value of the query property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setQuery(String value) {
+ this.query = value;
+ }
+
+}
Added: core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/Endpoint.java
===================================================================
--- core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/Endpoint.java (rev 0)
+++ core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/Endpoint.java 2013-07-05 12:53:28 UTC (rev 584)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., 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.wise.test.integration.adapter;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+@WebService(targetNamespace = "http://www.jboss.org/wise/adapter/", name = "Endpoint")
+(a)XmlSeeAlso({ObjectFactory.class})
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface Endpoint {
+
+ @WebResult(name = "mimepart", targetNamespace = "http://www.jboss.org/wise/adapter/", partName = "mimepart")
+ @XmlJavaTypeAdapter(value = HexBinaryAdapter.class)
+ @WebMethod
+ public byte[] getData(
+ @WebParam(partName = "dataQuery", mode = WebParam.Mode.INOUT, name = "dataQuery")
+ javax.xml.ws.Holder<DataQuery> dataQuery
+ );
+}
Added: core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/EndpointImpl.java
===================================================================
--- core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/EndpointImpl.java (rev 0)
+++ core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/EndpointImpl.java 2013-07-05 12:53:28 UTC (rev 584)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., 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.wise.test.integration.adapter;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+@WebService(targetNamespace = "http://www.jboss.org/wise/adapter/",
+ name = "Endpoint",
+ serviceName = "EndpointService",
+ portName = "EndpointPort",
+ endpointInterface = "org.jboss.wise.test.integration.adapter.Endpoint",
+ wsdlLocation = "WEB-INF/wsdl/EndpointService.wsdl")
+public class EndpointImpl implements Endpoint {
+
+ @WebResult(name = "mimepart", targetNamespace = "http://www.jboss.org/wise/adapter/", partName = "mimepart")
+ @XmlJavaTypeAdapter(value = HexBinaryAdapter.class)
+ @WebMethod
+ public byte[] getData(@WebParam(partName = "dataQuery", mode = WebParam.Mode.INOUT, name = "dataQuery") javax.xml.ws.Holder<DataQuery> dataQuery) {
+ return new byte[]{0, 1};
+ }
+}
Added: core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/EndpointService.wsdl
===================================================================
--- core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/EndpointService.wsdl (rev 0)
+++ core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/EndpointService.wsdl 2013-07-05 12:53:28 UTC (rev 584)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="EndpointService" targetNamespace="http://www.jboss.org/wise/adapter/" xmlns:mime='http://schemas.xmlsoap.org/wsdl/mime/' xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.jboss.org/wise/adapter/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:types>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.jboss.org/wise/adapter/">
+ <xs:complexType name="dataQuery">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="query" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+ </wsdl:types>
+ <wsdl:message name="getData">
+ <wsdl:part name="dataQuery" type="tns:dataQuery">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="getDataResponse">
+ <wsdl:part name="mimepart" type="xsd:hexBinary">
+<!-- <wsdl:part name="mimepart" type="xsd:base64Binary">-->
+ </wsdl:part>
+ <wsdl:part name="dataQuery" type="tns:dataQuery">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="Endpoint">
+ <wsdl:operation name="getData" parameterOrder="dataQuery">
+ <wsdl:input name="getData" message="tns:getData">
+ </wsdl:input>
+ <wsdl:output name="getDataResponse" message="tns:getDataResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="EndpointServiceSoapBinding" type="tns:Endpoint">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="getData">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input name="getData">
+ <soap:body use="literal" namespace="http://www.jboss.org/wise/adapter/"/>
+ </wsdl:input>
+ <wsdl:output name="getDataResponse">
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body namespace='http://www.jboss.org/wise/adapter/' use='literal'/>
+ </mime:part>
+ <mime:part>
+ <mime:content part='mimepart' type='multipart/*'/>
+ </mime:part>
+ </mime:multipartRelated>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="EndpointService">
+ <wsdl:port name="EndpointPort" binding="tns:EndpointServiceSoapBinding">
+ <soap:address location="http://localhost:9090/EndpointPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/ObjectFactory.java
===================================================================
--- core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/ObjectFactory.java (rev 0)
+++ core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/ObjectFactory.java 2013-07-05 12:53:28 UTC (rev 584)
@@ -0,0 +1,40 @@
+
+package org.jboss.wise.test.integration.adapter;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.jboss.wise.test.integration.adapter package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.wise.test.integration.adapter
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link DataQuery }
+ *
+ */
+ public DataQuery createDataQuery() {
+ return new DataQuery();
+ }
+
+}
Added: core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/XmlJavaTypeAdapterIntegrationTest.java
===================================================================
--- core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/XmlJavaTypeAdapterIntegrationTest.java (rev 0)
+++ core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/XmlJavaTypeAdapterIntegrationTest.java 2013-07-05 12:53:28 UTC (rev 584)
@@ -0,0 +1,119 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., 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.wise.test.integration.adapter;
+
+import java.io.ByteArrayOutputStream;
+import java.lang.reflect.ParameterizedType;
+import java.net.URL;
+import java.util.Map;
+
+import javax.jws.WebParam;
+import javax.xml.ws.Holder;
+
+import org.jboss.wise.core.client.InvocationResult;
+import org.jboss.wise.core.client.WSDynamicClient;
+import org.jboss.wise.core.client.WSMethod;
+import org.jboss.wise.core.client.WebParameter;
+import org.jboss.wise.core.client.builder.WSDynamicClientBuilder;
+import org.jboss.wise.core.client.factories.WSDynamicClientFactory;
+import org.jboss.wise.core.test.WiseTest;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ *
+ */
+public class XmlJavaTypeAdapterIntegrationTest extends WiseTest {
+
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ @Test
+ @Ignore("[CXF-5110] Wrong processing of @XmlJavaTypeAdapter with RPC style endpoints")
+ public void shouldPreviewRequest() throws Exception {
+ URL wsdlUrl = XmlJavaTypeAdapterIntegrationTest.class.getResource("EndpointService.wsdl");
+ WSDynamicClientBuilder clientBuilder = WSDynamicClientFactory.getJAXWSClientBuilder();
+ WSDynamicClient client = null;
+ try {
+ client = clientBuilder.tmpDir("target/temp/wise").verbose(true).keepSource(true).wsdlURL(wsdlUrl.toString()).build();
+ WSMethod method = client.getWSMethod("EndpointService", "EndpointPort", "getData");
+ Map<String, ? extends WebParameter> pars = method.getWebParams();
+ WebParameter customerPar = pars.get("dataQuery");
+ Assert.assertEquals(WebParam.Mode.INOUT, customerPar.getMode());
+ Assert.assertEquals(Holder.class, (Class<?>) ((ParameterizedType) customerPar.getType()).getRawType());
+ Class<?> dataQueryClass = (Class<?>) ((ParameterizedType) customerPar.getType()).getActualTypeArguments()[0];
+ Object dataQuery = dataQueryClass.newInstance();
+ dataQueryClass.getMethod("setQuery", String.class).invoke(dataQuery, "test this now");
+ Map<String, Object> args = new java.util.HashMap<String, Object>();
+ args.put("dataQuery", new Holder(dataQuery));
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ method.writeRequestPreview(args, bos);
+ Assert.assertTrue(bos.toString().contains("test this now"));
+ } finally {
+ if (client != null) {
+ client.close();
+ }
+ }
+ }
+
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ @Test
+ @Ignore("[CXF-5110] Wrong processing of @XmlJavaTypeAdapter with RPC style endpoints")
+ public void shouldPreviewAndInvoke() throws Exception {
+ URL warUrl = XmlJavaTypeAdapterIntegrationTest.class.getClassLoader().getResource("adapter.war");
+ WSDynamicClientBuilder clientBuilder = WSDynamicClientFactory.getJAXWSClientBuilder();
+ WSDynamicClient client = null;
+ try {
+ deployWS(warUrl);
+ URL wsdlUrl = new URL(getServerHostAndPort() + "/adapter/Endpoint?wsdl");
+ client = clientBuilder.tmpDir("target/temp/wise").verbose(true).keepSource(true).wsdlURL(wsdlUrl.toString()).build();
+ WSMethod method = client.getWSMethod("EndpointService", "EndpointPort", "getData");
+ Map<String, ? extends WebParameter> pars = method.getWebParams();
+ WebParameter customerPar = pars.get("dataQuery");
+ Assert.assertEquals(WebParam.Mode.INOUT, customerPar.getMode());
+ Assert.assertEquals(Holder.class, (Class<?>) ((ParameterizedType) customerPar.getType()).getRawType());
+ Class<?> dataQueryClass = (Class<?>) ((ParameterizedType) customerPar.getType()).getActualTypeArguments()[0];
+ Object dataQuery = dataQueryClass.newInstance();
+ dataQueryClass.getMethod("setQuery", String.class).invoke(dataQuery, "test this now");
+ Map<String, Object> args = new java.util.HashMap<String, Object>();
+ args.put("dataQuery", new Holder(dataQuery));
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ method.writeRequestPreview(args, bos);
+ Assert.assertTrue(bos.toString().contains("test this now"));
+
+ InvocationResult result = method.invoke(args);
+ Map<String, Object> res = result.getMapRequestAndResult(null, null);
+ Map<String, Object> test = (Map<String, Object>) res.get("results");
+ Assert.assertEquals(byte[].class, test.get("type.result"));
+ byte[] bytes = (byte[])test.get("result");
+ Assert.assertNotNull(bytes);
+ Assert.assertEquals(2, bytes.length);
+ Assert.assertEquals(0, bytes[0]);
+ Assert.assertEquals(1, bytes[1]);
+ } finally {
+ if (client != null) {
+ client.close();
+ }
+ }
+ }
+}
Added: core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/package-info.java
===================================================================
--- core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/package-info.java (rev 0)
+++ core/trunk/integration-testsuite/common/src/test/java/org/jboss/wise/test/integration/adapter/package-info.java 2013-07-05 12:53:28 UTC (rev 584)
@@ -0,0 +1,2 @@
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/wise/adapter/")
+package org.jboss.wise.test.integration.adapter;
Added: core/trunk/integration-testsuite/common/src/test/resources/WEB-INF/adapter/web.xml
===================================================================
--- core/trunk/integration-testsuite/common/src/test/resources/WEB-INF/adapter/web.xml (rev 0)
+++ core/trunk/integration-testsuite/common/src/test/resources/WEB-INF/adapter/web.xml 2013-07-05 12:53:28 UTC (rev 584)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>EndpointServlet</servlet-name>
+ <servlet-class>org.jboss.wise.test.integration.adapter.EndpointImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>EndpointServlet</servlet-name>
+ <url-pattern>/Endpoint</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: core/trunk/integration-testsuite/common/src/test/resources/WEB-INF/adapter/wsdl/EndpointService.wsdl
===================================================================
--- core/trunk/integration-testsuite/common/src/test/resources/WEB-INF/adapter/wsdl/EndpointService.wsdl (rev 0)
+++ core/trunk/integration-testsuite/common/src/test/resources/WEB-INF/adapter/wsdl/EndpointService.wsdl 2013-07-05 12:53:28 UTC (rev 584)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="EndpointService" targetNamespace="http://www.jboss.org/wise/adapter/" xmlns:mime='http://schemas.xmlsoap.org/wsdl/mime/' xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.jboss.org/wise/adapter/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:types>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.jboss.org/wise/adapter/">
+ <xs:complexType name="dataQuery">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="query" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+ </wsdl:types>
+ <wsdl:message name="getData">
+ <wsdl:part name="dataQuery" type="tns:dataQuery">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="getDataResponse">
+ <wsdl:part name="mimepart" type="xsd:hexBinary">
+ </wsdl:part>
+ <wsdl:part name="dataQuery" type="tns:dataQuery">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="Endpoint">
+ <wsdl:operation name="getData" parameterOrder="dataQuery">
+ <wsdl:input name="getData" message="tns:getData">
+ </wsdl:input>
+ <wsdl:output name="getDataResponse" message="tns:getDataResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="EndpointServiceSoapBinding" type="tns:Endpoint">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="getData">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input name="getData">
+ <soap:body use="literal" namespace="http://www.jboss.org/wise/adapter/"/>
+ </wsdl:input>
+ <wsdl:output name="getDataResponse">
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body namespace='http://www.jboss.org/wise/adapter/' use='literal'/>
+ </mime:part>
+ <mime:part>
+ <mime:content part='mimepart' type='multipart/*'/>
+ </mime:part>
+ </mime:multipartRelated>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="EndpointService">
+ <wsdl:port name="EndpointPort" binding="tns:EndpointServiceSoapBinding">
+ <soap:address location="http://localhost:9090/EndpointPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
11 years, 6 months
- 1
- 0
wise SVN: r583 - in core/trunk: integration-testsuite and 1 other directory.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-05 08:46:14 -0400 (Fri, 05 Jul 2013)
New Revision: 583
Modified:
core/trunk/integration-testsuite/pom.xml
core/trunk/pom.xml
Log:
Adding javax.mail:mail to test dependencies
Modified: core/trunk/integration-testsuite/pom.xml
===================================================================
--- core/trunk/integration-testsuite/pom.xml 2013-07-04 12:28:40 UTC (rev 582)
+++ core/trunk/integration-testsuite/pom.xml 2013-07-05 12:46:14 UTC (rev 583)
@@ -39,6 +39,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
<scope>test</scope>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2013-07-04 12:28:40 UTC (rev 582)
+++ core/trunk/pom.xml 2013-07-05 12:46:14 UTC (rev 583)
@@ -59,7 +59,7 @@
<compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
<checkstyle.extension />
<milyn.version>1.2.1</milyn.version>
- <!-- Following should stay in synch with the one used within the jbossws-cxf being pulled in wise-core-cxf -->
+ <!-- Following must stay in synch with the one used within the jbossws-cxf being pulled in wise-core-cxf -->
<cxf.version>2.6.4</cxf.version>
<jaxb.impl.version>2.2.5</jaxb.impl.version>
<!-- -->
@@ -277,6 +277,12 @@
<artifactId>log4j</artifactId>
<version>1.2.16</version>
</dependency>
+
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.5</version>
+ </dependency>
<dependency>
<groupId>xalan</groupId>
11 years, 6 months
- 1
- 0
wise SVN: r582 - in core/trunk/core/src: main/java/org/jboss/wise/core/client/impl/reflection/builder and 1 other directories.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-04 08:28:40 -0400 (Thu, 04 Jul 2013)
New Revision: 582
Added:
core/trunk/core/src/test/java/org/jboss/wise/core/client/WSDLParserTest.java
Modified:
core/trunk/core/src/main/java/org/jboss/wise/core/client/WSDLParser.java
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/builder/ReflectionBasedWSDynamicClientBuilder.java
Log:
[WISE-207] Adding test and fixing issue with locally stored wsdls
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/client/WSDLParser.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/client/WSDLParser.java 2013-07-04 10:28:53 UTC (rev 581)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/client/WSDLParser.java 2013-07-04 12:28:40 UTC (rev 582)
@@ -27,6 +27,7 @@
import static org.jboss.wsf.spi.util.StAXUtils.match;
import static org.jboss.wsf.spi.util.StAXUtils.nextElement;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@@ -63,11 +64,18 @@
private static final String TARGET_NAMESPACE = "targetNamespace";
public static Set<String> searchNonSoapServices(String wsdlUrl) throws WiseRuntimeException {
+ URL url;
try {
- return searchNonSoapServices(new URL(wsdlUrl));
- } catch (MalformedURLException mue) {
- throw new WiseRuntimeException(mue);
+ url = new URL(wsdlUrl);
+ } catch (MalformedURLException e) {
+ File file = new File(wsdlUrl);
+ try {
+ url = file.toURI().toURL();
+ } catch (MalformedURLException mue) {
+ throw new WiseRuntimeException(mue);
+ }
}
+ return searchNonSoapServices(url);
}
public static Set<String> searchNonSoapServices(URL wsdlUrl) throws WiseRuntimeException {
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/builder/ReflectionBasedWSDynamicClientBuilder.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/builder/ReflectionBasedWSDynamicClientBuilder.java 2013-07-04 10:28:53 UTC (rev 581)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/builder/ReflectionBasedWSDynamicClientBuilder.java 2013-07-04 12:28:40 UTC (rev 582)
@@ -293,7 +293,6 @@
: new WSDLResolver(tmpDir);
File wsdlFile = resolver.retrieveWsdlFile(new URL(getWsdlURL()));
String result = wsdlFile.getAbsolutePath();
- logger.info("Main wsdl file stored locally: " + result);
return result;
} catch (Exception e) {
throw new WiseRuntimeException(e);
Added: core/trunk/core/src/test/java/org/jboss/wise/core/client/WSDLParserTest.java
===================================================================
--- core/trunk/core/src/test/java/org/jboss/wise/core/client/WSDLParserTest.java (rev 0)
+++ core/trunk/core/src/test/java/org/jboss/wise/core/client/WSDLParserTest.java 2013-07-04 12:28:40 UTC (rev 582)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., 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.wise.core.client;
+
+import static org.junit.Assert.assertEquals;
+
+import java.net.URL;
+import java.util.Set;
+
+import org.junit.Test;
+
+public class WSDLParserTest {
+
+ @Test
+ public void testParser() throws Exception {
+ URL wsdlURL = Thread.currentThread().getContextClassLoader().getResource("./AddNumbersMultiplePorts.wsdl");
+ Set<String> excludedPorts = WSDLParser.searchNonSoapServices(wsdlURL);
+ assertEquals(1, excludedPorts.size());
+ assertEquals("AddNumbersPortHttp", excludedPorts.iterator().next());
+ }
+}
11 years, 6 months
- 1
- 0
wise SVN: r581 - webgui/trunk/src/main/java/org/jboss/wise/gui/treeElement.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-04 06:28:53 -0400 (Thu, 04 Jul 2013)
New Revision: 581
Modified:
webgui/trunk/src/main/java/org/jboss/wise/gui/treeElement/SimpleWiseTreeElement.java
Log:
Raise preview to 60 chars
Modified: webgui/trunk/src/main/java/org/jboss/wise/gui/treeElement/SimpleWiseTreeElement.java
===================================================================
--- webgui/trunk/src/main/java/org/jboss/wise/gui/treeElement/SimpleWiseTreeElement.java 2013-07-04 10:28:26 UTC (rev 580)
+++ webgui/trunk/src/main/java/org/jboss/wise/gui/treeElement/SimpleWiseTreeElement.java 2013-07-04 10:28:53 UTC (rev 581)
@@ -64,19 +64,19 @@
}
/**
- * This is the same as getValue except only the first 40 characters are
+ * This is the same as getValue except only the first 60 characters are
* considered. This is needed to preview invocation results.
*
- * @return The substring(0,40) of the value
+ * @return The substring(0,60) of the value
*/
public String getShortValue() {
if (getValue() == null) {
return null;
}
- if (getValue().length() <= 40) {
+ if (getValue().length() <= 60) {
return getValue();
}
- return getValue().substring(0, 40) + "...";
+ return getValue().substring(0, 60) + "...";
}
/**
11 years, 6 months
- 1
- 0
wise SVN: r580 - webgui/trunk/src/main/java/org/jboss/wise/gui.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-04 06:28:26 -0400 (Thu, 04 Jul 2013)
New Revision: 580
Modified:
webgui/trunk/src/main/java/org/jboss/wise/gui/ClientConversationBean.java
Log:
[WISE-207] Exclude non-SOAP WSDL ports by default
Modified: webgui/trunk/src/main/java/org/jboss/wise/gui/ClientConversationBean.java
===================================================================
--- webgui/trunk/src/main/java/org/jboss/wise/gui/ClientConversationBean.java 2013-07-04 10:25:51 UTC (rev 579)
+++ webgui/trunk/src/main/java/org/jboss/wise/gui/ClientConversationBean.java 2013-07-04 10:28:26 UTC (rev 580)
@@ -87,7 +87,8 @@
conversation.end();
conversation.begin();
try {
- WSDynamicClientBuilder builder = new ReflectionBasedWSDynamicClientBuilder().verbose(true).messageStream(ps).keepSource(true).maxThreadPoolSize(1);
+ WSDynamicClientBuilder builder = new ReflectionBasedWSDynamicClientBuilder().verbose(true).messageStream(ps)
+ .keepSource(true).excludeNonSOAPPorts(true).maxThreadPoolSize(1);
builder.userName(wsdlUser);
invocationUser = wsdlUser;
builder.password(wsdlPwd);
11 years, 6 months
- 1
- 0
wise SVN: r579 - in core/trunk/core/src: main/java/org/jboss/wise/core/client/builder and 4 other directories.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-04 06:25:51 -0400 (Thu, 04 Jul 2013)
New Revision: 579
Added:
core/trunk/core/src/main/java/org/jboss/wise/core/client/WSDLParser.java
core/trunk/core/src/test/resources/AddNumbersMultiplePorts.wsdl
Modified:
core/trunk/core/src/main/java/org/jboss/wise/core/client/builder/WSDynamicClientBuilder.java
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/WSDynamicClientImpl.java
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/WSServiceImpl.java
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/builder/ReflectionBasedWSDynamicClientBuilder.java
core/trunk/core/src/test/java/org/jboss/wise/core/client/impl/reflection/WSServiceImplTest.java
Log:
[WISE-207] Add option for skipping non-SOAP WSDL ports
Added: core/trunk/core/src/main/java/org/jboss/wise/core/client/WSDLParser.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/client/WSDLParser.java (rev 0)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/client/WSDLParser.java 2013-07-04 10:25:51 UTC (rev 579)
@@ -0,0 +1,200 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., 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.wise.core.client;
+
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import static org.jboss.wsf.spi.util.StAXUtils.attributeAsQName;
+import static org.jboss.wsf.spi.util.StAXUtils.match;
+import static org.jboss.wsf.spi.util.StAXUtils.nextElement;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.jboss.wise.core.exception.WiseRuntimeException;
+import org.jboss.wsf.spi.util.StAXUtils;
+
+
+/**
+ * WSDL parsing utilities
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 04-Jul-2013
+ *
+ */
+public class WSDLParser {
+
+ private static final String WSDL_NS = "http://schemas.xmlsoap.org/wsdl/";
+ private static final String SOAP_NS = "http://schemas.xmlsoap.org/wsdl/soap/";
+ private static final String SOAP12_NS = "http://schemas.xmlsoap.org/wsdl/soap12/";
+ private static final String DEFINITIONS = "definitions";
+ private static final String SERVICE = "service";
+ private static final String PORT = "port";
+ private static final String ADDRESS = "address";
+ private static final String NAME = "name";
+ private static final String TARGET_NAMESPACE = "targetNamespace";
+
+ public static Set<String> searchNonSoapServices(String wsdlUrl) throws WiseRuntimeException {
+ try {
+ return searchNonSoapServices(new URL(wsdlUrl));
+ } catch (MalformedURLException mue) {
+ throw new WiseRuntimeException(mue);
+ }
+ }
+
+ public static Set<String> searchNonSoapServices(URL wsdlUrl) throws WiseRuntimeException {
+ Set<String> excludedPorts = new HashSet<String>();
+ InputStream is = null;
+ try {
+ is = wsdlUrl.openStream();
+ XMLStreamReader xmlr = StAXUtils.createXMLStreamReader(is);
+ parse(xmlr, wsdlUrl, excludedPorts);
+ return excludedPorts;
+ } catch (Exception e) {
+ throw new WiseRuntimeException("Failed to read: " + wsdlUrl, e);
+ } finally {
+ try {
+ if (is != null)
+ is.close();
+ } catch (IOException e) {
+ } // ignore
+ }
+ }
+
+ private static void parse(XMLStreamReader reader, URL wsdlUrl, Set<String> excludedPorts) throws XMLStreamException, WiseRuntimeException
+ {
+ int iterate;
+ try
+ {
+ iterate = reader.nextTag();
+ }
+ catch (XMLStreamException e)
+ {
+ // skip non-tag elements
+ iterate = reader.nextTag();
+ }
+ switch (iterate)
+ {
+ case END_ELEMENT : {
+ // we're done
+ break;
+ }
+ case START_ELEMENT : {
+
+ if (match(reader, WSDL_NS, DEFINITIONS))
+ {
+ String targetNS = reader.getAttributeValue(null, TARGET_NAMESPACE);
+ parseDefinitions(reader, targetNS, wsdlUrl, excludedPorts);
+ }
+ else
+ {
+ throw new WiseRuntimeException("Unexpected element '" + reader.getLocalName() + "' found parsing " + wsdlUrl.toExternalForm());
+ }
+ }
+ }
+ }
+
+ private static void parseDefinitions(XMLStreamReader reader, String targetNS, URL wsdlUrl, Set<String> excludedPorts) throws XMLStreamException, WiseRuntimeException
+ {
+ while (reader.hasNext())
+ {
+ switch (nextElement(reader))
+ {
+ case XMLStreamConstants.END_ELEMENT : {
+ if (match(reader, WSDL_NS, DEFINITIONS))
+ {
+ return;
+ }
+ continue;
+ }
+ case XMLStreamConstants.START_ELEMENT : {
+ if (match(reader, WSDL_NS, SERVICE)) {
+ parseService(reader, targetNS, wsdlUrl, excludedPorts);
+ }
+ continue;
+ }
+ }
+ }
+ throw new WiseRuntimeException("Reached end of XML document unexpectedly: " + wsdlUrl.toExternalForm());
+ }
+
+ private static void parseService(XMLStreamReader reader, String targetNS, URL wsdlUrl, Set<String> excludedPorts) throws XMLStreamException
+ {
+ while (reader.hasNext())
+ {
+ switch (nextElement(reader))
+ {
+ case XMLStreamConstants.END_ELEMENT : {
+ if (match(reader, WSDL_NS, SERVICE))
+ {
+ return;
+ }
+ continue;
+ }
+ case XMLStreamConstants.START_ELEMENT : {
+ if (match(reader, WSDL_NS, PORT)) {
+ QName name = attributeAsQName(reader, null, NAME, targetNS);
+ if(!isSoapPort(reader, wsdlUrl)) {
+ excludedPorts.add(name.getLocalPart());
+ }
+ }
+ continue;
+ }
+ }
+ }
+ throw new WiseRuntimeException("Reached end of XML document unexpectedly: " + wsdlUrl.toExternalForm());
+ }
+
+ private static boolean isSoapPort(XMLStreamReader reader, URL wsdlUrl) throws XMLStreamException
+ {
+ while (reader.hasNext())
+ {
+ switch (nextElement(reader))
+ {
+ case XMLStreamConstants.END_ELEMENT : {
+ if (match(reader, WSDL_NS, PORT))
+ {
+ return false;
+ }
+ continue;
+ }
+ case XMLStreamConstants.START_ELEMENT : {
+ if (match(reader, SOAP_NS, ADDRESS) || match(reader, SOAP12_NS, ADDRESS)) {
+ return true;
+ }
+ continue;
+ }
+ }
+ }
+ throw new WiseRuntimeException("Reached end of XML document unexpectedly: " + wsdlUrl.toExternalForm());
+ }
+
+}
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/client/builder/WSDynamicClientBuilder.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/client/builder/WSDynamicClientBuilder.java 2013-07-03 22:01:47 UTC (rev 578)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/client/builder/WSDynamicClientBuilder.java 2013-07-04 10:25:51 UTC (rev 579)
@@ -151,6 +151,14 @@
* @return {@link WSDynamicClient}
*/
public WSDynamicClientBuilder verbose(boolean bool);
+
+ /**
+ * if it set to true non-SOAP wsdl ports will be excluded
+ *
+ * @param bool
+ * @return {@link WSDynamicClient}
+ */
+ public WSDynamicClientBuilder excludeNonSOAPPorts(boolean exclude);
/**
* Sets the PrintStream to use for status feedback. The simplest example
@@ -192,6 +200,8 @@
public boolean isKeepSource();
public boolean isVerbose();
+
+ public boolean isExcludeNonSOAPPorts();
public PrintStream getMessageStream();
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/WSDynamicClientImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/WSDynamicClientImpl.java 2013-07-03 22:01:47 UTC (rev 578)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/WSDynamicClientImpl.java 2013-07-04 10:25:51 UTC (rev 579)
@@ -23,7 +23,6 @@
import java.io.File;
import java.io.IOException;
-import java.lang.annotation.Annotation;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
@@ -32,6 +31,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.xml.ws.WebServiceClient;
@@ -42,6 +42,7 @@
import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
import org.jboss.wise.core.client.SpiLoader;
+import org.jboss.wise.core.client.WSDLParser;
import org.jboss.wise.core.client.WSDynamicClient;
import org.jboss.wise.core.client.WSEndpoint;
import org.jboss.wise.core.client.WSMethod;
@@ -79,6 +80,8 @@
private final CopyOnWriteArrayList<String> classNames = new CopyOnWriteArrayList<String>();
private final Map<String, WSService> servicesMap = Collections.synchronizedMap(new HashMap<String, WSService>());
+
+ private Set<String> excludedPorts;
private final Smooks smooksInstance;
@@ -129,6 +132,10 @@
throw new WiseRuntimeException("Problem consuming wsdl:" + builder.getWsdlURL(), e);
}
this.initClassLoader(outputDir);
+
+ if (builder.isExcludeNonSOAPPorts()) {
+ excludedPorts = WSDLParser.searchNonSoapServices(builder.getNormalizedWsdlUrl());
+ }
this.processServices();
}
@@ -159,7 +166,7 @@
"Error occurred while setting up classloader for generated class in directory: " + outputDir, e);
}
}
-
+
/**
* {@inheritDoc}
*
@@ -167,16 +174,15 @@
*/
public synchronized Map<String, WSService> processServices() throws IllegalStateException {
ClassLoader oldLoader = SecurityActions.getContextClassLoader();
-
try {
SecurityActions.setContextClassLoader(this.getClassLoader());
for (String className : classNames) {
try {
Class<?> clazz = JavaUtils.loadJavaType(className, this.getClassLoader());
- Annotation annotation = clazz.getAnnotation(WebServiceClient.class);
+ WebServiceClient annotation = clazz.getAnnotation(WebServiceClient.class);
if (annotation != null) {
WSService service = createService(clazz);
- servicesMap.put(((WebServiceClient) annotation).name(), service);
+ servicesMap.put(annotation.name(), service);
}
} catch (Exception e) {
e.printStackTrace();
@@ -193,7 +199,7 @@
}
protected WSService createService(Class<?> clazz) throws InstantiationException, IllegalAccessException {
- return new WSServiceImpl(clazz, this.getClassLoader(), clazz.newInstance(), userName, password, this.maxThreadPoolSize);
+ return new WSServiceImpl(clazz, this.getClassLoader(), clazz.newInstance(), userName, password, excludedPorts, this.maxThreadPoolSize);
}
/**
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/WSServiceImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/WSServiceImpl.java 2013-07-03 22:01:47 UTC (rev 578)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/WSServiceImpl.java 2013-07-04 10:25:51 UTC (rev 579)
@@ -26,6 +26,8 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
+
import javax.xml.ws.WebEndpoint;
import net.jcip.annotations.Immutable;
import net.jcip.annotations.ThreadSafe;
@@ -46,6 +48,7 @@
private final String userName;
private final String password;
private final Map<String, WSEndpoint> endpoints = Collections.synchronizedMap(new HashMap<String, WSEndpoint>());
+ private final Set<String> excludedPorts;
protected final int maxThreadPoolSize;
/**
@@ -61,6 +64,7 @@
Object service,
String userName,
String password,
+ Set<String> excludedPorts,
int maxThreadPoolSize ) {
super();
this.serviceClass = serviceClass;
@@ -68,6 +72,7 @@
this.service = service;
this.userName = userName;
this.password = password;
+ this.excludedPorts = excludedPorts;
endpoints.clear();
this.processEndpoints();
this.maxThreadPoolSize = maxThreadPoolSize;
@@ -89,7 +94,7 @@
for (Method method : this.getServiceClass().getMethods()) {
WebEndpoint annotation = method.getAnnotation(WebEndpoint.class);
- if (annotation != null) {
+ if (annotation != null && (excludedPorts == null || !excludedPorts.contains(annotation.name()))) {
WSEndpoint ep;
try {
if (method.getParameterTypes().length == 0) // required to support JAX-WS 2.1, as you get 2 @WebEndpoint ->
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/builder/ReflectionBasedWSDynamicClientBuilder.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/builder/ReflectionBasedWSDynamicClientBuilder.java 2013-07-03 22:01:47 UTC (rev 578)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/reflection/builder/ReflectionBasedWSDynamicClientBuilder.java 2013-07-04 10:25:51 UTC (rev 579)
@@ -89,6 +89,9 @@
@GuardedBy("this")
private boolean verbose;
+
+ @GuardedBy("this")
+ private boolean excludeNonSoapPorts;
@GuardedBy("this")
private String normalizedWsdlUrl;
@@ -129,14 +132,16 @@
if (this.getMaxThreadPoolSize() < 1) {
throw new IllegalStateException("MaxThreadPoolSize cannot be less than 1");
}
- String wsdlUrl = this.getWsdlURL();
+ final String wsdlUrl = this.getWsdlURL();
+ final String nwu;
if (userName != null || (StringUtils.trimToNull(wsdlUrl) != null && Connection.isLocalAddress(wsdlUrl))) {
- this.setNormalizedWsdlUrl(this.transferWSDL(userName, password, clientSpecificTmpDir));
+ nwu = this.transferWSDL(userName, password, clientSpecificTmpDir);
} else {
- this.setNormalizedWsdlUrl(wsdlUrl);
+ nwu = wsdlUrl;
}
+ this.setNormalizedWsdlUrl(nwu);
- if (this.getNormalizedWsdlUrl() == null || this.getNormalizedWsdlUrl().trim().length() == 0) {
+ if (nwu == null || nwu.trim().length() == 0) {
throw new IllegalStateException("wsdlURL cannot be null");
}
@@ -334,6 +339,15 @@
/**
* {@inheritDoc}
*
+ * @see org.jboss.wise.core.client.builder.WSDynamicClientBuilder#isExcludeNonSOAPPorts()
+ */
+ public synchronized boolean isExcludeNonSOAPPorts() {
+ return this.excludeNonSoapPorts;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
* @see org.jboss.wise.core.client.builder.WSDynamicClientBuilder#keepSource(boolean)
*/
public synchronized WSDynamicClientBuilder keepSource(boolean bool) {
@@ -372,6 +386,16 @@
}
/**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.wise.core.client.builder.WSDynamicClientBuilder#excludeNonSOAPPorts(boolean)
+ */
+ public synchronized WSDynamicClientBuilder excludeNonSOAPPorts(boolean exclude) {
+ this.excludeNonSoapPorts = exclude;
+ return this;
+ }
+
+ /**
* @return normalizedWsdlUrl
*/
public synchronized String getNormalizedWsdlUrl() {
Modified: core/trunk/core/src/test/java/org/jboss/wise/core/client/impl/reflection/WSServiceImplTest.java
===================================================================
--- core/trunk/core/src/test/java/org/jboss/wise/core/client/impl/reflection/WSServiceImplTest.java 2013-07-03 22:01:47 UTC (rev 578)
+++ core/trunk/core/src/test/java/org/jboss/wise/core/client/impl/reflection/WSServiceImplTest.java 2013-07-04 10:25:51 UTC (rev 579)
@@ -53,7 +53,7 @@
@Test
public void shouldProcessEndPoint() throws Exception {
URLClassLoader loader = new URLClassLoader(new URL[] {}, Thread.currentThread().getContextClassLoader());
- WSService service = new WSServiceImpl(WSServiceImplTest.class, loader, this, null, null, 10);
+ WSService service = new WSServiceImpl(WSServiceImplTest.class, loader, this, null, null, null, 10);
Map<String, WSEndpoint> endpoints = service.processEndpoints();
assertThat(endpoints.keySet(), hasItem("EndPoint1"));
assertThat(endpoints.keySet(), hasItem("EndPoint2"));
Added: core/trunk/core/src/test/resources/AddNumbersMultiplePorts.wsdl
===================================================================
--- core/trunk/core/src/test/resources/AddNumbersMultiplePorts.wsdl (rev 0)
+++ core/trunk/core/src/test/resources/AddNumbersMultiplePorts.wsdl 2013-07-04 10:25:51 UTC (rev 579)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definitions name="AddNumbers" targetNamespace="http://duke.example.org" xmlns:tns="http://duke.example.org"
+ xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/">
+ <types>
+ <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://duke.example.org">
+
+ <complexType name="addNumbersResponse">
+ <sequence>
+ <element name="return" type="xsd:int" />
+ </sequence>
+ </complexType>
+ <element name="addNumbersResponse" type="tns:addNumbersResponse" />
+
+ <complexType name="addNumbers">
+ <sequence>
+ <element name="arg0" type="xsd:int" />
+ <element name="arg1" type="xsd:int" />
+ </sequence>
+ </complexType>
+ <element name="addNumbers" type="tns:addNumbers" />
+
+ <element name="AddNumbersFault" type="tns:AddNumbersFault" />
+ <complexType name="AddNumbersFault">
+ <sequence>
+ <element name="faultInfo" type="xsd:string" />
+ <element name="message" type="xsd:string" />
+ </sequence>
+ </complexType>
+ <complexType name="oneWayInt">
+ <sequence>
+ <element name="arg0" type="xsd:int" />
+ </sequence>
+ </complexType>
+ <element name="oneWayInt" type="tns:oneWayInt" />
+ </xsd:schema>
+ </types>
+ <message name="addNumbers">
+ <part name="parameters" element="tns:addNumbers" />
+ </message>
+ <message name="addNumbersResponse">
+ <part name="result" element="tns:addNumbersResponse" />
+ </message>
+ <message name="addNumbersFault">
+ <part name="AddNumbersFault" element="tns:AddNumbersFault" />
+ </message>
+ <message name="oneWayInt">
+ <part name="parameters" element="tns:oneWayInt" />
+ </message>
+ <portType name="AddNumbersPortType">
+ <operation name="addNumbers">
+ <input message="tns:addNumbers" name="add"/>
+ <output message="tns:addNumbersResponse" name="addResponse"/>
+ <fault name="addNumbersFault" message="tns:addNumbersFault"/>
+ </operation>
+ <operation name="oneWayInt">
+ <input message="tns:oneWayInt" />
+ </operation>
+ </portType>
+ <binding name="AddNumbersBinding" type="tns:AddNumbersPortType">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
+ <operation name="addNumbers">
+ <soap:operation soapAction="" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ <fault name="addNumbersFault">
+ <soap:fault name="addNumbersFault" use="literal" />
+ </fault>
+ </operation>
+ <operation name="oneWayInt">
+ <soap:operation soapAction="" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ </operation>
+ </binding>
+ <binding name="AddNumbersBindingHttp" type="tns:AddNumbersPortType">
+ <http:binding verb="POST"/>
+ <operation name="addNumbers">
+ <http:operation location="/AddNumbers"/>
+ <input>
+ <mime:content type="application/x-www-form-urlencoded"/>
+ </input>
+ <output>
+ <mime:mimeXml part="Body"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="AddNumbersService">
+ <port name="AddNumbersPort" binding="tns:AddNumbersBinding">
+ <soap:address location="http://localhost:9090" />
+ </port>
+ <port name="AddNumbersPortHttp" binding="tns:AddNumbersBindingHttp">
+ <http:address location="http://localhost:9090" />
+ </port>
+ </service>
+</definitions>
11 years, 6 months
- 1
- 0