JBossWS SVN: r8863 - common/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-11 07:26:08 -0500 (Thu, 11 Dec 2008)
New Revision: 8863
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
adding support for JBossAS 510 - sync with QA branch
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-12-11 12:25:10 UTC (rev 8862)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-12-11 12:26:08 UTC (rev 8863)
@@ -141,7 +141,7 @@
public boolean isTargetJBoss5()
{
- return isTargetJBoss51() || isTargetJBoss50();
+ return delegate.isTargetJBoss5();
}
public boolean isTargetJBoss51()
@@ -156,7 +156,7 @@
public boolean isTargetJBoss4()
{
- return isTargetJBoss42() || isTargetJBoss40();
+ return delegate.isTargetJBoss4();
}
public boolean isTargetJBoss42()
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-12-11 12:25:10 UTC (rev 8862)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-12-11 12:26:08 UTC (rev 8863)
@@ -75,6 +75,12 @@
getDeployer().undeploy(url);
}
+ /** True, if -Djbossws.integration.target=jboss5x */
+ public boolean isTargetJBoss5()
+ {
+ return isTargetJBoss51() || isTargetJBoss50();
+ }
+
/** True, if -Djbossws.integration.target=jboss50x */
public boolean isTargetJBoss50()
{
@@ -89,6 +95,12 @@
return target.startsWith("jboss51");
}
+ /** True, if -Djbossws.integration.target=jboss4x */
+ public boolean isTargetJBoss4()
+ {
+ return isTargetJBoss42() || isTargetJBoss40();
+ }
+
/** True, if -Djbossws.integration.target=jboss42x */
public boolean isTargetJBoss42()
{
17 years, 1 month
JBossWS SVN: r8862 - common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-11 07:25:10 -0500 (Thu, 11 Dec 2008)
New Revision: 8862
Modified:
common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTest.java
common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
adding support for JBossAS 510
Modified: common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-12-11 10:46:58 UTC (rev 8861)
+++ common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-12-11 12:25:10 UTC (rev 8862)
@@ -141,7 +141,7 @@
public boolean isTargetJBoss5()
{
- return isTargetJBoss51() || isTargetJBoss50();
+ return delegate.isTargetJBoss5();
}
public boolean isTargetJBoss51()
@@ -156,7 +156,7 @@
public boolean isTargetJBoss4()
{
- return isTargetJBoss42() || isTargetJBoss40();
+ return delegate.isTargetJBoss4();
}
public boolean isTargetJBoss42()
Modified: common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-12-11 10:46:58 UTC (rev 8861)
+++ common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-12-11 12:25:10 UTC (rev 8862)
@@ -75,6 +75,12 @@
getDeployer().undeploy(url);
}
+ /** True, if -Djbossws.integration.target=jboss5x */
+ public boolean isTargetJBoss5()
+ {
+ return isTargetJBoss51() || isTargetJBoss50();
+ }
+
/** True, if -Djbossws.integration.target=jboss50x */
public boolean isTargetJBoss50()
{
@@ -89,6 +95,12 @@
return target.startsWith("jboss51");
}
+ /** True, if -Djbossws.integration.target=jboss4x */
+ public boolean isTargetJBoss4()
+ {
+ return isTargetJBoss42() || isTargetJBoss40();
+ }
+
/** True, if -Djbossws.integration.target=jboss42x */
public boolean isTargetJBoss42()
{
17 years, 1 month
JBossWS SVN: r8861 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws: jaxrpc/samples/jmstransport and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-11 05:46:58 -0500 (Thu, 11 Dec 2008)
New Revision: 8861
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java
Log:
adding support for JBossAS 510
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2008-12-11 10:38:28 UTC (rev 8860)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2008-12-11 10:46:58 UTC (rev 8861)
@@ -166,7 +166,7 @@
stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws723/ConfidentialSecured");
port.getContactInfo("mafia");
- if (isTargetJBoss50())
+ if (isTargetJBoss5())
System.out.println("FIXME [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL");
else fail("Security exception expected");
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2008-12-11 10:38:28 UTC (rev 8860)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2008-12-11 10:46:58 UTC (rev 8861)
@@ -60,7 +60,7 @@
*/
public void testSOAPMessageToEndpointQueue() throws Exception
{
- if (isTargetJBoss50())
+ if (isTargetJBoss5())
{
System.out.println("FIXME [JBWS-1312] Fix JMS transport in trunk");
return;
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2008-12-11 10:38:28 UTC (rev 8860)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2008-12-11 10:46:58 UTC (rev 8861)
@@ -147,7 +147,7 @@
stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/ConfidentialSecured");
port.getContactInfo("mafia");
- if (isTargetJBoss50())
+ if (isTargetJBoss5())
System.out.println("FIXME [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL");
else fail("Security exception expected");
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2008-12-11 10:38:28 UTC (rev 8860)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2008-12-11 10:46:58 UTC (rev 8861)
@@ -73,7 +73,7 @@
// Maybe you should extend the Class-Path in the MANIFEST instead.
StringBuffer cp = new StringBuffer(System.getProperty("test.classes.directory"));
cp.append(PS + jbc + FS + "jbossws-native-client.jar");
- if (isTargetJBoss50())
+ if (isTargetJBoss5())
{
cp.append(PS + jbc + FS + "jboss-common-core.jar");
cp.append(PS + jbc + FS + "jboss-logging-spi.jar");
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2008-12-11 10:38:28 UTC (rev 8860)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2008-12-11 10:46:58 UTC (rev 8861)
@@ -39,7 +39,7 @@
{
public static Test suite()
{
- String newspaperJar = new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-news-step2-newspaper-as5.jar" : "jaxws-samples-news-step2-newspaper.jar";
+ String newspaperJar = new JBossWSTestHelper().isTargetJBoss5() ? "jaxws-samples-news-step2-newspaper-as5.jar" : "jaxws-samples-news-step2-newspaper.jar";
return new JBossWSTestSetup
(
SecureNewsTestCase.class,
17 years, 1 month
JBossWS SVN: r8860 - stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-11 05:38:28 -0500 (Thu, 11 Dec 2008)
New Revision: 8860
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
Log:
adding support for JBossAS 510
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2008-12-11 10:34:03 UTC (rev 8859)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2008-12-11 10:38:28 UTC (rev 8860)
@@ -44,7 +44,7 @@
public static Test suite()
{
- String serverJar = new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-wsse-sign-encrypt-50.war" : "jaxws-samples-wsse-sign-encrypt.war";
+ String serverJar = new JBossWSTestHelper().isTargetJBoss5() ? "jaxws-samples-wsse-sign-encrypt-50.war" : "jaxws-samples-wsse-sign-encrypt.war";
return new JBossWSTestSetup(SignEncryptTestCase.class, "jaxws-samples-wsse-sign-encrypt-client.jar," + serverJar);
}
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2008-12-11 10:34:03 UTC (rev 8859)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2008-12-11 10:38:28 UTC (rev 8860)
@@ -44,7 +44,7 @@
public static Test suite()
{
- String serverJar = new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-wsse-sign-50.war" : "jaxws-samples-wsse-sign.war";
+ String serverJar = new JBossWSTestHelper().isTargetJBoss5() ? "jaxws-samples-wsse-sign-50.war" : "jaxws-samples-wsse-sign.war";
return new JBossWSTestSetup(SignTestCase.class, "jaxws-samples-wsse-sign-client.jar," + serverJar);
}
17 years, 1 month
JBossWS SVN: r8859 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws1813 and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-11 05:34:03 -0500 (Thu, 11 Dec 2008)
New Revision: 8859
Modified:
framework/trunk/testsuite/test/ant-import/build-testsuite.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java
Log:
adding support for JBossAS 510
Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-12-11 10:14:55 UTC (rev 8858)
+++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-12-11 10:34:03 UTC (rev 8859)
@@ -30,6 +30,9 @@
<condition property="jboss.home" value="${jboss501.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
</condition>
+ <condition property="jboss.home" value="${jboss510.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
+ </condition>
<!-- Verify required properties that must be set before this file is imported -->
<fail message="Tests output dir not set." unless="tests.output.dir"/>
@@ -90,7 +93,6 @@
<condition property="jboss.server.lib" value="${jboss.home}/common/lib" else="${jboss.server}/lib">
<available file="${jboss.home}/common/lib"/>
</condition>
- <!-- <property name="jboss.server.lib" value="${jboss.server}/lib"/> -->
<property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
<property name="jboss.server.deployers" value="${jboss.server}/deployers"/>
@@ -112,7 +114,7 @@
</tstamp>
</target>
- <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42">
+ <target name="tests-classpath" depends="tests-classpath-jboss51,tests-classpath-jboss50,tests-classpath-jboss42">
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="tests.extra.classpath"/>
@@ -266,6 +268,84 @@
</path>
</target>
+ <target name="tests-classpath-jboss51" depends="tests-prepare" if="jbossws.integration.jboss51">
+
+ <path id="integration.target.javac.classpath">
+ <pathelement location="${jboss.client}/activation.jar"/>
+ <pathelement location="${jboss.client}/jaxws-tools.jar"/>
+ <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${jboss.client}/jboss-appclient.jar"/>
+ <pathelement location="${jboss.client}/jboss-common-core.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
+ <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
+ <pathelement location="${jboss.client}/jboss-metadata.jar"/>
+ <pathelement location="${jboss.client}/jboss-remoting.jar"/>
+ <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.client}/stax-api.jar"/>
+ <pathelement location="${jboss.client}/wsdl4j.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
+ </path>
+
+ <!--
+ The 's.client.classpath' contains jars that are available in the target container's client directory.
+ There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
+
+ The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
+ The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
+ -->
+ <path id="integration.target.client.classpath">
+ <pathelement location="${jboss.client}/activation.jar"/>
+ <pathelement location="${jboss.client}/javassist.jar"/>
+ <pathelement location="${jboss.client}/jaxb-api.jar"/>
+ <pathelement location="${jboss.client}/jaxb-impl.jar"/>
+ <pathelement location="${jboss.client}/jaxb-xjc.jar"/>
+ <pathelement location="${jboss.client}/jaxws-tools.jar"/>
+ <pathelement location="${jboss.client}/jboss-appclient.jar"/>
+ <pathelement location="${jboss.client}/jboss-container-metadata.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
+ <pathelement location="${jboss.client}/jboss-metadata.jar"/>
+ <pathelement location="${jboss.client}/jboss-remoting.jar"/>
+ <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/jbossall-client.jar"/>
+ <pathelement location="${jboss.client}/jbossws-jboss510.jar"/>
+ <pathelement location="${jboss.client}/jaxws-tools.jar"/>
+ <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
+ <pathelement location="${jboss.client}/log4j.jar"/>
+ <pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.client}/stax-api.jar"/>
+ <pathelement location="${jboss.client}/trove.jar"/>
+ <!-- FIXME jars should be available in the client dir -->
+ <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
+ <pathelement location="${jboss.lib}/jboss-classloader.jar"/>
+ <pathelement location="${jboss.lib}/jboss-classloading.jar"/>
+ <pathelement location="${jboss.lib}/jboss-classloading-vfs.jar"/>
+ <pathelement location="${jboss.lib}/jboss-container.jar"/>
+ <pathelement location="${jboss.lib}/jboss-dependency.jar"/>
+ <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
+ <pathelement location="${jboss.lib}/jboss-kernel.jar"/>
+ <pathelement location="${jboss.lib}/jboss-reflect.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.lib}/hibernate3.jar"/>
+ <pathelement location="${jboss.server.lib}/jnpserver.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/>
+ <pathelement location="${jboss.server.lib}/hibernate-core.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
+ <pathelement location="${tools.jar}"/>
+ <!-- WS-RM backports server dependencies -->
+ <pathelement location="${jboss.server.deploy}/jbossweb.sar/jbossweb.jar"/>
+ <pathelement location="${jboss.server.deployers}/jbossweb.deployer/jbossweb.jar"/>
+ </path>
+ </target>
+
<!-- ================================================================== -->
<!-- Compiling -->
<!-- ================================================================== -->
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2008-12-11 10:14:55 UTC (rev 8858)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2008-12-11 10:34:03 UTC (rev 8859)
@@ -50,12 +50,6 @@
public void testPositive() throws Exception
{
- if ( isTargetJBoss40() )
- {
- System.out.println("FIXME [JBWS-1813] context-root in jboss.xml is ignored");
- return;
- }
-
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
QName serviceName = new QName("http://org.jboss.ws/jbws1813", "EndpointService");
Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class);
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2008-12-11 10:14:55 UTC (rev 8858)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2008-12-11 10:34:03 UTC (rev 8859)
@@ -49,7 +49,7 @@
public static Test suite()
{
//here in the AS 5 jar we use <service-qname> that does not exist in AS 4.2.x
- return new JBossWSTestSetup(JBWS1841TestCase.class, new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-jbws1841-as5.jar" : "jaxws-jbws1841.jar");
+ return new JBossWSTestSetup(JBWS1841TestCase.class, new JBossWSTestHelper().isTargetJBoss5() ? "jaxws-jbws1841-as5.jar" : "jaxws-jbws1841.jar");
}
protected void setUp() throws Exception
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2008-12-11 10:14:55 UTC (rev 8858)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2008-12-11 10:34:03 UTC (rev 8859)
@@ -48,7 +48,7 @@
{
public static Test suite()
{
- String earName = (new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-eardeployment.ear" : "jaxws-samples-eardeployment42.ear");
+ String earName = (new JBossWSTestHelper().isTargetJBoss5() ? "jaxws-samples-eardeployment.ear" : "jaxws-samples-eardeployment42.ear");
return new JBossWSTestSetup(EarTestCase.class, earName);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2008-12-11 10:14:55 UTC (rev 8858)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2008-12-11 10:34:03 UTC (rev 8859)
@@ -49,7 +49,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(SecurityDomainTestCase.class, new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-securityDomain-as5.jar" : "jaxws-samples-securityDomain.jar");
+ return new JBossWSTestSetup(SecurityDomainTestCase.class, new JBossWSTestHelper().isTargetJBoss5() ? "jaxws-samples-securityDomain-as5.jar" : "jaxws-samples-securityDomain.jar");
}
private SecureEndpoint getPort() throws Exception
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2008-12-11 10:14:55 UTC (rev 8858)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2008-12-11 10:34:03 UTC (rev 8859)
@@ -50,7 +50,7 @@
public static Test suite()
{
String archives = "jaxws-samples-serviceref.war";
- if (new JBossWSTestHelper().isTargetJBoss50())
+ if (new JBossWSTestHelper().isTargetJBoss5())
archives += ",jaxws-samples-serviceref-client.jar";
return new JBossWSTestSetup(ServiceRefClientTestCase.class, archives);
@@ -66,7 +66,7 @@
public void testDynamicProxy() throws Exception
{
- if (isTargetJBoss50() == false)
+ if (isTargetJBoss5() == false)
return;
URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl");
@@ -81,7 +81,7 @@
public void testApplicationClient() throws Exception
{
- if (isTargetJBoss50() == false)
+ if (isTargetJBoss5() == false)
return;
InitialContext iniCtx = getInitialContext("jbossws-client");
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2008-12-11 10:14:55 UTC (rev 8858)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2008-12-11 10:34:03 UTC (rev 8859)
@@ -49,7 +49,7 @@
public static Test suite()
{
String archives = "jaxws-samples-serviceref.war";
- if (new JBossWSTestHelper().isTargetJBoss50())
+ if (new JBossWSTestHelper().isTargetJBoss5())
archives += ",jaxws-samples-serviceref-ejb-client.jar";
return new JBossWSTestSetup(ServiceRefEJBTestCase.class, archives);
@@ -67,7 +67,7 @@
public void testDynamicProxy() throws Exception
{
// JAXWS <service-ref> is only supported in EE5
- if (isTargetJBoss50())
+ if (isTargetJBoss5())
{
URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl");
QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/", "EndpointService");
@@ -84,7 +84,7 @@
public void testEJBClient() throws Exception
{
// JAXWS <service-ref> is only supported in EE5
- if (isTargetJBoss50())
+ if (isTargetJBoss5())
{
InitialContext iniCtx = getInitialContext();
EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup("/EJBClient/remote");
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2008-12-11 10:14:55 UTC (rev 8858)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2008-12-11 10:34:03 UTC (rev 8859)
@@ -47,7 +47,7 @@
public static Test suite()
{
String archives = "jaxws-samples-serviceref.war";
- if (new JBossWSTestHelper().isTargetJBoss50())
+ if (new JBossWSTestHelper().isTargetJBoss5())
archives += ",jaxws-samples-serviceref-servlet-client.war";
return new JBossWSTestSetup(ServiceRefServletTestCase.class, archives);
@@ -63,7 +63,7 @@
public void testDynamicProxy() throws Exception
{
- if (isTargetJBoss50() == false)
+ if (isTargetJBoss5() == false)
return;
URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl");
@@ -78,7 +78,7 @@
public void testServletClient() throws Exception
{
- if (isTargetJBoss50() == false)
+ if (isTargetJBoss5() == false)
return;
URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld");
17 years, 1 month
JBossWS SVN: r8858 - common/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-11 05:14:55 -0500 (Thu, 11 Dec 2008)
New Revision: 8858
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
adding support for jboss51x - sync with QA branch
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-12-11 10:08:28 UTC (rev 8857)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-12-11 10:14:55 UTC (rev 8858)
@@ -139,11 +139,26 @@
return JBossWSTestHelper.getServer();
}
+ public boolean isTargetJBoss5()
+ {
+ return isTargetJBoss51() || isTargetJBoss50();
+ }
+
+ public boolean isTargetJBoss51()
+ {
+ return delegate.isTargetJBoss51();
+ }
+
public boolean isTargetJBoss50()
{
return delegate.isTargetJBoss50();
}
+ public boolean isTargetJBoss4()
+ {
+ return isTargetJBoss42() || isTargetJBoss40();
+ }
+
public boolean isTargetJBoss42()
{
return delegate.isTargetJBoss42();
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-12-11 10:08:28 UTC (rev 8857)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-12-11 10:14:55 UTC (rev 8858)
@@ -82,6 +82,13 @@
return target.startsWith("jboss50");
}
+ /** True, if -Djbossws.integration.target=jboss51x */
+ public boolean isTargetJBoss51()
+ {
+ String target = getIntegrationTarget();
+ return target.startsWith("jboss51");
+ }
+
/** True, if -Djbossws.integration.target=jboss42x */
public boolean isTargetJBoss42()
{
@@ -200,7 +207,9 @@
if (jbossVersion == null)
throw new IllegalStateException("Cannot obtain jboss version");
- if (jbossVersion.startsWith("5.0"))
+ if (jbossVersion.startsWith("5.1"))
+ jbossVersion = "jboss51";
+ else if (jbossVersion.startsWith("5.0"))
jbossVersion = "jboss50";
else if (jbossVersion.startsWith("4.2"))
jbossVersion = "jboss42";
17 years, 1 month
JBossWS SVN: r8857 - common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-11 05:08:28 -0500 (Thu, 11 Dec 2008)
New Revision: 8857
Modified:
common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
adding support for jboss51x
Modified: common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-12-11 10:04:54 UTC (rev 8856)
+++ common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-12-11 10:08:28 UTC (rev 8857)
@@ -207,7 +207,9 @@
if (jbossVersion == null)
throw new IllegalStateException("Cannot obtain jboss version");
- if (jbossVersion.startsWith("5.0"))
+ if (jbossVersion.startsWith("5.1"))
+ jbossVersion = "jboss51";
+ else if (jbossVersion.startsWith("5.0"))
jbossVersion = "jboss50";
else if (jbossVersion.startsWith("4.2"))
jbossVersion = "jboss42";
17 years, 1 month
JBossWS SVN: r8856 - common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-11 05:04:54 -0500 (Thu, 11 Dec 2008)
New Revision: 8856
Modified:
common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTest.java
common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
adding support for jboss51x
Modified: common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-12-10 14:49:30 UTC (rev 8855)
+++ common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-12-11 10:04:54 UTC (rev 8856)
@@ -139,11 +139,26 @@
return JBossWSTestHelper.getServer();
}
+ public boolean isTargetJBoss5()
+ {
+ return isTargetJBoss51() || isTargetJBoss50();
+ }
+
+ public boolean isTargetJBoss51()
+ {
+ return delegate.isTargetJBoss51();
+ }
+
public boolean isTargetJBoss50()
{
return delegate.isTargetJBoss50();
}
+ public boolean isTargetJBoss4()
+ {
+ return isTargetJBoss42() || isTargetJBoss40();
+ }
+
public boolean isTargetJBoss42()
{
return delegate.isTargetJBoss42();
Modified: common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-12-10 14:49:30 UTC (rev 8855)
+++ common/branches/jbossws-common-1.0.8/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-12-11 10:04:54 UTC (rev 8856)
@@ -82,6 +82,13 @@
return target.startsWith("jboss50");
}
+ /** True, if -Djbossws.integration.target=jboss51x */
+ public boolean isTargetJBoss51()
+ {
+ String target = getIntegrationTarget();
+ return target.startsWith("jboss51");
+ }
+
/** True, if -Djbossws.integration.target=jboss42x */
public boolean isTargetJBoss42()
{
17 years, 1 month
JBossWS SVN: r8855 - common/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-12-10 09:49:30 -0500 (Wed, 10 Dec 2008)
New Revision: 8855
Modified:
common/trunk/pom.xml
Log:
Preparing common for next development cycle
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2008-12-10 14:48:10 UTC (rev 8854)
+++ common/trunk/pom.xml 2008-12-10 14:49:30 UTC (rev 8855)
@@ -9,7 +9,7 @@
<artifactId>jbossws-common</artifactId>
<packaging>jar</packaging>
- <version>1.0.8-SNAPSHOT</version>
+ <version>1.0.9-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -27,7 +27,7 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>1.0.7-SNAPSHOT</jbossws.spi.version>
+ <jbossws.spi.version>1.0.8-SNAPSHOT</jbossws.spi.version>
<jboss.common.version>2.2.7.GA</jboss.common.version>
<jboss.microcontainer.version>1.0.2</jboss.microcontainer.version>
</properties>
17 years, 1 month