[jbossws-commits] JBossWS SVN: r1289 - in branches/tdiesler/trunk: . src/ant src/test src/test/ant src/test/java/org/jboss/test/ws/jaxws/webserviceref src/test/resources/jaxws/webserviceref/META-INF
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Oct 23 13:26:18 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-10-23 13:26:08 -0400 (Mon, 23 Oct 2006)
New Revision: 1289
Added:
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java
branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml
branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml
Modified:
branches/tdiesler/trunk/src/ant/build-thirdparty.xml
branches/tdiesler/trunk/src/test/ant/build-jars-jaxws.xml
branches/tdiesler/trunk/src/test/build.xml
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefTestCase.java
branches/tdiesler/trunk/version.properties
Log:
partial commit
Modified: branches/tdiesler/trunk/src/ant/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/src/ant/build-thirdparty.xml 2006-10-23 16:09:18 UTC (rev 1288)
+++ branches/tdiesler/trunk/src/ant/build-thirdparty.xml 2006-10-23 17:26:08 UTC (rev 1289)
@@ -31,6 +31,7 @@
<get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/>
@@ -65,6 +66,7 @@
<pathelement location="${thirdparty.dir}/javassist.jar"/>
<pathelement location="${thirdparty.dir}/concurrent.jar"/>
<pathelement location="${thirdparty.dir}/log4j.jar"/>
+ <pathelement location="${thirdparty.dir}/hibernate3.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-impl.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
Modified: branches/tdiesler/trunk/src/test/ant/build-jars-jaxws.xml
===================================================================
--- branches/tdiesler/trunk/src/test/ant/build-jars-jaxws.xml 2006-10-23 16:09:18 UTC (rev 1288)
+++ branches/tdiesler/trunk/src/test/ant/build-jars-jaxws.xml 2006-10-23 17:26:08 UTC (rev 1289)
@@ -409,6 +409,20 @@
<include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/>
</classes>
</war>
+ <jar destfile="${build.test.dir}/libs/jaxws-webserviceref-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jaxws/webserviceref/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.ApplicationClient"/>
+ </manifest>
+ </jar>
<!-- jaxws-wsaddressing-action -->
<war warfile="${build.test.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
Modified: branches/tdiesler/trunk/src/test/build.xml
===================================================================
--- branches/tdiesler/trunk/src/test/build.xml 2006-10-23 16:09:18 UTC (rev 1288)
+++ branches/tdiesler/trunk/src/test/build.xml 2006-10-23 17:26:08 UTC (rev 1289)
@@ -175,8 +175,10 @@
<pathelement location="${build.lib.dir}/${jbossws.build}-jboss-integration.jar"/>
<pathelement location="${build.lib.dir}/${jbossws.build}-tomcat-integration.jar"/>
<pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
<pathelement location="${jboss.lib}/jboss-system.jar"/>
<pathelement location="${jboss.server.lib}/jboss.jar"/>
+ <pathelement location="${thirdparty.dir}/hibernate3.jar"/>
<pathelement location="${thirdparty.dir}/qdox.jar"/>
<pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/>
<pathelement location="${thirdparty.dir}/policy-1.0.jar"/>
Added: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-23 16:09:18 UTC (rev 1288)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-23 17:26:08 UTC (rev 1289)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.webserviceref;
+
+import javax.xml.ws.WebServiceRef;
+
+public class ApplicationClient
+{
+ @WebServiceRef(wsdlLocation = "resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl")
+ public TestEndpointService service;
+
+ public static void main(String[] args)
+ {
+ ApplicationClient client = new ApplicationClient();
+ String outStr = client.echo("Hello world!");
+ System.out.println(outStr);
+ }
+
+ public String echo(String inStr)
+ {
+ TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ String outStr = port.echo(inStr);
+ return outStr;
+ }
+}
Property changes on: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefTestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefTestCase.java 2006-10-23 16:09:18 UTC (rev 1288)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefTestCase.java 2006-10-23 17:26:08 UTC (rev 1289)
@@ -25,22 +25,22 @@
import java.net.MalformedURLException;
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.ejb3.client.ClientLauncher;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
/**
- * Test the JSR-181 annotation: javax.jws.WebService
+ * Test the JAXWS annotation: javax.xml.ws.WebServiceref
*
- * @author Thomas.Diesler at jboss.org
- * @since 29-Apr-2005
+ * @author Thomas.Diesler at jboss.com
+ * @since 23-Oct-2005
*/
public class WebServiceRefTestCase extends JBossWSTest
{
@@ -48,13 +48,19 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(WebServiceRefTestCase.class, "jaxws-webserviceref.war");
+ return JBossWSTestSetup.newTestSetup(WebServiceRefTestCase.class, "jaxws-webserviceref.war, jaxws-webserviceref-client.jar");
}
+ public void testWSDLAccess() throws MalformedURLException
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
+ assertNotNull(wsdlDefinitions);
+ }
+
public void testDynamicProxy() throws Exception
{
- assertWSDLAccess();
-
URL wsdlURL = new File("resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL();
QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
Service service = Service.create(wsdlURL, qname);
@@ -65,11 +71,8 @@
assertEquals(helloWorld, retObj);
}
- private void assertWSDLAccess() throws MalformedURLException
+ public void testApplicationClient() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- assertNotNull(wsdlDefinitions);
+ ClientLauncher.launch(ApplicationClient.class.getName(), "jbossws-client", new String[0]);
}
}
Added: branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml 2006-10-23 16:09:18 UTC (rev 1288)
+++ branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml 2006-10-23 17:26:08 UTC (rev 1289)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client version="5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd">
+
+ <display-name>TestEndpointService</display-name>
+
+</application-client>
Property changes on: branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml 2006-10-23 16:09:18 UTC (rev 1288)
+++ branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml 2006-10-23 17:26:08 UTC (rev 1289)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd">
+
+<jboss-client>
+ <jndi-name>jbossws-client</jndi-name>
+</jboss-client>
Property changes on: branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/tdiesler/trunk/version.properties
===================================================================
--- branches/tdiesler/trunk/version.properties 2006-10-23 16:09:18 UTC (rev 1288)
+++ branches/tdiesler/trunk/version.properties 2006-10-23 17:26:08 UTC (rev 1289)
@@ -27,6 +27,7 @@
apache-log4j=1.2.8
apache-xalan=j_2.7.0
apache-xerces=2.7.1
+hibernate=3.2.0.CR2
jboss-backport-concurrent=2.1.0.GA
jboss-jbossretro=1.0.2.GA
jbpm-bpel=1.1.Beta2
More information about the jbossws-commits
mailing list