3:35 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2007-11-01 04:35:16 -0400 (Thu, 01 Nov 2007)
New Revision: 4960
Modified:
framework/trunk/.classpath
framework/trunk/ant.properties.example
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java
framework/trunk/src/test/ant-import/build-testsuite.xml
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java
framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml
Log:
merge -r4823:4948 jbossws-framework-2.0.2
Modified: framework/trunk/.classpath
===================================================================
--- framework/trunk/.classpath 2007-11-01 08:25:36 UTC (rev 4959)
+++ framework/trunk/.classpath 2007-11-01 08:35:16 UTC (rev 4960)
@@ -15,6 +15,6 @@
<classpathentry kind="lib" path="thirdparty/activation.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib"
path="thirdparty/jbossws-common.jar"/>
- <classpathentry kind="lib"
path="thirdparty/jbossws-spi.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"
sourcepath="thirdparty/jbossws-spi-src.zip"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: framework/trunk/ant.properties.example
===================================================================
--- framework/trunk/ant.properties.example 2007-11-01 08:25:36 UTC (rev 4959)
+++ framework/trunk/ant.properties.example 2007-11-01 08:35:16 UTC (rev 4960)
@@ -3,6 +3,9 @@
#
# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
+# JDK settings
+#java.home.jdk16=/usr/java/jdk1.6
+
# The JBoss settings
jboss.server.instance=default
jboss.bind.address=localhost
@@ -27,9 +30,9 @@
hudson.metro.url=https://svn.jboss.org/repos/jbossws/stack/metro/trunk
hudson.cxf.url=https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
-hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/trunk
-hudson.jboss500.build=jboss-5.0.0.Beta3
-hudson.jboss500.rev=HEAD
+hudson.jboss405.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA
+hudson.jboss405.build=jboss-4.0.5.GA
+hudson.jboss405.rev=HEAD
hudson.jboss421.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_1_GA
hudson.jboss421.build=jboss-4.2.1.GA
@@ -39,9 +42,9 @@
hudson.jboss422.build=jboss-4.2.2.GA
hudson.jboss422.rev=HEAD
-hudson.jboss405.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA
-hudson.jboss405.build=jboss-4.0.5.GA
-hudson.jboss405.rev=HEAD
+hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/trunk
+hudson.jboss500.build=jboss-5.0.0.Beta3
+hudson.jboss500.rev=HEAD
hudson.mail.recipients=
hudson.smtp.host=localhost
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java
===================================================================
---
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java 2007-11-01
08:25:36 UTC (rev 4959)
+++
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java 2007-11-01
08:35:16 UTC (rev 4960)
@@ -52,12 +52,15 @@
@Override
public void create(Deployment dep)
{
- Iterator<String> it = contextProperties.keySet().iterator();
- while (it.hasNext())
+ if (contextProperties != null)
{
- String key = it.next();
- String value = contextProperties.get(key);
- dep.setProperty(key, value);
+ Iterator<String> it = contextProperties.keySet().iterator();
+ while (it.hasNext())
+ {
+ String key = it.next();
+ String value = contextProperties.get(key);
+ dep.setProperty(key, value);
+ }
}
}
}
\ No newline at end of file
Modified: framework/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-testsuite.xml 2007-11-01 08:25:36 UTC (rev
4959)
+++ framework/trunk/src/test/ant-import/build-testsuite.xml 2007-11-01 08:35:16 UTC (rev
4960)
@@ -337,7 +337,7 @@
<sequential>
<mkdir dir="${tests.output.dir}/classes"/>
<javac destdir="${tests.output.dir}/classes"
debug="${javac.debug}" encoding="utf-8"
verbose="${javac.verbose}" deprecation="${javac.deprecation}"
- failonerror="${javac.fail.onerror}"
excludesfile="@{excludesfile}">
+ failonerror="${javac.fail.onerror}"
excludesfile="${excludesfile}">
<src path="@{srcdir}"/>
<classpath refid="tests.javac.classpath"/>
</javac>
@@ -416,7 +416,7 @@
<param name="include.wildcard"
value="org/jboss/test/ws/jaxws/samples/**/*TestCase.class
org/jboss/test/ws/*/smoke/**/*TestCase.class"/>
<param name="exclude.wildcard"
value="org/jboss/test/ws/*/samples/jaxr/**"/>
<!--
- According to our commit policy, haltonfailure MUST be be true for tests-samples.
+ According to our commit policy, haltonfailure MUST be be true for tests-smoke
It is a prerequisite for any commit that this target passes without failure.
-->
<param name="haltonfailure" value="true"/>
@@ -429,6 +429,7 @@
<antcall target="tests-run-internal">
<param name="include.wildcard"
value="org/jboss/test/ws/*/samples/**/*TestCase.class"/>
<param name="exclude.wildcard"
value="org/jboss/test/ws/*/samples/jaxr/**"/>
+ <param name="haltonfailure" value="false"/>
</antcall>
</target>
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java
===================================================================
---
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2007-11-01
08:25:36 UTC (rev 4959)
+++
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2007-11-01
08:35:16 UTC (rev 4960)
@@ -21,18 +21,20 @@
*/
package org.jboss.test.ws.jaxws.samples.serviceref;
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+
+import javax.naming.InitialContext;
+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.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
-import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-
/**
* Test the JAXRPC <service-ref>
*
@@ -63,31 +65,32 @@
public void testDynamicProxy() throws Exception
{
- if (isTargetJBoss50() == false)
- return;
-
- URL wsdlURL = new
File("resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
- QName qname = new
QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";,
"TestEndpointService");
- Service service = Service.create(wsdlURL, qname);
- TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ // JAXWS <service-ref> is only supported in EE5
+ if (isTargetJBoss50())
+ {
+ URL wsdlURL = new
File("resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
+ QName qname = new
QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";,
"TestEndpointService");
+ Service service = Service.create(wsdlURL, qname);
+ TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
- String helloWorld = "testDynamicProxy";
- Object retObj = port.echo(helloWorld);
- assertEquals(helloWorld, retObj);
+ String helloWorld = "testDynamicProxy";
+ Object retObj = port.echo(helloWorld);
+ assertEquals(helloWorld, retObj);
+ }
}
public void testEJBClient() throws Exception
{
- if (isTargetJBoss50() == false)
- return;
-
- InitialContext iniCtx = getInitialContext();
- EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup("/ejb/EJBClient");
+ // JAXWS <service-ref> is only supported in EE5
+ if (isTargetJBoss50())
+ {
+ InitialContext iniCtx = getInitialContext();
+ EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup("/ejb/EJBClient");
- String helloWorld = "Hello World!";
- Object retObj = ejbRemote.echo(helloWorld);
- assertEquals(helloWorld, retObj);
-
+ String helloWorld = "Hello World!";
+ Object retObj = ejbRemote.echo(helloWorld);
+ assertEquals(helloWorld, retObj);
+ }
}
}
Modified:
framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml
===================================================================
---
framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml 2007-11-01
08:25:36 UTC (rev 4959)
+++
framework/trunk/src/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml 2007-11-01
08:35:16 UTC (rev 4960)
@@ -17,14 +17,14 @@
<service-ref-name>service1</service-ref-name>
<service-interface>javax.xml.ws.Service</service-interface>
<wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
-
<service-qname>{http://serviceref.samples.jaxws.ws.test.jboss.org/}Test...
+ <service-qname
xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&...
</service-ref>
<service-ref>
<service-ref-name>service2</service-ref-name>
<service-interface>org.jboss.test.ws.jaxws.samples.serviceref.TestEndpointService</service-interface>
<wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
-
<service-qname>{http://serviceref.samples.jaxws.ws.test.jboss.org/}Test...
+ <service-qname
xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&...
<port-component-ref>
<service-endpoint-interface>org.jboss.test.ws.jaxws.samples.serviceref.TestEndpoint</service-endpoint-interface>
<enable-mtom>true</enable-mtom>
@@ -35,7 +35,7 @@
<service-ref-name>service3</service-ref-name>
<service-interface>javax.xml.ws.Service</service-interface>
<wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file>
-
<service-qname>{http://serviceref.samples.jaxws.ws.test.jboss.org/}Test...
+ <service-qname
xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&...
<port-component-ref>
<service-endpoint-interface>org.jboss.test.ws.jaxws.samples.serviceref.TestEndpoint</service-endpoint-interface>
<enable-mtom>true</enable-mtom>