JBossWS SVN: r15102 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-14 04:11:53 -0400 (Fri, 14 Oct 2011)
New Revision: 15102
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
fixing jaxrpc tests regression
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-14 07:44:41 UTC (rev 15101)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-14 08:11:53 UTC (rev 15102)
@@ -1256,7 +1256,7 @@
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
<!-- JBossWS Native Core version available on 710 -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.Beta2.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.Beta3.jar</additionalClasspathElement>
<!-- JBossWS Native Core version overwritte by jbossws-native stack install -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
</additionalClasspathElements>
14 years, 2 months
JBossWS SVN: r15101 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-14 03:44:41 -0400 (Fri, 14 Oct 2011)
New Revision: 15101
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
enabling tests
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-14 07:41:20 UTC (rev 15100)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-14 07:44:41 UTC (rev 15101)
@@ -1296,15 +1296,6 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
- <!-- TODO: Injections support for WS components -->
- <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</exclude> <!-- [AS7-1407] affects this test -->
-
<!-- TODO: EJB3 DD driven deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
@@ -1348,7 +1339,7 @@
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
-
+
<!-- appclient not available for JAXRPC clients -->
<exclude>org/jboss/test/ws/jaxrpc/samples/docstyle/**</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/exception/**</exclude>
14 years, 2 months
JBossWS SVN: r15100 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-14 03:41:20 -0400 (Fri, 14 Oct 2011)
New Revision: 15100
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
enabling tests
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-10-13 14:14:54 UTC (rev 15099)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-10-14 07:41:20 UTC (rev 15100)
@@ -1016,15 +1016,6 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
- <!-- TODO: Injections support for WS components -->
- <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</exclude> <!-- [AS7-1407] affects this test -->
-
<!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
<exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
@@ -1057,7 +1048,7 @@
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
-
+
<!-- # appclient & jaxrpc client issues -->
<exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase*</exclude>
<exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase*</exclude>
14 years, 2 months
JBossWS SVN: r15099 - in stack/cxf/trunk: modules/server and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-13 10:14:54 -0400 (Thu, 13 Oct 2011)
New Revision: 15099
Modified:
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
Log:
use jboss spec ejb API version plus fixing endorsement for AS6 targets
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2011-10-13 14:02:26 UTC (rev 15098)
+++ stack/cxf/trunk/modules/server/pom.xml 2011-10-13 14:14:54 UTC (rev 15099)
@@ -23,8 +23,8 @@
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-13 14:02:26 UTC (rev 15098)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-13 14:14:54 UTC (rev 15099)
@@ -58,8 +58,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.jws</groupId>
@@ -196,6 +196,12 @@
<type>jar</type>
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
</artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
@@ -676,7 +682,7 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <compilerArgument>-Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</compilerArgument>
+ <compilerArgument>-Djava.endorsed.dirs=${project.build.directory}/endorsed</compilerArgument>
</configuration>
<executions>
<execution>
@@ -691,14 +697,14 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
<additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement>
</additionalClasspathElements>
<excludes>
- <!-- # UsernameTestCase requires trustore in jboss-web tomcat configuration-->
+ <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration-->
<exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude>
@@ -726,19 +732,21 @@
<!--# Seems MSFT interop. endpoints are down :(-->
<exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
- <!-- # [JBWS-3205] JDKLogManager not used -->
+ <!--# [JBWS-3205] JDKLogManager not used -->
<exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude>
- <!-- # [JBWS-3125] SOAP over JMS 1.0 deployment support available on AS 7 only -->
+ <!--# [JBWS-3125] SOAP over JMS 1.0 deployment support available on AS 7 only -->
<exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude>
- <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
+ <!--# [AS7-1322] Implemented on AS 7.0.1 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
- <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+ <!--# [JBWS-3026] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+
+ <!--# [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
<exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
</excludes>
</configuration>
</plugin>
@@ -853,7 +861,7 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <compilerArgument>-Djava.endorsed.dirs=${jboss610.home}/lib/endorsed</compilerArgument>
+ <compilerArgument>-Djava.endorsed.dirs=${project.build.directory}/endorsed</compilerArgument>
</configuration>
<executions>
<execution>
@@ -868,14 +876,14 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss610.home}/lib/endorsed -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
<additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement>
</additionalClasspathElements>
<excludes>
- <!-- # UsernameTestCase requires trustore in jboss-web tomcat configuration-->
+ <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration-->
<exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude>
@@ -903,19 +911,21 @@
<!--# Seems MSFT interop. endpoints are down :(-->
<exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
- <!-- # [JBWS-3205] JDKLogManager not used -->
+ <!--# [JBWS-3205] JDKLogManager not used -->
<exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude>
- <!-- # [JBWS-3125] SOAP over JMS 1.0 deployment support available on AS 7 only -->
+ <!--# [JBWS-3125] SOAP over JMS 1.0 deployment support available on AS 7 only -->
<exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude>
- <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
+ <!--# [AS7-1322] Implemented on AS 7.0.1 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
- <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+ <!--# [JBWS-3026] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+
+ <!--# [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
<exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
</excludes>
</configuration>
</plugin>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2011-10-13 14:02:26 UTC (rev 15098)
+++ stack/cxf/trunk/pom.xml 2011-10-13 14:14:54 UTC (rev 15099)
@@ -54,6 +54,7 @@
<jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
<jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>
<jboss700.version>7.0.0.Final</jboss700.version>
+ <ejb.api.version>1.0.1.Final</ejb.api.version>
<cxf.version>2.4.3</cxf.version>
<cxf.asm.version>3.3</cxf.asm.version>
<cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>
@@ -164,14 +165,6 @@
<version>${jaxws-jboss-httpserver-httpspi.version}</version>
</dependency>
- <!-- provided apis -->
- <dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
- <scope>provided</scope>
- </dependency>
-
<!-- CXF dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -942,6 +935,11 @@
<version>${jaxws.api.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <version>${ejb.api.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>${fastinfoset.api.version}</version>
14 years, 2 months
JBossWS SVN: r15098 - in stack/native/trunk: modules/core and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-13 10:02:26 -0400 (Thu, 13 Oct 2011)
New Revision: 15098
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
Log:
use jboss spec ejb API version plus fixing endorsement for AS6 targets
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2011-10-13 12:59:20 UTC (rev 15097)
+++ stack/native/trunk/modules/core/pom.xml 2011-10-13 14:02:26 UTC (rev 15098)
@@ -55,8 +55,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-10-13 12:59:20 UTC (rev 15097)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-10-13 14:02:26 UTC (rev 15098)
@@ -69,10 +69,6 @@
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
@@ -119,6 +115,11 @@
<version>${jboss.javaee.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Build -->
@@ -181,6 +182,13 @@
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
</artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
@@ -427,7 +435,7 @@
<properties>
<jboss.version>6.0.0.Final</jboss.version>
<jbossws.integration.target>jboss600</jbossws.integration.target>
- <endorsed.dirs>${jboss600.home}/lib/endorsed</endorsed.dirs>
+ <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
<dependencies>
<dependency>
@@ -439,6 +447,10 @@
<exclusions>
<!-- Exclusion for not depending on the container integration -->
<exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
</exclusion>
@@ -552,6 +564,9 @@
<!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- # [JBWS-3026] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+
<!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
<exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
</excludes>
@@ -570,7 +585,7 @@
<properties>
<jboss.version>6.1.0.Final</jboss.version>
<jbossws.integration.target>jboss610</jbossws.integration.target>
- <endorsed.dirs>${jboss610.home}/lib/endorsed</endorsed.dirs>
+ <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
<dependencies>
<dependency>
@@ -580,6 +595,10 @@
<type>pom</type>
<version>${jboss.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
<!-- Exclusion for not depending on the container integration -->
<exclusion>
<groupId>org.jboss.jbossas</groupId>
@@ -695,6 +714,9 @@
<!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- # [JBWS-3026] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+
<!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
<exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
</excludes>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2011-10-13 12:59:20 UTC (rev 15097)
+++ stack/native/trunk/pom.xml 2011-10-13 14:02:26 UTC (rev 15098)
@@ -53,6 +53,7 @@
<jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
<jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>
<jboss700.version>7.0.0.Final</jboss700.version>
+ <ejb.api.version>1.0.1.Final</ejb.api.version>
<ant.version>1.7.1</ant.version>
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -153,11 +154,6 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
<version>1.1</version>
@@ -289,6 +285,11 @@
<version>${jaxws.api.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <version>${ejb.api.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec.javax.xml.rpc</groupId>
<artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
<version>${jaxrpc.api.version}</version>
14 years, 2 months
JBossWS SVN: r15097 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/jbws3026 and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-13 08:59:20 -0400 (Thu, 13 Oct 2011)
New Revision: 15097
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java
Log:
[JBWS-3026] fixing test case - use lookup attribute
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-10-13 12:26:38 UTC (rev 15096)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-10-13 12:59:20 UTC (rev 15097)
@@ -993,14 +993,12 @@
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws3026-ejb.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws3026/MyBean*.class" />
- <exclude name="org/jboss/test/ws/jaxws/jbws3026/MyService*.class" />
- <exclude name="org/jboss/test/ws/jaxws/jbws3026/*TestCase.class" />
</fileset>
</jar>
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws3026-web.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3026/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws3026/MyService*.class"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws3026/MyBean*.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.class"/>
<exclude name="org/jboss/test/ws/jaxws/jbws3026/*TestCase.class" />
</classes>
</war>
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java 2011-10-13 12:26:38 UTC (rev 15096)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java 2011-10-13 12:59:20 UTC (rev 15097)
@@ -32,9 +32,10 @@
@WebService(serviceName = "MyService", portName = "MyServicePort")
public class MyServiceImpl implements MyService
{
- @EJB(mappedName="MyBean/remote")
- MyBeanRemote bean;
+ @EJB(lookup="java:global/jaxws-jbws3026-ejb/MyBean!org.jboss.test.ws.jaxws.jbws3026.MyBeanRemote")
+ MyBeanRemote bean;
+
/**
* Invoking method of injected bean
*/
@@ -49,10 +50,7 @@
public void thisOneWorks()
{
MyBeanRemote bean = lookupBean();
- if (bean != null)
- {
- bean.myMethod();
- }
+ bean.myMethod();
}
/**
@@ -66,13 +64,14 @@
try
{
InitialContext ctx = new InitialContext();
- res= (MyBeanRemote) ctx.lookup("MyBean/remote");
+ res= (MyBeanRemote) ctx.lookup("java:global/jaxws-jbws3026-ejb/MyBean!org.jboss.test.ws.jaxws.jbws3026.MyBeanRemote");
}
catch (NamingException e)
{
System.out.println("Something went wrong");
- e.printStackTrace();
+ throw new RuntimeException(e);
}
return res;
}
+
}
14 years, 2 months
JBossWS SVN: r15096 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-13 08:26:38 -0400 (Thu, 13 Oct 2011)
New Revision: 15096
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3367][AS7-1605] excluding test for now
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-10-13 12:22:10 UTC (rev 15095)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-10-13 12:26:38 UTC (rev 15096)
@@ -534,10 +534,10 @@
<configuration>
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs} -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine>
<excludes>
- <!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
+ <!-- # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
<exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude>
- <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
+ <!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
<!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
@@ -552,6 +552,8 @@
<!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -675,10 +677,10 @@
<configuration>
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs} -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine>
<excludes>
- <!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
+ <!-- # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
<exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude>
- <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
+ <!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
<!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
@@ -693,6 +695,8 @@
<!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -786,10 +790,10 @@
<configuration>
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine>
<excludes>
- <!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
+ <!-- # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
<exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude>
- <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
+ <!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
<!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
@@ -810,6 +814,9 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
+ <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
<!-- TODO: Injections support for WS components -->
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
@@ -963,10 +970,10 @@
<configuration>
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine>
<excludes>
- <!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
+ <!-- # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
<exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude>
- <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
+ <!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
<!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
@@ -987,6 +994,9 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
+ <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
<!-- TODO: Injections support for WS components -->
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
14 years, 2 months
JBossWS SVN: r15095 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-13 08:22:10 -0400 (Thu, 13 Oct 2011)
New Revision: 15095
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3367][AS7-1605] excluding test for now
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-13 12:16:03 UTC (rev 15094)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-13 12:22:10 UTC (rev 15095)
@@ -736,6 +736,9 @@
<!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
</excludes>
</configuration>
</plugin>
@@ -910,6 +913,9 @@
<!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
</excludes>
</configuration>
</plugin>
@@ -1031,6 +1037,9 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
+ <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
<!-- TODO: Injections support for WS components -->
<exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
@@ -1277,6 +1286,9 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
+ <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
<!-- TODO: Injections support for WS components -->
<exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
14 years, 2 months
JBossWS SVN: r15094 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-13 08:16:03 -0400 (Thu, 13 Oct 2011)
New Revision: 15094
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/EJB3Endpoint.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/EndpointIface.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/POJOEndpoint.java
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-INF/jboss-web.xml
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-INF/web.xml
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-3376][AS7-1605] providing test case
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-10-13 09:06:44 UTC (rev 15093)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-10-13 12:16:03 UTC (rev 15094)
@@ -1116,6 +1116,28 @@
</classes>
</war>
+ <!-- jaxws-jbws3367 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3367-usecase1.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3367/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3367/EndpointIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws3367/POJOEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws3367/EJB3Endpoint.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3367/WEB-INF">
+ <include name="jboss-web.xml" />
+ </webinf>
+ </war>
+
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3367-usecase2.war" needxmlfile="false">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3367/EndpointIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws3367/EJB3Endpoint.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3367/WEB-INF">
+ <include name="jboss-web.xml" />
+ </webinf>
+ </war>
+
<!-- jaxws-endpoint-servlet -->
<war warfile="${tests.output.dir}/test-libs/jaxws-endpoint-servlet.war" manifest="${tests.output.dir}/test-resources/jaxws/endpoint/META-INF/MANIFEST.MF"
webxml="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF/web.xml">
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java 2011-10-13 12:16:03 UTC (rev 15094)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3367;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-3367][AS7-1605] jboss-web.xml ignored for web service root
+ *
+ * This test case tests if both POJO & EJB3 endpoints are in war archive.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public class BothPojoAndEjbInWarTestCase extends JBossWSTest
+{
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(BothPojoAndEjbInWarTestCase.class, "jaxws-jbws3367-usecase1.war");
+ }
+
+ public void testPOJOEndpoint() throws Exception
+ {
+ final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3367", "POJOEndpointService");
+ final URL wsdlURL = new URL("http://localhost:8080/jbws3367-customized/POJOEndpoint?wsdl");
+ final Service service = Service.create(wsdlURL, serviceName);
+ final EndpointIface port = service.getPort(EndpointIface.class);
+ final String result = port.echo("hello");
+ assertEquals("POJO hello", result);
+ }
+
+ public void testEJB3Endpoint() throws Exception
+ {
+ final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3367", "EJB3EndpointService");
+ final URL wsdlURL = new URL("http://localhost:8080/jbws3367-customized/EJB3Endpoint?wsdl");
+ final Service service = Service.create(wsdlURL, serviceName);
+ final EndpointIface port = service.getPort(EndpointIface.class);
+ final String result = port.echo("hello");
+ assertEquals("EJB3 hello", result);
+ }
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/EJB3Endpoint.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/EJB3Endpoint.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/EJB3Endpoint.java 2011-10-13 12:16:03 UTC (rev 15094)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3367;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+
+/**
+ * EJB3 endpoint.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@Stateless
+@WebService
+(
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws3367.EndpointIface",
+ targetNamespace = "org.jboss.test.ws.jaxws.jbws3367"
+)
+public class EJB3Endpoint
+{
+ public String echo(final String s)
+ {
+ return "EJB3 " + s;
+ }
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/EndpointIface.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/EndpointIface.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/EndpointIface.java 2011-10-13 12:16:03 UTC (rev 15094)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3367;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * Endpoint interface.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService
+@SOAPBinding
+public interface EndpointIface
+{
+ String echo(String s);
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java 2011-10-13 12:16:03 UTC (rev 15094)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3367;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-3367][AS7-1605] jboss-web.xml ignored for web service root
+ *
+ * This test case tests if only EJB3 endpoints are in war archive.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public class OnlyEjbInWarTestCase extends JBossWSTest
+{
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(OnlyEjbInWarTestCase.class, "jaxws-jbws3367-usecase2.war");
+ }
+
+ public void testEJB3Endpoint() throws Exception
+ {
+ final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3367", "EJB3EndpointService");
+ final URL wsdlURL = new URL("http://localhost:8080/jbws3367-customized/EJB3Endpoint?wsdl");
+ final Service service = Service.create(wsdlURL, serviceName);
+ final EndpointIface port = service.getPort(EndpointIface.class);
+ final String result = port.echo("hello");
+ assertEquals("EJB3 hello", result);
+ }
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/POJOEndpoint.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/POJOEndpoint.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/POJOEndpoint.java 2011-10-13 12:16:03 UTC (rev 15094)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3367;
+
+import javax.jws.WebService;
+
+/**
+ * POJO endpoint.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService
+(
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws3367.EndpointIface",
+ targetNamespace = "org.jboss.test.ws.jaxws.jbws3367"
+)
+public class POJOEndpoint
+{
+ public String echo(final String s)
+ {
+ return "POJO " + s;
+ }
+}
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-INF/jboss-web.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-INF/jboss-web.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-INF/jboss-web.xml 2011-10-13 12:16:03 UTC (rev 15094)
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+
+ <context-root>/jbws3367-customized</context-root>
+
+</jboss-web>
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-INF/web.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-INF/web.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-INF/web.xml 2011-10-13 12:16:03 UTC (rev 15094)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="3.0"
+ 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_3_0.xsd"
+ metadata-complete="false">
+
+ <servlet>
+ <servlet-name>POJOEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws3367.POJOEndpoint</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>POJOEndpoint</servlet-name>
+ <url-pattern>/POJOEndpoint</url-pattern>
+ </servlet-mapping>
+
+</web-app>
14 years, 2 months
JBossWS SVN: r15093 - hudson/trunk/scripts.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-13 05:06:44 -0400 (Thu, 13 Oct 2011)
New Revision: 15093
Modified:
hudson/trunk/scripts/jbossws-qa.sh
Log:
Also update native stack for AS 71x in cxf jobs
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2011-10-12 14:18:40 UTC (rev 15092)
+++ hudson/trunk/scripts/jbossws-qa.sh 2011-10-13 09:06:44 UTC (rev 15093)
@@ -21,9 +21,17 @@
redeployBinaryDistribution
STACK_ID=cxf
STACK_DIR=$ORIG_STACK_DIR
- else
- echo "No need to pre-install native..."
fi;
+ if [ "$STACK_ID" = "cxf" ] && [[ $JBOSS_TARGET == jboss71* ]]; then
+ echo "cxf stack with AS 71x, first installing native..."
+ STACK_ID=native
+ ORIG_STACK_DIR=$STACK_DIR
+ STACK_DIR=$STACK_DIR/../../../NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6/workspace/stack-native/
+ setupEnv
+ redeployBinaryDistribution
+ STACK_ID=cxf
+ STACK_DIR=$ORIG_STACK_DIR
+ fi;
}
setupEnv() {
14 years, 2 months