JBossWS SVN: r14774 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-29 12:52:25 -0400 (Fri, 29 Jul 2011)
New Revision: 14774
Removed:
stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-3336] Removing old/legacy exclude files
Deleted: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2011-07-29 16:50:06 UTC (rev 14773)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2011-07-29 16:52:25 UTC (rev 14774)
@@ -1,11 +0,0 @@
-# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBAS-8363] Virtual host issue in JBossWeb
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-3150] This test causes hudson to freeze
-org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*
Deleted: stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2011-07-29 16:50:06 UTC (rev 14773)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2011-07-29 16:52:25 UTC (rev 14774)
@@ -1,11 +0,0 @@
-# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBAS-8363] Virtual host issue in JBossWeb
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-3150] This test causes hudson to freeze
-org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*
12 years, 9 months
JBossWS SVN: r14773 - stack/native/trunk/modules/dist/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-29 12:50:06 -0400 (Fri, 29 Jul 2011)
New Revision: 14773
Modified:
stack/native/trunk/modules/dist/src/main/distro/test-exclude.xsl
Log:
[JBWS-3336] Fixing xsl for test exclude files generation
Modified: stack/native/trunk/modules/dist/src/main/distro/test-exclude.xsl
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/test-exclude.xsl 2011-07-29 16:48:00 UTC (rev 14772)
+++ stack/native/trunk/modules/dist/src/main/distro/test-exclude.xsl 2011-07-29 16:50:06 UTC (rev 14773)
@@ -4,8 +4,13 @@
<xsl:param name="targetName"/>
<xsl:output method="text"/>
<xsl:template match="/">
- <xsl:for-each select="//m:profile[m:id=$targetName]/m:build/m:plugins/m:plugin[m:artifactId='maven-surefire-plugin']//m:exclude">
- <xsl:value-of select="."/><xsl:text> </xsl:text>
+ <xsl:for-each select="//m:profile[m:id=$targetName]/m:build/m:plugins/m:plugin[m:artifactId='maven-surefire-plugin']//m:excludes">
+ <xsl:for-each select="m:exclude|comment()">
+ <xsl:if test="self::comment()">
+ <xsl:text>#</xsl:text>
+ </xsl:if>
+ <xsl:value-of select="."/><xsl:text> </xsl:text>
+ </xsl:for-each>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>
12 years, 9 months
JBossWS SVN: r14772 - hudson/trunk/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-29 12:48:00 -0400 (Fri, 29 Jul 2011)
New Revision: 14772
Modified:
hudson/trunk/scripts/jbossws-qa.sh
Log:
[JBWS-3336] Fixing hudson scripts for getting exclusion files from proper location
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2011-07-29 16:47:29 UTC (rev 14771)
+++ hudson/trunk/scripts/jbossws-qa.sh 2011-07-29 16:48:00 UTC (rev 14772)
@@ -60,7 +60,7 @@
copyTestLogs() {
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
- cat $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+ cat $STACK_DIR/modules/dist/target/exclude-file/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
}
removeJBossLogs() {
12 years, 9 months
JBossWS SVN: r14771 - in stack/cxf/trunk/modules/dist/src/main: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-29 12:47:29 -0400 (Fri, 29 Jul 2011)
New Revision: 14771
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/test-exclude.xsl
stack/cxf/trunk/modules/dist/src/main/scripts/test-exclude.xsl
Log:
[JBWS-3336] Fixing xsl for test exclusion generation
Modified: stack/cxf/trunk/modules/dist/src/main/distro/test-exclude.xsl
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/test-exclude.xsl 2011-07-28 13:29:24 UTC (rev 14770)
+++ stack/cxf/trunk/modules/dist/src/main/distro/test-exclude.xsl 2011-07-29 16:47:29 UTC (rev 14771)
@@ -4,8 +4,13 @@
<xsl:param name="targetName"/>
<xsl:output method="text"/>
<xsl:template match="/">
- <xsl:for-each select="//m:profile[m:id=$targetName]/m:build/m:plugins/m:plugin[m:artifactId='maven-surefire-plugin']//m:exclude">
- <xsl:value-of select="."/><xsl:text> </xsl:text>
+ <xsl:for-each select="//m:profile[m:id=$targetName]/m:build/m:plugins/m:plugin[m:artifactId='maven-surefire-plugin']//m:excludes">
+ <xsl:for-each select="m:exclude|comment()">
+ <xsl:if test="self::comment()">
+ <xsl:text>#</xsl:text>
+ </xsl:if>
+ <xsl:value-of select="."/><xsl:text> </xsl:text>
+ </xsl:for-each>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/test-exclude.xsl
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/test-exclude.xsl 2011-07-28 13:29:24 UTC (rev 14770)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/test-exclude.xsl 2011-07-29 16:47:29 UTC (rev 14771)
@@ -4,8 +4,13 @@
<xsl:param name="targetName"/>
<xsl:output method="text"/>
<xsl:template match="/">
-<xsl:for-each select="//m:profile[m:id='$targetName']/m:build/m:plugins/m:plugin[m:artifactId='maven-surefire-plugin']//m:exclude">
-<xsl:value-of select="."/><xsl:text> </xsl:text>
-</xsl:for-each>
+ <xsl:for-each select="//m:profile[m:id=$targetName]/m:build/m:plugins/m:plugin[m:artifactId='maven-surefire-plugin']//m:excludes">
+ <xsl:for-each select="m:exclude|comment()">
+ <xsl:if test="self::comment()">
+ <xsl:text>#</xsl:text>
+ </xsl:if>
+ <xsl:value-of select="."/><xsl:text> </xsl:text>
+ </xsl:for-each>
+ </xsl:for-each>
</xsl:template>
</xsl:stylesheet>
12 years, 9 months
JBossWS SVN: r14770 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/smoke/tools and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-28 09:29:24 -0400 (Thu, 28 Jul 2011)
New Revision: 14770
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
Log:
Fixing wsconsumer testcase failure with native bindist against AS7 due to missing tools.jar in classpath
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-07-28 11:13:40 UTC (rev 14769)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-07-28 13:29:24 UTC (rev 14770)
@@ -312,6 +312,7 @@
<fileset dir="${jboss.home}/modules/org/jboss/xnio/nio/main/">
<include name="xnio-nio-*.jar"/>
</fileset>
+ <pathelement location="${tools.jar}"/>
</path>
</target>
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2011-07-28 11:13:40 UTC (rev 14769)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2011-07-28 13:29:24 UTC (rev 14770)
@@ -117,9 +117,9 @@
// as changing the current classloader results in a log4j configuration coming from thirdparty lib being used.
jarFirstClasspath.addAll(jarURLs);
jarFirstClasspath.addAll(classDirUrls);
+ this.origClassLoader = Thread.currentThread().getContextClassLoader();
URLClassLoader jarFirstClassLoader = new URLClassLoader(jarFirstClasspath.toArray( new URL[] {}), this.origClassLoader);
- this.origClassLoader = Thread.currentThread().getContextClassLoader();
URL log4jXmlUrl = this.origClassLoader.getResource("log4j.xml");
this.origLog4jConf = System.getProperty(LOG4J_CONF);
12 years, 9 months
JBossWS SVN: r14769 - in stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/ws: security and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-28 07:13:40 -0400 (Thu, 28 Jul 2011)
New Revision: 14769
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/ws/security/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/ws/security/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/ws/security/main/module.xml
Log:
Adding module.xml for installing wss4j
Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/ws/security/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/ws/security/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/ws/security/main/module.xml 2011-07-28 11:13:40 UTC (rev 14769)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.apache.ws.security">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api" />
+ <module name="javax.xml.rpc.api" />
+ <module name="org.apache.commons.logging" />
+ <module name="org.apache.santuario.xmlsec" />
+ <module name="org.apache.xalan" />
+ </dependencies>
+</module>
\ No newline at end of file
12 years, 9 months
JBossWS SVN: r14768 - stack/cxf/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-28 07:12:00 -0400 (Thu, 28 Jul 2011)
New Revision: 14768
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
Fix deploy macros for installing referenced wss4j lib
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-07-28 10:40:13 UTC (rev 14767)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-07-28 11:12:00 UTC (rev 14768)
@@ -384,6 +384,11 @@
<include name="**/neethi.jar"/>
</fileset>
</copy>
+ <copy todir="@{targetdir}/org/apache/ws/security/main" flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/wss4j.jar"/>
+ </fileset>
+ </copy>
<copy todir="@{targetdir}/org/apache/ws/xmlschema/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/xmlschema-core.jar"/>
12 years, 9 months
JBossWS SVN: r14767 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-07-28 06:40:13 -0400 (Thu, 28 Jul 2011)
New Revision: 14767
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-07-28 10:32:25 UTC (rev 14766)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-07-28 10:40:13 UTC (rev 14767)
@@ -1018,6 +1018,7 @@
<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>
<!-- @WebServiceRef / webserviceref not implemented / ready yet on AS7 -->
<exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude>
@@ -1205,6 +1206,7 @@
<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 -->
<!-- @WebServiceRef / webserviceref not implemented / ready yet on AS7 -->
<exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude>
12 years, 9 months
JBossWS SVN: r14766 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-07-28 06:32:25 -0400 (Thu, 28 Jul 2011)
New Revision: 14766
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-07-28 10:18:19 UTC (rev 14765)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-07-28 10:32:25 UTC (rev 14766)
@@ -798,6 +798,7 @@
<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>
<!-- TODO: Native webserviceref stuff -->
<exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
@@ -968,6 +969,7 @@
<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 -->
<!-- TODO: Native webserviceref stuff -->
<exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
12 years, 9 months
JBossWS SVN: r14765 - 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-07-28 06:18:19 -0400 (Thu, 28 Jul 2011)
New Revision: 14765
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServlet.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/enventry/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/enventry/WEB-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/enventry/WEB-INF/jse-web.xml
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
Log:
refactoring injection test to shared test suite
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-07-28 10:17:40 UTC (rev 14764)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-07-28 10:18:19 UTC (rev 14765)
@@ -114,6 +114,19 @@
</fileset>
</jar>
+ <!-- jaxws-enventry -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-enventry-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/enventry/WEB-INF/jse-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/EnvEntryHandler.class" />
+ </classes>
+ </war>
+ <war warfile="${tests.output.dir}/test-libs/jaxws-enventry-servlet.war" webxml="${tests.output.dir}/test-resources/jaxws/enventry/WEB-INF/servlet-web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/enventry/EnvEntryServlet.class" />
+ </classes>
+ </war>
+
<!-- jaxws-handlerscope -->
<war warfile="${tests.output.dir}/test-libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/test-resources/jaxws/handlerscope/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.java 2011-07-28 10:18:19 UTC (rev 14765)
@@ -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.enventry;
+
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+
+@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);
+
+ // XML driven injection
+ public String strValue;
+
+ @Resource( name="jaxws/entry2" )
+ public Integer intValue;
+
+ @WebMethod
+ public String helloEnvEntry(String msg)
+ {
+ log.info("helloEnvEntry: " + msg);
+ return msg + ":endpoint:" + strValue + ":" + intValue;
+ }
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java 2011-07-28 10:18:19 UTC (rev 14765)
@@ -0,0 +1,36 @@
+/*
+ * 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.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);
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2011-07-28 10:18:19 UTC (rev 14765)
@@ -0,0 +1,57 @@
+/*
+ * 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.enventry;
+
+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;
+
+/**
+ * Test env entry access
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 29-May-2008
+ */
+public class EnvEntryJSETestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(EnvEntryJSETestCase.class, "jaxws-enventry-jse.war");
+ }
+
+ public void testEndpoint() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-enventry-jse?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:endpoint:web:8", res);
+ }
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServlet.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServlet.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServlet.java 2011-07-28 10:18:19 UTC (rev 14765)
@@ -0,0 +1,47 @@
+/*
+ * 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.enventry;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class EnvEntryServlet extends HttpServlet
+{
+ @Resource(name = "jaxws/entry1")
+ String strValue;
+
+ @Resource(name = "jaxws/entry2")
+ Integer intValue;
+
+ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ PrintWriter pw = new PrintWriter(res.getWriter());
+ pw.print(strValue + ":" + intValue);
+ pw.close();
+ }
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java 2011-07-28 10:18:19 UTC (rev 14765)
@@ -0,0 +1,54 @@
+/*
+ * 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.enventry;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+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 29-May-2008
+ */
+public class EnvEntryServletTestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(EnvEntryServletTestCase.class, "jaxws-enventry-servlet.war");
+ }
+
+ public void testEndpoint() throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-enventry-servlet");
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ String line = br.readLine();
+
+ assertEquals("web:8", line);
+ }
+}
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/enventry/WEB-INF/jse-web.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/enventry/WEB-INF/jse-web.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/enventry/WEB-INF/jse-web.xml 2011-07-28 10:18:19 UTC (rev 14765)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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/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.jaxws.enventry.EnvEntryBeanJSE</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+ <env-entry>
+ <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>jaxws/entry2</env-entry-name>
+ <env-entry-type>java.lang.Integer</env-entry-type>
+ <env-entry-value>8</env-entry-value>
+ </env-entry>
+
+</web-app>
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml 2011-07-28 10:18:19 UTC (rev 14765)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <servlet>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.enventry.EnvEntryServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+ <env-entry>
+ <env-entry-name>jaxws/entry1</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>web</env-entry-value>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>jaxws/entry2</env-entry-name>
+ <env-entry-type>java.lang.Integer</env-entry-type>
+ <env-entry-value>8</env-entry-value>
+ </env-entry>
+
+</web-app>
12 years, 9 months