JBossWS SVN: r7221 - stack/cxf/trunk/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-30 03:27:27 -0400 (Fri, 30 May 2008)
New Revision: 7221
Modified:
stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
Log:
framework zip scope is runtime
Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-29 21:57:04 UTC (rev 7220)
+++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-30 07:27:27 UTC (rev 7221)
@@ -78,9 +78,6 @@
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>true</unpack>
- <includes>
- <include>*:jbossws-framework:zip:testsuite</include>
- </includes>
<unpackOptions>
<includes>
<include>ant-import/**</include>
@@ -93,6 +90,15 @@
</includes>
</unpackOptions>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>tests</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>runtime</scope>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:jbossws-framework:zip:testsuite</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file
16 years, 7 months
- 1
- 0
JBossWS SVN: r7220 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-29 17:57:04 -0400 (Thu, 29 May 2008)
New Revision: 7220
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
Log:
Propagate exceptions in WSConsumer impl
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2008-05-29 21:56:18 UTC (rev 7219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2008-05-29 21:57:04 UTC (rev 7220)
@@ -246,7 +246,7 @@
}
// Investigate, why this cannot be thrown
- // throw rte;
+ throw rte;
}
finally
{
16 years, 7 months
- 1
- 0
JBossWS SVN: r7219 - stack/native/trunk/modules/core.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-29 17:56:18 -0400 (Thu, 29 May 2008)
New Revision: 7219
Modified:
stack/native/trunk/modules/core/pom.xml
Log:
Exclude stax-api pulled in by jettison lib
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2008-05-29 21:52:37 UTC (rev 7218)
+++ stack/native/trunk/modules/core/pom.xml 2008-05-29 21:56:18 UTC (rev 7219)
@@ -108,6 +108,12 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
16 years, 7 months
- 1
- 0
JBossWS SVN: r7218 - in framework/trunk: testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-29 17:52:37 -0400 (Thu, 29 May 2008)
New Revision: 7218
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java
Modified:
framework/trunk/framework.iml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
Log:
JBWS-2175: Sort classpath first then delegate to plugin
Modified: framework/trunk/framework.iml
===================================================================
--- framework/trunk/framework.iml 2008-05-29 21:48:21 UTC (rev 7217)
+++ framework/trunk/framework.iml 2008-05-29 21:52:37 UTC (rev 7218)
@@ -4,80 +4,71 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/framework/src/main/etc" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/framework/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/framework/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/framework/src/test/resources" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/etc" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="spi" />
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.1.GA:compile">
+ <library name="M2 Dep: org.jboss.ws:jbossws-common:jar:3.0.0-SNAPSHOT:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/ws/jbossws-common/3.0.0-SNAPSHOT/jbossws-common-3.0.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: tjws:webserver:jar:1.3.3:compile">
+ <library name="M2 Dep: wsdl4j:wsdl4j:jar:1.6.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/tjws/webserver/1.3.3/webserver-1.3.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile">
+ <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: jboss:jboss-common-logging-spi:jar:2.0.4.GA:compile">
+ <library name="M2 Dep: gnu-getopt:getopt:jar:1.0.13:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile">
+ <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: oswego-concurrent:concurrent:jar:1.3.4:compile">
+ <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:compile">
+ <library name="M2 Dep: javax.xml.soap:saaj-api:jar:1.3:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: javax.xml.soap:saaj-api:jar:1.3:compile">
- <CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar!/" />
</CLASSES>
<JAVADOC />
@@ -85,7 +76,7 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: junit:junit:jar:3.8.1:compile">
+ <library name="M2 Dep: junit:junit:jar:3.8.1:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
</CLASSES>
@@ -94,125 +85,118 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: ant:ant-junit:jar:1.6.5:compile">
+ <library name="M2 Dep: wutka-dtdparser:dtdparser121:jar:1.2.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss:jboss-test:jar:1.0.4.GA:compile">
+ <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: apache-xerces:xml-apis:jar:2.7.1:compile">
+ <library name="M2 Dep: javax.xml:jaxrpc-api:jar:1.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/jaxrpc-api/1.1/jaxrpc-api-1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile">
+ <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.ws:jbossws-common:jar:3.0.0-SNAPSHOT:compile">
+ <library name="M2 Dep: javax.xml.ws:jaxws-api:jar:2.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/ws/jbossws-common/3.0.0-SNAPSHOT/jbossws-common-3.0.0-SNAPSHOT.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: jboss:jboss-logging-spi:jar:2.0.3.GA:compile">
+ <library name="M2 Dep: tjws:webserver:jar:1.3.3:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/tjws/webserver/1.3.3/webserver-1.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: wsdl4j:wsdl4j:jar:1.6.1:compile">
+ <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: apache-httpclient:commons-httpclient:jar:2.0.2:compile">
+ <library name="M2 Dep: javax.jws:jsr181-api:jar:1.0-MR1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/jws/jsr181-api/1.0-MR1/jsr181-api-1.0-MR1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
+ <library name="M2 Dep: org.jboss:jbossxb:jar:1.0.0.SP1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/jbossxb/1.0.0.SP1/jbossxb-1.0.0.SP1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:compile">
+ <library name="M2 Dep: jboss.common:jboss-common:jar:1.2.1.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: javax.activation:activation:jar:1.1:compile">
+ <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.microcontainer:jboss-dependency:jar:2.0.0.Beta4:compile">
+ <library name="M2 Dep: org.jboss.ws:jbossws-spi:jar:3.0.0-SNAPSHOT:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta4/jboss-dependency-2.0.0.Beta4.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/ws/jbossws-spi/3.0.0-SNAPSHOT/jbossws-spi-3.0.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/ws/jbossws-spi/3.0.0-SNAPSHOT/jbossws-spi-3.0.0-SNAPSHOT-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile">
+ <library name="M2 Dep: apache-slide:webdavlib:jar:2.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: apache-slide:webdavlib:jar:2.0:compile">
- <CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/apache-slide/webdavlib/2.0/webdavlib-2.0.jar!/" />
</CLASSES>
<JAVADOC />
@@ -220,89 +204,8 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: jboss:jboss-common-core:jar:2.0.4.GA:compile">
+ <library name="M2 Dep: apache-xerces:xercesImpl:jar:2.7.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.microcontainer:jboss-container:jar:2.0.0.Beta4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/microcontainer/jboss-container/2.0.0.Beta4/jboss-container-2.0.0.Beta4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: jboss:jboss-common-logging-log4j:jar:2.0.4.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: wutka-dtdparser:dtdparser121:jar:1.2.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: jboss.profiler.jvmti:jboss-profiler-jvmti:jar:1.0.0.CR5:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss:jbossxb:jar:2.0.0.CR4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: org.jboss:javassist:jar:3.6-beta:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/javassist/3.6-beta/javassist-3.6-beta.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: gnu-getopt:getopt:jar:1.0.13:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: ant:ant:jar:1.6.5:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/ant/ant/1.6.5/ant-1.6.5.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: apache-xerces:xercesImpl:jar:2.7.1:compile">
- <CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar!/" />
</CLASSES>
<JAVADOC />
@@ -310,17 +213,8 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: javax.xml:jaxrpc-api:jar:1.1:compile">
+ <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/jaxrpc-api/1.1/jaxrpc-api-1.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
- <CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
</CLASSES>
<JAVADOC />
@@ -328,23 +222,14 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: org.jboss.microcontainer:jboss-kernel:jar:2.0.0.Beta4:compile">
+ <library name="M2 Dep: javax.activation:activation:jar:1.0.2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta4/jboss-kernel-2.0.0.Beta4.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/activation/activation/1.0.2/activation-1.0.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library name="M2 Dep: javax.xml.ws:jaxws-api:jar:2.1:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
<orderEntryProperties />
</component>
</module>
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2008-05-29 21:52:37 UTC (rev 7218)
@@ -0,0 +1,320 @@
+/*
+ * 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.test.ws.jaxws.smoke.tools;
+
+import org.jboss.wsf.spi.tools.WSContractConsumer;
+import org.jboss.wsf.test.JBossWSTest;
+
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.PrintStream;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class WSConsumerPlugin extends JBossWSTest implements WSConsumerPluginDelegate
+{
+ // Tools delegate. Recreated for every test. See setup(...)
+ WSContractConsumer consumer;
+
+ // common output dir for all tests. Tests need to be executed below 'output/tests'
+ File outputDirectory;
+
+ // default is off
+ boolean toogleMessageOut = Boolean.getBoolean(WSConsumerPlugin.class.getName()+".verbose");
+
+ private File workDirectory;
+
+
+ public WSConsumerPlugin()
+ {
+ // create a new consumer for every test case
+ consumer = WSContractConsumer.newInstance();
+ consumer.setNoCompile(true);
+
+ if (toogleMessageOut)
+ {
+ consumer.setMessageStream(System.out);
+ }
+
+ // shared output directory, we go out of the test-resources directory
+ outputDirectory = createResourceFile("../wsconsume/java");
+ workDirectory = createResourceFile("../work");
+ }
+
+ /**
+ * Specifies the JAX-WS and JAXB binding files to use on import operations.
+ * See http://java.sun.com/webservices/docs/2.0/jaxws/customizations.html
+ */
+ public void testBindingFiles() throws Exception
+ {
+ List<File> files = new ArrayList<File>();
+ files.add(getResourceFile("jaxws/smoke/tools/wsdl/async-binding.xml"));
+
+ consumer.setBindingFiles(files);
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testBindingFiles");
+ consumer.setGenerateSource(true);
+
+ consumeWSDL();
+
+ Class sei = loadEndpointInterface("testBindingFiles");
+
+ boolean containsAsyncOperations = false;
+ for (Method m : sei.getDeclaredMethods())
+ {
+ if (m.getName().equals("echoAsync"))
+ {
+ containsAsyncOperations = true;
+ break;
+ }
+ }
+
+ assertTrue("External binding file was ignored", containsAsyncOperations);
+
+ }
+
+ /**
+ * Sets the OASIS XML Catalog file to use for entity resolution.
+ *
+ */
+ public void testCatalog() throws Exception
+ {
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testCatalog");
+ consumer.setCatalog(getResourceFile("jaxws/smoke/tools/wsdl/jax-ws-catalog.xml"));
+ consumer.setGenerateSource(true);
+ consumer.setOutputDirectory(outputDirectory);
+ consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl").getCanonicalPath());
+ }
+
+ /**
+ * Sets the main output directory. If the directory does not exist, it will be created.
+ *
+ */
+ public void testOutputDirectory() throws Exception
+ {
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testOutputDirectory");
+ consumer.setGenerateSource(true);
+ consumer.setSourceDirectory(new File(workDirectory, "testOutputDirectory/java/"));
+
+ consumeWSDL();
+
+ File sei = new File(workDirectory, "testOutputDirectory/java/org/jboss/test/ws/tools/testOutputDirectory/EndpointInterface.java");
+ assertTrue("Output directory switch ignored", sei.exists());
+ }
+
+ /**
+ * Sets the source directory. This directory will contain any generated Java source.
+ * If the directory does not exist, it will be created. If not specified,
+ * the output directory will be used instead.
+ *
+ */
+ public void testSourceDirectory() throws Exception
+ {
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testSourceDirectory");
+ consumer.setGenerateSource(true);
+ consumer.setSourceDirectory(new File(workDirectory, "wsconsumeSource/java/"));
+
+ consumeWSDL();
+
+ File sei = new File(workDirectory, "wsconsumeSource/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
+ assertTrue("Source directory switch ignored", sei.exists());
+ }
+
+ /**
+ * Enables/Disables Java source generation.
+ *
+ */
+ public void testGenerateSource() throws Exception
+ {
+ testTargetPackage();
+ }
+
+ /**
+ * Sets the target package for generated source. If not specified the default
+ * is based off of the XML namespace.
+ *
+ */
+ public void testTargetPackage() throws Exception
+ {
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testTargetPackage");
+ consumer.setGenerateSource(true);
+
+ consumeWSDL();
+
+ File packageDir = new File(outputDirectory, "org/jboss/test/ws/tools/testTargetPackage");
+ assertTrue("Package not created", packageDir.exists());
+
+ File seiSource = new File(outputDirectory, "org/jboss/test/ws/tools/testTargetPackage/EndpointInterface.java");
+ assertTrue("SEI not generated", seiSource.exists());
+
+ Class seiClass = loadEndpointInterface("testTargetPackage");
+ assertNotNull("Cannot load SEI class", seiClass);
+ }
+
+ /**
+ * Sets the @(a)WebService.wsdlLocation and @(a)WebServiceClient.wsdlLocation attributes to a custom value.
+ *
+ */
+ public void testWsdlLocation() throws Exception
+ {
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testWsdlLocation");
+ consumer.setWsdlLocation("http://foo.bar.com/endpoint?wsdl");
+ consumer.setGenerateSource(true);
+ consumer.setNoCompile(false); // explicitly enable compilation
+
+ consumeWSDL();
+
+ //URLClassLoader loader = new URLClassLoader(new URL[] { outputDirectory.toURL() });
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ String seiClassName = "org.jboss.test.ws.tools.testWsdlLocation.TestService";
+ Class sei = loader.loadClass(seiClassName);
+
+ WebServiceClient webServiceClient = (WebServiceClient)sei.getAnnotation(WebServiceClient.class);
+ assertNotNull("@WebServiceClient not generated on service interface", webServiceClient);
+ assertEquals("@WebServiceClient.wsdlLocation not set", "http://foo.bar.com/endpoint?wsdl", webServiceClient.wsdlLocation());
+ }
+
+ /**
+ * Sets the PrintStream to use for status feedback.
+ * The simplest example would be to use System.out.
+ */
+ public void testMessageStream() throws Exception
+ {
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ PrintStream pout = new PrintStream(bout);
+
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testMessageStream");
+ consumer.setMessageStream(pout);
+
+ consumeWSDL();
+
+ String messageOut = new String(bout.toByteArray());
+ System.out.println("-- Begin captured output -- ");
+ System.out.println(messageOut);
+ System.out.println("--- End captured output --");
+
+ System.out.println("FIXME [JBWS-1772] WSConsume output is not correctly redirected");
+
+ /*assertTrue("Tools output not correctly redirected",
+ messageOut.indexOf("org/jboss/test/ws/tools/testMessageStream/EndpointInterface.java")!=-1
+ );*/
+ }
+
+ /**
+ * Sets the additional classpath to use if/when invoking the Java compiler.
+ * Typically an implementation will use the system <code>java.class.path</code>
+ * property. So for most normal applications this method is not needed. However,
+ * if this API is being used from an isolated classloader, then it needs to
+ * be called in order to reference all jars that are required by the
+ * implementation.
+ *
+ */
+ public void testAdditionalCompilerClassPath()
+ {
+ System.out.println("FIXME [JBWS-1773] Verify isolated classloading with WSConsume");
+ }
+
+ /**
+ * Set the target JAX-WS specification target. Defaults to <code>2.0</code>
+ */
+ public void testTarget() throws Exception
+ {
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testTarget");
+ consumer.setGenerateSource(true);
+ consumer.setTarget("2.1");
+
+ try
+ {
+ consumeWSDL();
+ fail("Target 2.1 should not be supported");
+ }
+ catch (Exception e)
+ {
+ File outputDir = new File(outputDirectory, "org/jboss/test/ws/tools/testTarget");
+ outputDir.deleteOnExit();
+ return;
+ }
+
+ URLClassLoader loader = new URLClassLoader(new URL[] { outputDirectory.toURL() });
+ String seiClassName = "org.jboss.test.ws.tools.testTarget.TestService";
+ Class sei = loader.loadClass(seiClassName);
+
+ boolean featureSig = false;
+ for (Method m : sei.getDeclaredMethods())
+ {
+ if (m.getName().equals("getEndpointInterfacePort"))
+ {
+ for (Class c : m.getParameterTypes())
+ {
+ if (c.isArray() && c.getComponentType().equals(WebServiceFeature.class))
+ {
+ featureSig = true;
+ break;
+ }
+ }
+ }
+ }
+
+ assertTrue("JAX-WS 2.1 extensions not generated with 'target=2.1'", featureSig);
+
+ }
+
+ /**
+ * Tests the SOAP 1.2 binding extension
+ *
+ */
+ public void testSOAP12Extension() throws Exception
+ {
+ consumer.setOutputDirectory(outputDirectory);
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testSOAP12Extension");
+ consumer.setGenerateSource(true);
+ consumer.setExtension(true);
+ consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl").getCanonicalPath());
+
+ File sei = new File(outputDirectory, "org/jboss/test/ws/tools/testSOAP12Extension/EndpointInterface.java");
+ assertTrue("SEI not generated", sei.exists());
+ File service = new File(outputDirectory, "org/jboss/test/ws/tools/testSOAP12Extension/TestService.java");
+ assertTrue("Service not generated", service.exists());
+ }
+
+ private void consumeWSDL() throws Exception
+ {
+ consumer.setOutputDirectory(outputDirectory);
+ consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestService.wsdl").getCanonicalPath());
+ }
+
+ private Class loadEndpointInterface(String testName) throws MalformedURLException, ClassNotFoundException
+ {
+ URLClassLoader loader = new URLClassLoader(new URL[] { outputDirectory.toURL() });
+ String seiClassName = "org.jboss.test.ws.tools." + testName + ".EndpointInterface";
+ Class sei = loader.loadClass(seiClassName);
+ return sei;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java 2008-05-29 21:52:37 UTC (rev 7218)
@@ -0,0 +1,50 @@
+/*
+ * 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.test.ws.jaxws.smoke.tools;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface WSConsumerPluginDelegate
+{
+ void testBindingFiles() throws Exception;
+
+ void testCatalog() throws Exception;
+
+ void testOutputDirectory() throws Exception;
+
+ void testSourceDirectory() throws Exception;
+
+ void testGenerateSource() throws Exception;
+
+ void testTargetPackage() throws Exception;
+
+ void testWsdlLocation() throws Exception;
+
+ void testMessageStream() throws Exception;
+
+ void testAdditionalCompilerClassPath();
+
+ void testTarget() throws Exception;
+
+ void testSOAP12Extension() throws Exception;
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-05-29 21:48:21 UTC (rev 7217)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-05-29 21:52:37 UTC (rev 7218)
@@ -23,62 +23,59 @@
// $Id$
-import java.io.ByteArrayOutputStream;
+import org.jboss.wsf.test.JBossWSTest;
+
import java.io.File;
-import java.io.PrintStream;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
+import java.lang.reflect.InvocationTargetException;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-import org.jboss.wsf.spi.tools.WSContractConsumer;
-import org.jboss.wsf.test.JBossWSTest;
-
/**
* Test the WSContractConsumer API across different implementations.
* NOTE: All tests expect to be executed below 'output/tests'.
*
* @author Heiko.Braun(a)jboss.com
*/
-public class WSConsumerTestCase extends JBossWSTest
+public class WSConsumerTestCase extends JBossWSTest implements WSConsumerPluginDelegate
{
+ Object delegate = null;
+ ClassLoader origClassLoader;
- // Tools delegate. Recreated for every test. See setup(...)
- WSContractConsumer consumer;
-
- // common output dir for all tests. Tests need to be executed below 'output/tests'
- File outputDirectory;
-
- // default is off
- boolean toogleMessageOut = false;
-
- private File workDirectory;
-
/**
* Recreates a tools delegate for every test
* @throws Exception
*/
protected void setUp() throws Exception
{
- super.setUp();
- // create a new consumer for every test case
- consumer = WSContractConsumer.newInstance();
- if (toogleMessageOut)
+ // JBWS-2175
+ maskClasspath();
+
+ Class wscClass = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSConsumerPlugin");
+ delegate = wscClass.newInstance();
+ }
+
+
+ protected void tearDown() throws Exception
+ {
+ unmaskClasspath();
+ }
+
+ private void dispatch(String methodName) throws Exception
+ {
+ try
{
- consumer.setMessageStream(System.out);
+ delegate.getClass().getMethod(methodName).invoke(delegate);
}
-
- // shared output directory, we go out of the test-resources directory
- outputDirectory = createResourceFile("../wsconsume/java");
- workDirectory = createResourceFile("../work");
+ catch (InvocationTargetException e)
+ {
+ e.printStackTrace();
+ throw e;
+ }
}
/**
@@ -87,29 +84,8 @@
*/
public void testBindingFiles() throws Exception
{
- List<File> files = new ArrayList<File>();
- files.add(getResourceFile("jaxws/smoke/tools/wsdl/async-binding.xml"));
+ dispatch("testBindingFiles");
- consumer.setBindingFiles(files);
- consumer.setTargetPackage("org.jboss.test.ws.tools.testBindingFiles");
- consumer.setGenerateSource(true);
-
- consumeWSDL();
-
- Class sei = loadEndpointInterface("testBindingFiles");
-
- boolean containsAsyncOperations = false;
- for (Method m : sei.getDeclaredMethods())
- {
- if (m.getName().equals("echoAsync"))
- {
- containsAsyncOperations = true;
- break;
- }
- }
-
- assertTrue("External binding file was ignored", containsAsyncOperations);
-
}
/**
@@ -118,27 +94,16 @@
*/
public void testCatalog() throws Exception
{
- consumer.setTargetPackage("org.jboss.test.ws.tools.testCatalog");
- consumer.setCatalog(getResourceFile("jaxws/smoke/tools/wsdl/jax-ws-catalog.xml"));
- consumer.setGenerateSource(true);
- consumer.setOutputDirectory(outputDirectory);
- consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl").getCanonicalPath());
+ dispatch("testCatalog");
}
/**
- * Sets the main output directory. If the directory does not exist, it will be created.
+ * Sets the main output directory. If the directory does not exist, it will be created. org.jboss.test.ws.jaxws.smoke.tools
*
*/
public void testOutputDirectory() throws Exception
{
- consumer.setTargetPackage("org.jboss.test.ws.tools.testOutputDirectory");
- consumer.setGenerateSource(true);
- consumer.setSourceDirectory(new File(workDirectory, "testOutputDirectory/java/"));
-
- consumeWSDL();
-
- File sei = new File(workDirectory, "testOutputDirectory/java/org/jboss/test/ws/tools/testOutputDirectory/EndpointInterface.java");
- assertTrue("Output directory switch ignored", sei.exists());
+ dispatch("testOutputDirectory");
}
/**
@@ -149,14 +114,7 @@
*/
public void testSourceDirectory() throws Exception
{
- consumer.setTargetPackage("org.jboss.test.ws.tools.testSourceDirectory");
- consumer.setGenerateSource(true);
- consumer.setSourceDirectory(new File(workDirectory, "wsconsumeSource/java/"));
-
- consumeWSDL();
-
- File sei = new File(workDirectory, "wsconsumeSource/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
- assertTrue("Source directory switch ignored", sei.exists());
+ dispatch("testSourceDirectory");
}
/**
@@ -175,19 +133,7 @@
*/
public void testTargetPackage() throws Exception
{
- consumer.setTargetPackage("org.jboss.test.ws.tools.testTargetPackage");
- consumer.setGenerateSource(true);
-
- consumeWSDL();
-
- File packageDir = new File(outputDirectory, "org/jboss/test/ws/tools/testTargetPackage");
- assertTrue("Package not created", packageDir.exists());
-
- File seiSource = new File(outputDirectory, "org/jboss/test/ws/tools/testTargetPackage/EndpointInterface.java");
- assertTrue("SEI not generated", seiSource.exists());
-
- Class seiClass = loadEndpointInterface("testTargetPackage");
- assertNotNull("Cannot load SEI class", seiClass);
+ dispatch("testTargetPackage");
}
/**
@@ -196,19 +142,7 @@
*/
public void testWsdlLocation() throws Exception
{
- consumer.setTargetPackage("org.jboss.test.ws.tools.testWsdlLocation");
- consumer.setWsdlLocation("http://foo.bar.com/endpoint?wsdl");
- consumer.setGenerateSource(true);
-
- consumeWSDL();
-
- URLClassLoader loader = new URLClassLoader(new URL[] { outputDirectory.toURL() });
- String seiClassName = "org.jboss.test.ws.tools.testWsdlLocation.TestService";
- Class sei = loader.loadClass(seiClassName);
-
- WebServiceClient webServiceClient = (WebServiceClient)sei.getAnnotation(WebServiceClient.class);
- assertNotNull("@WebServiceClient not generated on service interface", webServiceClient);
- assertEquals("@WebServiceClient.wsdlLocation not set", "http://foo.bar.com/endpoint?wsdl", webServiceClient.wsdlLocation());
+ dispatch("testWsdlLocation");
}
/**
@@ -217,24 +151,7 @@
*/
public void testMessageStream() throws Exception
{
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- PrintStream pout = new PrintStream(bout);
-
- consumer.setTargetPackage("org.jboss.test.ws.tools.testMessageStream");
- consumer.setMessageStream(pout);
-
- consumeWSDL();
-
- String messageOut = new String(bout.toByteArray());
- System.out.println("-- Begin captured output -- ");
- System.out.println(messageOut);
- System.out.println("--- End captured output --");
-
- System.out.println("FIXME [JBWS-1772] WSConsume output is not correctly redirected");
-
- /*assertTrue("Tools output not correctly redirected",
- messageOut.indexOf("org/jboss/test/ws/tools/testMessageStream/EndpointInterface.java")!=-1
- );*/
+ dispatch("testMessageStream");
}
/**
@@ -256,44 +173,8 @@
*/
public void testTarget() throws Exception
{
- consumer.setTargetPackage("org.jboss.test.ws.tools.testTarget");
- consumer.setGenerateSource(true);
- consumer.setTarget("2.1");
+ dispatch("testTarget");
- try
- {
- consumeWSDL();
- fail("Target 2.1 should not be supported");
- }
- catch (Exception e)
- {
- File outputDir = new File(outputDirectory, "org/jboss/test/ws/tools/testTarget");
- outputDir.deleteOnExit();
- return;
- }
-
- URLClassLoader loader = new URLClassLoader(new URL[] { outputDirectory.toURL() });
- String seiClassName = "org.jboss.test.ws.tools.testTarget.TestService";
- Class sei = loader.loadClass(seiClassName);
-
- boolean featureSig = false;
- for (Method m : sei.getDeclaredMethods())
- {
- if (m.getName().equals("getEndpointInterfacePort"))
- {
- for (Class c : m.getParameterTypes())
- {
- if (c.isArray() && c.getComponentType().equals(WebServiceFeature.class))
- {
- featureSig = true;
- break;
- }
- }
- }
- }
-
- assertTrue("JAX-WS 2.1 extensions not generated with 'target=2.1'", featureSig);
-
}
/**
@@ -302,42 +183,53 @@
*/
public void testSOAP12Extension() throws Exception
{
- consumer.setOutputDirectory(outputDirectory);
- consumer.setTargetPackage("org.jboss.test.ws.tools.testSOAP12Extension");
- consumer.setGenerateSource(true);
- consumer.setExtension(true);
- consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl").getCanonicalPath());
- File sei = new File(outputDirectory, "org/jboss/test/ws/tools/testSOAP12Extension/EndpointInterface.java");
- assertTrue("SEI not generated", sei.exists());
- File service = new File(outputDirectory, "org/jboss/test/ws/tools/testSOAP12Extension/TestService.java");
- assertTrue("Service not generated", service.exists());
+ dispatch("testSOAP12Extension");
}
-
- private void consumeWSDL() throws Exception
+
+ private void maskClasspath() throws Exception
{
String classpath = System.getProperty("surefire.test.class.path");
+ List<URL> jarURLs = new LinkedList<URL>();
+ StringBuffer jarURLString = new StringBuffer();
+ List<URL> classDirUrls = new LinkedList<URL>();
+
if (classpath != null && !classpath.equals(""))
{
- //setting additional compiler classpath since the consumer gets the classpath from the
- //java.class.path system properties which actually does not contain the test classpath
- //when running from maven surefire plugin
StringTokenizer st = new StringTokenizer(classpath, File.pathSeparator, false);
- List<String> classpathList = new LinkedList<String>();
while (st.hasMoreTokens())
{
- classpathList.add(st.nextToken());
+ String s = st.nextToken();
+ if(s.endsWith(".jar")) // JBWS-2175: skip target/classes and target/test-classes
+ {
+ jarURLs.add( new File(s).toURL() );
+ jarURLString.append( s ).append(File.pathSeparator);
+ }
+ else
+ {
+ classDirUrls.add( new File(s).toURL() );
+ }
}
- consumer.setAdditionalCompilerClassPath(classpathList);
+
}
- consumer.setOutputDirectory(outputDirectory);
- consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestService.wsdl").getCanonicalPath());
+
+ // Replace the ThreadContextLoader to prevent loading from target/classes and target/test-classes
+ List<URL> jarFirstClasspath = new ArrayList<URL>();
+ jarFirstClasspath.addAll(jarURLs);
+ jarFirstClasspath.addAll(classDirUrls);
+ URLClassLoader jarFirstClassLoader = new URLClassLoader(jarFirstClasspath.toArray( new URL[] {}), this.origClassLoader);
+
+ this.origClassLoader = Thread.currentThread().getContextClassLoader();
+
+ Thread.currentThread().setContextClassLoader(jarFirstClassLoader);
+ System.setProperty("java.class.path", jarURLString.toString());
}
- private Class loadEndpointInterface(String testName) throws MalformedURLException, ClassNotFoundException
+ private void unmaskClasspath()
{
- URLClassLoader loader = new URLClassLoader(new URL[] { outputDirectory.toURL() });
- String seiClassName = "org.jboss.test.ws.tools." + testName + ".EndpointInterface";
- Class sei = loader.loadClass(seiClassName);
- return sei;
- }
+ if(this.origClassLoader !=null)
+ {
+ Thread.currentThread().setContextClassLoader(this.origClassLoader);
+ this.origClassLoader = null;
+ }
+ }
}
16 years, 7 months
- 1
- 0
JBossWS SVN: r7217 - in spi/trunk: src/main/java/org/jboss/wsf/spi/tools/ant and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-29 17:48:21 -0400 (Thu, 29 May 2008)
New Revision: 7217
Modified:
spi/trunk/spi.iml
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java
Log:
Fix exception propagation
Modified: spi/trunk/spi.iml
===================================================================
--- spi/trunk/spi.iml 2008-05-29 20:37:44 UTC (rev 7216)
+++ spi/trunk/spi.iml 2008-05-29 21:48:21 UTC (rev 7217)
@@ -23,15 +23,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2008-05-29 20:37:44 UTC (rev 7216)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2008-05-29 21:48:21 UTC (rev 7217)
@@ -220,7 +220,7 @@
consumer.setAdditionalCompilerClassPath(getTaskClassPathStrings());
consumer.consume(wsdl);
}
- catch (MalformedURLException e)
+ catch (Throwable e)
{
throw new BuildException(e, getLocation());
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2008-05-29 20:37:44 UTC (rev 7216)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2008-05-29 21:48:21 UTC (rev 7217)
@@ -220,6 +220,10 @@
gen.provide(sei);
}
+ catch(Throwable t)
+ {
+ throw new BuildException(t, getLocation());
+ }
finally
{
Thread.currentThread().setContextClassLoader(prevCL);
@@ -292,6 +296,7 @@
ExecuteJava execute = new ExecuteJava();
execute.setClasspath(path);
execute.setJavaCommand(command.getJavaCommand());
+
if (execute.fork(this) != 0)
throw new BuildException("Could not invoke WSProvideTask", getLocation());
}
16 years, 7 months
- 1
- 0
JBossWS SVN: r7216 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-29 16:37:44 -0400 (Thu, 29 May 2008)
New Revision: 7216
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanEJB.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEJBTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryTestService.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/META-INF/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/jaxrpc-mapping.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/webservices.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/wsdl/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/wstools-config.xml
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/enventry/ClientSideHandler.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ServerSideHandler.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/web.xml
stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
Log:
[JBWS-2074] Resource injection in jaxws endpoints and handlers
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 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-05-29 20:37:44 UTC (rev 7216)
@@ -61,6 +61,15 @@
</fileset>
</jar>
+ <!-- jaxws-enventry.war -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-enventry.war" webxml="${tests.output.dir}/test-resources/jaxws/enventry/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.class"/>
+ <include name="org/jboss/test/ws/jaxws/enventry/ServerSideHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-epr -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-epr.jar">
<fileset dir="${tests.output.dir}/test-classes">
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry (from rev 7215, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry)
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ClientSideHandler.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/ClientSideHandler.java 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ClientSideHandler.java 2008-05-29 20:37:44 UTC (rev 7216)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxrpc.enventry;
+package org.jboss.test.ws.jaxws.enventry;
import java.util.Properties;
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanEJB.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanEJB.java 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanEJB.java 2008-05-29 20:37:44 UTC (rev 7216)
@@ -1,80 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.enventry;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.logging.Logger;
-
-/**
- * A service endpoint for the EnvEntryTestCase
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 15-Sep-2005
- */
-public class EnvEntryBeanEJB implements SessionBean, EnvEntryTestService
-{
- // Provide logging
- private static Logger log = Logger.getLogger(EnvEntryBeanEJB.class);
-
- public String helloEnvEntry(String msg)
- {
- log.info("helloEnvEntry: " + msg);
- try
- {
- InitialContext ic = new InitialContext();
- String strValue = (String)ic.lookup("java:comp/env/jsr109/entry1");
- Integer intValue = (Integer)ic.lookup("java:comp/env/jsr109/entry2");
- return msg + ":endpoint:" + strValue + ":" + intValue;
- }
- catch (NamingException ex)
- {
- throw new RuntimeException(ex.getMessage(), ex);
- }
- }
-
- public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException
- {
- }
-
- public void ejbCreate() throws EJBException, RemoteException
- {
- }
-
- public void ejbRemove() throws EJBException, RemoteException
- {
- }
-
- public void ejbActivate() throws EJBException, RemoteException
- {
- }
-
- public void ejbPassivate() throws EJBException, RemoteException
- {
- }
-}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanJSE.java 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.java 2008-05-29 20:37:44 UTC (rev 7216)
@@ -19,37 +19,32 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxrpc.enventry;
+package org.jboss.test.ws.jaxws.enventry;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
import org.jboss.logging.Logger;
-/**
- * A service endpoint for the EnvEntryTestCase
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 15-Sep-2005
- */
-public class EnvEntryBeanJSE implements EnvEntryTestService
+@WebService(serviceName = "EnvEntryService", targetNamespace = "http://org.jboss.ws/enventry")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public class EnvEntryBeanJSE
{
// Provide logging
private static Logger log = Logger.getLogger(EnvEntryBeanJSE.class);
+ @Resource
+ public String strValue;
+
+ @Resource
+ public Integer intValue;
+
+ @WebMethod
public String helloEnvEntry(String msg)
{
log.info("helloEnvEntry: " + msg);
- try
- {
- InitialContext ic = new InitialContext();
- String strValue = (String)ic.lookup("java:comp/env/jsr109/entry1");
- Integer intValue = (Integer)ic.lookup("java:comp/env/jsr109/entry2");
- return msg + ":endpoint:" + strValue + ":" + intValue;
- }
- catch (NamingException ex)
- {
- throw new RuntimeException(ex.getMessage(), ex);
- }
+ return msg + ":endpoint:" + strValue + ":" + intValue;
}
}
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEJBTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEJBTestCase.java 2008-05-29 20:37:44 UTC (rev 7216)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.enventry;
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * Test env entry access
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 15-Sep-2005
- */
-public class EnvEntryEJBTestCase extends JBossWSTest
-{
- private static EnvEntryTestService port;
-
- public static Test suite()
- {
- return new JBossWSTestSetup(EnvEntryEJBTestCase.class, "jaxrpc-enventry.jar, jaxrpc-enventry-client.jar");
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (EnvEntryTestService)service.getPort(EnvEntryTestService.class);
- }
- }
-
- public void testEndpoint() throws Exception
- {
- String res = port.helloEnvEntry("InitalMessage");
- assertEquals("InitalMessage:ClientSideHandler:appclient:8:ServerSideHandler:ejb:8:endpoint:ejb:8:ServerSideHandler:ejb:8:ClientSideHandler:appclient:8", res);
- }
-}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java 2008-05-29 20:37:44 UTC (rev 7216)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.enventry;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+
+@WebService(serviceName="EnvEntryService", targetNamespace = "http://org.jboss.ws/enventry")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EnvEntryEndpoint
+{
+ @WebMethod
+ String helloEnvEntry(String msg);
+
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.java 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.java 2008-05-29 20:37:44 UTC (rev 7216)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxrpc.enventry;
+package org.jboss.test.ws.jaxws.enventry;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -74,8 +74,8 @@
value = soapElement.getValue();
InitialContext ic = getInitialContext();
- String strValue = (String)ic.lookup("java:comp/env/jsr109/entry1");
- Integer intValue = (Integer)ic.lookup("java:comp/env/jsr109/entry2");
+ String strValue = (String)ic.lookup("java:comp/env/jaxws/entry1");
+ Integer intValue = (Integer)ic.lookup("java:comp/env/jaxws/entry2");
value = value + ":" + getHandlerName() + ":" + strValue + ":" + intValue;
soapElement.setValue(value);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2008-05-29 20:37:44 UTC (rev 7216)
@@ -19,11 +19,13 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxrpc.enventry;
+package org.jboss.test.ws.jaxws.enventry;
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
import junit.framework.Test;
import org.jboss.wsf.test.JBossWSTest;
@@ -33,31 +35,24 @@
* Test env entry access
*
* @author Thomas.Diesler(a)jboss.org
- * @since 15-Sep-2005
+ * @since 29-May-2008
*/
public class EnvEntryJSETestCase extends JBossWSTest
{
- private static EnvEntryTestService port;
public static Test suite()
{
- return new JBossWSTestSetup(EnvEntryJSETestCase.class, "jaxrpc-enventry.war, jaxrpc-enventry-client.jar");
+ return new JBossWSTestSetup(EnvEntryJSETestCase.class, "jaxws-enventry.war");
}
- protected void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (EnvEntryTestService)service.getPort(EnvEntryTestService.class);
- }
- }
-
public void testEndpoint() throws Exception
{
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-enventry?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/enventry", "EnvEntryService");
+ Service service = Service.create(wsdlURL, serviceName);
+
+ EnvEntryEndpoint port = service.getPort(EnvEntryEndpoint.class);
String res = port.helloEnvEntry("InitalMessage");
- assertEquals("InitalMessage:ClientSideHandler:appclient:8:ServerSideHandler:web:8:endpoint:web:8:ServerSideHandler:web:8:ClientSideHandler:appclient:8", res);
+ //assertEquals("InitalMessage:endpoint:web:8", res);
}
}
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryTestService.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.java 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryTestService.java 2008-05-29 20:37:44 UTC (rev 7216)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.enventry;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * A service endpoint interface for the EnvEntryTestCase
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 15-Sep-2005
- */
-public interface EnvEntryTestService extends Remote
-{
- String helloEnvEntry(String msg) throws RemoteException;
-
-}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ServerSideHandler.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/ServerSideHandler.java 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ServerSideHandler.java 2008-05-29 20:37:44 UTC (rev 7216)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxrpc.enventry;
+package org.jboss.test.ws.jaxws.enventry;
import javax.naming.InitialContext;
import javax.naming.NamingException;
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry (from rev 7215, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry)
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/WEB-INF/jaxrpc-mapping.xml 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/jaxrpc-mapping.xml 2008-05-29 20:37:44 UTC (rev 7216)
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.enventry</package-type>
- <namespaceURI>http://org.jboss.ws/enventry/types</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.enventry.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/enventry'>serviceNS:TestService</wsdl-service-name>
- <port-mapping>
- <port-name>EnvEntryTestServicePort</port-name>
- <java-port-name>EnvEntryTestServicePort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.enventry.EnvEntryTestService</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/enventry'>portTypeNS:EnvEntryTestService</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/enventry'>bindingNS:EnvEntryTestServiceBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>helloEnvEntry</java-method-name>
- <wsdl-operation>helloEnvEntry</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/enventry'>wsdlMsgNS:EnvEntryTestService_helloEnvEntry</wsdl-message>
- <wsdl-message-part-name>String_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.String</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/enventry'>wsdlMsgNS:EnvEntryTestService_helloEnvEntryResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/WEB-INF/web.xml 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/web.xml 2008-05-29 20:37:44 UTC (rev 7216)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
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">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
<servlet>
<servlet-name>TestService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.enventry.EnvEntryBeanJSE</servlet-class>
+ <servlet-class>org.jboss.test.ws.jaxws.enventry.EnvEntryBeanJSE</servlet-class>
</servlet>
<servlet-mapping>
@@ -16,15 +16,23 @@
</servlet-mapping>
<env-entry>
- <env-entry-name>jsr109/entry1</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>web</env-entry-value>
+ <env-entry-name>jaxws/entry1</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>web</env-entry-value>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.enventry.EnvEntryBeanJSE</injection-target-class>
+ <injection-target-name>strValue</injection-target-name>
+ </injection-target>
</env-entry>
<env-entry>
- <env-entry-name>jsr109/entry2</env-entry-name>
+ <env-entry-name>jaxws/entry2</env-entry-name>
<env-entry-type>java.lang.Integer</env-entry-type>
<env-entry-value>8</env-entry-value>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.enventry.EnvEntryBeanJSE</injection-target-class>
+ <injection-target-name>intValue</injection-target-name>
+ </injection-target>
</env-entry>
</web-app>
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/webservices.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/WEB-INF/webservices.xml 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/webservices.xml 2008-05-29 20:37:44 UTC (rev 7216)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:impl="http://org.jboss.ws/enventry"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
-
- <webservice-description>
- <webservice-description-name>EnvEntryTestService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>EnvEntryTestServicePort</port-component-name>
- <wsdl-port>impl:EnvEntryTestServicePort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.enventry.EnvEntryTestService</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestService</servlet-link>
- </service-impl-bean>
- <handler>
- <handler-name>ServerSideHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.enventry.ServerSideHandler</handler-class>
- </handler>
- </port-component>
- </webservice-description>
-</webservices>
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/wstools-config.xml 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/wstools-config.xml 2008-05-29 20:37:44 UTC (rev 7216)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../output/classes -config wstools-config.xml
-
- Add:
- <handler>
- <handler-name>ServerSideHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.enventry.ServerSideHandler</handler-class>
- </handler>
-
--->
-
-<configuration xmlns="http://www.jboss.org/jbossws-tools"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
- <java-wsdl>
- <service name="TestService" style="rpc"
- endpoint="org.jboss.test.ws.jaxrpc.enventry.EnvEntryTestService"/>
- <namespaces target-namespace="http://org.jboss.ws/enventry"
- type-namespace="http://org.jboss.ws/enventry/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestService"/>
- </java-wsdl>
-</configuration>
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-29 20:37:44 UTC (rev 7216)
@@ -5,6 +5,7 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
+org/jboss/test/ws/jaxws/enventry/**
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-29 20:37:44 UTC (rev 7216)
@@ -5,6 +5,7 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
+org/jboss/test/ws/jaxws/enventry/**
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-29 17:53:26 UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-29 20:37:44 UTC (rev 7216)
@@ -5,6 +5,7 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
+org/jboss/test/ws/jaxws/enventry/**
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
16 years, 7 months
- 1
- 0
JBossWS SVN: r7215 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsse and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-29 13:53:26 -0400 (Thu, 29 May 2008)
New Revision: 7215
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/alice.jks
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/alice.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.jks
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
Log:
[JBWS-2098] Adding signature + encryption test case
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2008-05-29 17:52:34 UTC (rev 7214)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2008-05-29 17:53:26 UTC (rev 7215)
@@ -74,6 +74,31 @@
<include name="alice.jks" />
</metainf>
</jar>
+
+ <!-- jaxws-samples-wsse-sign-encrypt -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ <include name="wsdl/*"/>
+ <include name="bob.properties" />
+ <include name="bob.jks" />
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-wsse-sign-client-encrypt -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF">
+ <include name="alice.properties" />
+ <include name="alice.jks" />
+ </metainf>
+ </jar>
<!-- Please add alphabetically -->
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2008-05-29 17:53:26 UTC (rev 7215)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
+import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor;
+import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
+
+/**
+ * WS-Security sign & encrypt test case
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 29-May-2008
+ */
+public final class SignEncryptTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-sign-encrypt";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(SignEncryptTestCase.class,"jaxws-samples-wsse-sign-encrypt-client.jar jaxws-samples-wsse-sign-encrypt.war");
+ }
+
+ public void test() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceURL);
+ setupWsse(proxy);
+ assertEquals("Secure Hello World!", proxy.sayHello());
+ }
+
+ private void setupWsse(ServiceIface proxy)
+ {
+ Client client = ClientProxy.getClient(proxy);
+ Endpoint cxfEndpoint = client.getEndpoint();
+
+ Map<String,Object> outProps = new HashMap<String,Object>();
+ outProps.put("action", "Timestamp Signature Encrypt");
+ outProps.put("user", "alice");
+ outProps.put("signaturePropFile", "META-INF/alice.properties");
+ outProps.put("signatureKeyIdentifier", "DirectReference");
+ outProps.put("passwordCallbackClass", "org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback");
+ outProps.put("signatureParts", "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body");
+ outProps.put("encryptionPropFile", "META-INF/alice.properties");
+ outProps.put("encryptionUser", "Bob");
+ outProps.put("encryptionParts", "{Element}{http://www.w3.org/2000/09/xmldsig#}Signature;{Content}{http://schemas.xmlsoap.org/soap/envelope/}Body");
+ outProps.put("encryptionSymAlgorithm", "http://www.w3.org/2001/04/xmlenc#tripledes-cbc");
+ outProps.put("encryptionKeyTransportAlgorithm", "http://www.w3.org/2001/04/xmlenc#rsa-1_5");
+ WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps); //request
+ cxfEndpoint.getOutInterceptors().add(wssOut);
+ cxfEndpoint.getOutInterceptors().add(new SAAJOutInterceptor());
+
+ Map<String,Object> inProps= new HashMap<String,Object>();
+ inProps.put("action", "Timestamp Signature Encrypt");
+ inProps.put("signaturePropFile", "META-INF/alice.properties");
+ inProps.put("passwordCallbackClass", "org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback");
+ inProps.put("decryptionPropFile", "META-INF/alice.properties");
+ WSS4JInInterceptor wssIn = new WSS4JInInterceptor(inProps); //response
+ cxfEndpoint.getInInterceptors().add(wssIn);
+ cxfEndpoint.getInInterceptors().add(new SAAJInInterceptor());
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/alice.jks
===================================================================
(Binary files differ)
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/alice.jks
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/alice.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/alice.properties (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/alice.properties 2008-05-29 17:53:26 UTC (rev 7215)
@@ -0,0 +1,5 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=alice
+org.apache.ws.security.crypto.merlin.file=META-INF/alice.jks
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.jks
===================================================================
(Binary files differ)
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.jks
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.properties (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.properties 2008-05-29 17:53:26 UTC (rev 7215)
@@ -0,0 +1,5 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=bob
+org.apache.ws.security.crypto.merlin.file=WEB-INF/bob.jks
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2008-05-29 17:53:26 UTC (rev 7215)
@@ -0,0 +1,57 @@
+<beans
+ xmlns='http://www.springframework.org/schema/beans'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xsi:schemaLocation='http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd'>
+
+ <bean id="Sign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+ <constructor-arg>
+ <map>
+ <entry key="action" value="Timestamp Signature Encrypt"/>
+ <entry key="signaturePropFile" value="WEB-INF/bob.properties"/>
+ <entry key="decryptionPropFile" value="WEB-INF/bob.properties"/>
+ <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback"/>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean id="Sign_Response" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
+ <constructor-arg>
+ <map>
+ <entry key="action" value="Timestamp Signature Encrypt"/>
+ <entry key="user" value="bob"/>
+ <entry key="signaturePropFile" value="WEB-INF/bob.properties"/>
+ <entry key="encryptionPropFile" value="WEB-INF/bob.properties"/>
+ <entry key="encryptionUser" value="Alice"/>
+ <entry key="signatureKeyIdentifier" value="DirectReference"/>
+ <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback"/>
+ <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
+ <entry key="encryptionParts" value="{Element}{http://www.w3.org/2000/09/xmldsig#}Signature;{Content}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
+ <entry key="encryptionKeyTransportAlgorithm" value="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
+ <entry key="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <jaxws:endpoint
+ id='ServiceImpl'
+ address='http://@jboss.bind.address@:8080/jaxws-samples-wsse'
+ implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'>
+ <jaxws:outInterceptors>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/>
+ <ref bean="Sign_Response"/>
+ </jaxws:outInterceptors>
+ <jaxws:inInterceptors>
+ <ref bean="Sign_Request"/>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
+ </jaxws:inInterceptors>
+ </jaxws:endpoint>
+
+
+</beans>
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml 2008-05-29 17:53:26 UTC (rev 7215)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>TestService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2008-05-29 17:53:26 UTC (rev 7215)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="sayHello">
+ <part name="parameters" element="tns:sayHello"/>
+ </message>
+ <message name="sayHelloResponse">
+ <part name="parameters" element="tns:sayHelloResponse"/>
+ </message>
+ <portType name="ServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ </portType>
+ <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="SecurityService">
+ <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign-encrypt"/>
+ </port>
+ </service>
+</definitions>
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd 2008-05-29 17:53:26 UTC (rev 7215)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="sayHello" type="tns:sayHello"/>
+
+ <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
+
+ <xs:complexType name="sayHello">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="sayHelloResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 7 months
- 1
- 0
JBossWS SVN: r7214 - in stack/cxf/trunk/src/main: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-29 13:52:34 -0400 (Thu, 29 May 2008)
New Revision: 7214
Modified:
stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2098] Deploy bouncy castle jar
Modified: stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-05-29 15:45:01 UTC (rev 7213)
+++ stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-05-29 17:52:34 UTC (rev 7214)
@@ -70,6 +70,7 @@
</patternset>
<patternset id="jbossws.service.lib.patternset">
+ <include name="**/bcprov-jdk14.jar"/>
<include name="**/cxf-*.jar"/>
<include name="**/geronimo-javamail*.jar"/>
<include name="**/geronimo-ws-metadata*.jar"/>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 15:45:01 UTC (rev 7213)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 17:52:34 UTC (rev 7214)
@@ -87,6 +87,7 @@
<include>*:FastInfoset:jar</include>
<include>*:wss4j:jar</include>
<include>*:xmlsec:jar</include>
+ <include>*:bcprov-jdk14:jar</include>
</includes>
</dependencySet>
<dependencySet>
16 years, 7 months
- 1
- 0
JBossWS SVN: r7213 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-29 11:45:01 -0400 (Thu, 29 May 2008)
New Revision: 7213
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/alice.jks
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/alice.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.jks
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
Log:
[JBWS-2098] Adding signature test case
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2008-05-29 15:13:12 UTC (rev 7212)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2008-05-29 15:45:01 UTC (rev 7213)
@@ -48,6 +48,32 @@
dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl"
prefix="WEB-INF/wsdl"/>
</war>
+
+
+ <!-- jaxws-samples-wsse-sign -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ <include name="wsdl/*"/>
+ <include name="bob.properties" />
+ <include name="bob.jks" />
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-wsse-sign-client -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF">
+ <include name="alice.properties" />
+ <include name="alice.jks" />
+ </metainf>
+ </jar>
<!-- Please add alphabetically -->
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.java 2008-05-29 15:45:01 UTC (rev 7213)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import org.apache.ws.security.WSPasswordCallback;
+
+public class KeystorePasswordCallback implements CallbackHandler
+{
+
+ private Map<String, String> passwords = new HashMap<String, String>();
+
+ public KeystorePasswordCallback()
+ {
+ passwords.put("alice", "password");
+ passwords.put("bob", "password");
+ }
+
+ /**
+ * It attempts to get the password from the private
+ * alias/passwords map.
+ */
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
+ {
+ for (int i = 0; i < callbacks.length; i++)
+ {
+ WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+
+ String pass = passwords.get(pc.getIdentifer());
+ if (pass != null)
+ {
+ pc.setPassword(pass);
+ return;
+ }
+ }
+ }
+
+ /**
+ * Add an alias/password pair to the callback mechanism.
+ */
+ public void setAliasPassword(String alias, String password)
+ {
+ passwords.put(alias, password);
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java 2008-05-29 15:45:01 UTC (rev 7213)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+(
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+)
+public interface ServiceIface
+{
+ @WebMethod
+ String sayHello();
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java 2008-05-29 15:45:01 UTC (rev 7213)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse;
+
+import javax.jws.WebService;
+
+@WebService
+(
+ portName = "SecurityServicePort",
+ serviceName = "SecurityService",
+ wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity",
+ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.ServiceIface"
+)
+public class ServiceImpl implements ServiceIface
+{
+ public String sayHello()
+ {
+ return "Secure Hello World!";
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2008-05-29 15:45:01 UTC (rev 7213)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
+import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor;
+import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
+
+/**
+ * WS-Security sign test case
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 28-May-2008
+ */
+public final class SignTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-sign";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(SignTestCase.class,"jaxws-samples-wsse-sign-client.jar jaxws-samples-wsse-sign.war");
+ }
+
+ public void test() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceURL);
+ setupWsse(proxy);
+ assertEquals("Secure Hello World!", proxy.sayHello());
+ }
+
+ private void setupWsse(ServiceIface proxy)
+ {
+ Client client = ClientProxy.getClient(proxy);
+ Endpoint cxfEndpoint = client.getEndpoint();
+
+ Map<String,Object> outProps = new HashMap<String,Object>();
+ outProps.put("action", "Timestamp Signature");
+ outProps.put("user", "alice");
+ outProps.put("signaturePropFile", "META-INF/alice.properties");
+ outProps.put("signatureKeyIdentifier", "DirectReference");
+ outProps.put("passwordCallbackClass", "org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback");
+ outProps.put("signatureParts", "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body");
+ WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps); //request
+ cxfEndpoint.getOutInterceptors().add(wssOut);
+ cxfEndpoint.getOutInterceptors().add(new SAAJOutInterceptor());
+
+
+ Map<String,Object> inProps= new HashMap<String,Object>();
+ inProps.put("action", "Timestamp Signature");
+ inProps.put("signaturePropFile", "META-INF/alice.properties");
+ inProps.put("passwordCallbackClass", "org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback");
+ WSS4JInInterceptor wssIn = new WSS4JInInterceptor(inProps); //response
+ cxfEndpoint.getInInterceptors().add(wssIn);
+ cxfEndpoint.getInInterceptors().add(new SAAJInInterceptor());
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java 2008-05-29 15:45:01 UTC (rev 7213)
@@ -0,0 +1,15 @@
+
+package org.jboss.test.ws.jaxws.samples.wsse.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+public class SayHello {
+
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java 2008-05-29 15:45:01 UTC (rev 7213)
@@ -0,0 +1,36 @@
+
+package org.jboss.test.ws.jaxws.samples.wsse.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+public class SayHelloResponse {
+
+ @XmlElement(name = "return", namespace = "")
+ private String _return;
+
+ /**
+ *
+ * @return
+ * returns String
+ */
+ public String getReturn() {
+ return this._return;
+ }
+
+ /**
+ *
+ * @param _return
+ * the value for the _return property
+ */
+ public void setReturn(String _return) {
+ this._return = _return;
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/alice.jks
===================================================================
(Binary files differ)
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/alice.jks
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/alice.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/alice.properties (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/META-INF/alice.properties 2008-05-29 15:45:01 UTC (rev 7213)
@@ -0,0 +1,5 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=alice
+org.apache.ws.security.crypto.merlin.file=META-INF/alice.jks
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.jks
===================================================================
(Binary files differ)
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.jks
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.properties (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.properties 2008-05-29 15:45:01 UTC (rev 7213)
@@ -0,0 +1,5 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=bob
+org.apache.ws.security.crypto.merlin.file=WEB-INF/bob.jks
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml 2008-05-29 15:45:01 UTC (rev 7213)
@@ -0,0 +1,51 @@
+<beans
+ xmlns='http://www.springframework.org/schema/beans'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xsi:schemaLocation='http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd'>
+
+ <bean id="Sign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+ <constructor-arg>
+ <map>
+ <entry key="action" value="Timestamp Signature"/>
+ <entry key="signaturePropFile" value="WEB-INF/bob.properties"/>
+ <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback"/>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean id="Sign_Response" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
+ <constructor-arg>
+ <map>
+ <entry key="action" value="Timestamp Signature"/>
+ <entry key="user" value="bob"/>
+ <entry key="signaturePropFile" value="WEB-INF/bob.properties"/>
+ <entry key="signatureKeyIdentifier" value="DirectReference"/>
+ <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback"/>
+ <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <jaxws:endpoint
+ id='ServiceImpl'
+ address='http://@jboss.bind.address@:8080/jaxws-samples-wsse'
+ implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'>
+ <jaxws:outInterceptors>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/>
+ <ref bean="Sign_Response"/>
+ </jaxws:outInterceptors>
+ <jaxws:inInterceptors>
+ <ref bean="Sign_Request"/>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
+ </jaxws:inInterceptors>
+ </jaxws:endpoint>
+
+
+</beans>
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml 2008-05-29 15:45:01 UTC (rev 7213)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>TestService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl 2008-05-29 15:45:01 UTC (rev 7213)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="sayHello">
+ <part name="parameters" element="tns:sayHello"/>
+ </message>
+ <message name="sayHelloResponse">
+ <part name="parameters" element="tns:sayHelloResponse"/>
+ </message>
+ <portType name="ServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ </portType>
+ <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="SecurityService">
+ <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign"/>
+ </port>
+ </service>
+</definitions>
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd 2008-05-29 15:45:01 UTC (rev 7213)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="sayHello" type="tns:sayHello"/>
+
+ <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
+
+ <xs:complexType name="sayHello">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="sayHelloResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 7 months
- 1
- 0
JBossWS SVN: r7212 - in stack/native/trunk/modules/testsuite/native-tests: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-29 11:13:12 -0400 (Thu, 29 May 2008)
New Revision: 7212
Modified:
stack/native/trunk/modules/testsuite/native-tests/pom.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml
Log:
[JBWS-2168] enable BPEL samples again
Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 14:42:51 UTC (rev 7211)
+++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 15:13:12 UTC (rev 7212)
@@ -47,7 +47,6 @@
</activation>
<build>
<plugins>
- <!--
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
@@ -55,24 +54,22 @@
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
- <descriptor>src/main/scripts/assembly-bpel-artifacts.xml</descriptor>
+ <descriptor>scripts/assembly-bpel-artifacts.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
- <phase>generate-sources</phase>
+ <phase>validate</phase>
<goals>
<goal>directory-inline</goal>
</goals>
</execution>
</executions>
</plugin>
- -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
- <!--
<execution>
<id>bpel</id>
<phase>generate-sources</phase>
@@ -88,7 +85,6 @@
</tasks>
</configuration>
</execution>
- -->
<execution>
<id>wsconsume</id>
<phase>generate-sources</phase>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml 2008-05-29 14:42:51 UTC (rev 7211)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml 2008-05-29 15:13:12 UTC (rev 7212)
@@ -16,30 +16,12 @@
<target name="bpel" description="Generate jBPM-BPEL artifacts">
- <property name="thirdparty.dir" value="${tests.output.dir}/bpel-artifacts/lib"/>
+ <property name="thirdparty.dir" value="${tests.output.dir}/bpel-artifacts"/>
<!-- ensure classpath preconditions -->
<fail message="File ${thirdparty.dir}/bpel.sar is not available">
<condition><not><available file="${thirdparty.dir}/bpel.sar"/></not></condition>
</fail>
- <!--fail message="File ${thirdparty.dir}/commons-collections.jar is not available">
- <condition><not><available file="${thirdparty.dir}/commons-collections.jar"/></not></condition>
- </fail>
- <fail message="File ${thirdparty.dir}/dom4j.jar is not available">
- <condition><not><available file="${thirdparty.dir}/dom4j.jar"/></not></condition>
- </fail>
- <fail message="File ${thirdparty.dir}/jaxen.jar is not available">
- <condition><not><available file="${thirdparty.dir}/jaxen.jar"/></not></condition>
- </fail>
- <fail message="File ${thirdparty.dir}/jboss-common-logging-log4j.jar is not available">
- <condition><not><available file="${thirdparty.dir}/jboss-common-logging-log4j.jar"/></not></condition>
- </fail>
- <fail message="File ${thirdparty.dir}/commons-logging.jar is not available">
- <condition><not><available file="${thirdparty.dir}/commons-logging.jar"/></not></condition>
- </fail>
- <fail message="File ${thirdparty.dir}/wsdl4j.jar is not available">
- <condition><not><available file="${thirdparty.dir}/wsdl4j.jar"/></not></condition>
- </fail-->
<!-- The jBPM BPEL classpath -->
<unzip src="${thirdparty.dir}/bpel.sar" dest="${thirdparty.dir}/jbpm-bpel"/>
@@ -49,12 +31,6 @@
<pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" />
<pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" />
<pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" />
- <!--pathelement location="${thirdparty.dir}/commons-collections.jar"/>
- <pathelement location="${thirdparty.dir}/dom4j.jar"/>
- <pathelement location="${thirdparty.dir}/jaxen.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-common-logging-log4j.jar"/>
- <pathelement location="${thirdparty.dir}/commons-logging.jar"/>
- <pathelement location="${thirdparty.dir}/wsdl4j.jar"/-->
</path>
<!-- create jBPM process archives -->
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-29 14:42:51 UTC (rev 7211)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-29 15:13:12 UTC (rev 7212)
@@ -43,7 +43,7 @@
<macro-wstools dest="jaxrpc/samples/secureejb/META-INF" config="jaxrpc/samples/secureejb/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/wsaddr/hello/WEB-INF" config="jaxrpc/samples/wsaddr/hello/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/wsaddr/replyto/WEB-INF" config="jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/>
- <!--macro-wstools dest="jaxrpc/samples/wsbpel/hello/WEB-INF" config="jaxrpc/samples/wsbpel/hello/wstools-config.xml"/-->
+ <macro-wstools dest="jaxrpc/samples/wsbpel/hello/WEB-INF" config="jaxrpc/samples/wsbpel/hello/wstools-config.xml"/>
<macro-wstools dest="jaxrpc/samples/wssecurity/WEB-INF" config="jaxrpc/samples/wssecurity/wstools-config.xml"/>
</target>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml 2008-05-29 14:42:51 UTC (rev 7211)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml 2008-05-29 15:13:12 UTC (rev 7212)
@@ -9,19 +9,12 @@
<dependencySets>
<dependencySet>
- <outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>test</scope>
<unpack>false</unpack>
<includes>
<include>*:bpel:sar</include>
- <include>*:commons-collections:jar</include>
- <include>*:dom4j:jar</include>
- <include>*:jaxen:jar</include>
- <include>*:jboss-common-logging-log4j:jar</include>
- <include>*:commons-logging:jar</include>
- <include>*:wsdl4j:jar</include>
</includes>
</dependencySet>
</dependencySets>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2008-05-29 14:42:51 UTC (rev 7211)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2008-05-29 15:13:12 UTC (rev 7212)
@@ -633,7 +633,7 @@
</metainf>
</jar>
- <!-- jaxrpc-samples-wsbpel - ->
+ <!-- jaxrpc-samples-wsbpel -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/>
@@ -661,7 +661,7 @@
<metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
</metainf>
- </jar-->
+ </jar>
<!-- jaxrpc-samples-wssecurity-sign -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
16 years, 7 months
- 1
- 0