JBossWS SVN: r1539 - trunk/src/main/java/org/jboss/ws/integration/tomcat
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-12-03 16:44:17 -0500 (Sun, 03 Dec 2006)
New Revision: 1539
Modified:
trunk/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java
Log:
Tomcat integration.
Modified: trunk/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java 2006-12-03 21:28:12 UTC (rev 1538)
+++ trunk/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java 2006-12-03 21:44:17 UTC (rev 1539)
@@ -45,7 +45,7 @@
// provide logging
protected final Logger log = Logger.getLogger(wspublish.class);
- public static final String DEFAULT_TOMCAT_SERVICE_ENDPOINT_SERVLET = "org.jboss.ws.integration.other.GenericServiceEndpointServlet";
+ public static final String DEFAULT_TOMCAT_SERVICE_ENDPOINT_SERVLET = "org.jboss.ws.integration.tomcat.TomcatServiceEndpointServlet";
public URL process(URL warURL, File destDir, String servletName) throws IOException
{
18 years, 3 months
JBossWS SVN: r1538 - trunk
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-12-03 16:28:12 -0500 (Sun, 03 Dec 2006)
New Revision: 1538
Modified:
trunk/build.xml
Log:
Tomcat integration.
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2006-12-03 20:56:50 UTC (rev 1537)
+++ trunk/build.xml 2006-12-03 21:28:12 UTC (rev 1538)
@@ -400,11 +400,9 @@
<!-- Deploy to Tomcat -->
<target name="deploy-tomcat" depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to Tomcat">
- <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/resolver.jar"/>
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/>
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/>
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.jar"/>
- <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xml-apis.jar"/>
<copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/activation.jar"/>
<copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/>
<copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mailapi.jar"/>
18 years, 3 months
JBossWS SVN: r1537 - in trunk: . docs/user-guide/project/en/modules/installation src/ant src/main/resources/jbossws.war/Tomcat/META-INF
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-12-03 15:56:50 -0500 (Sun, 03 Dec 2006)
New Revision: 1537
Modified:
trunk/build.xml
trunk/docs/user-guide/project/en/modules/installation/install-tomcat.xml
trunk/src/ant/build-release.xml
trunk/src/main/resources/jbossws.war/Tomcat/META-INF/jboss-beans.xml
Log:
Fixed Tomcat integration.
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2006-12-03 18:10:58 UTC (rev 1536)
+++ trunk/build.xml 2006-12-03 20:56:50 UTC (rev 1537)
@@ -411,6 +411,9 @@
<copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-core.jar" overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-jaxws.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-saaj.jar" overwrite="true"/>
<copy todir="${tomcat.webapps.dir}" file="${build.lib.dir}/jbossws.war" overwrite="true"/>
<delete dir="${tomcat.webapps.dir}/jbossws"/>
</target>
@@ -418,10 +421,12 @@
<target name="jbossws-thirdparty-jar" unless="jbossws.thirdparty.available">
<!-- Build jbossws-thirdparty.jar -->
<mkdir dir="${build.lib.dir}/build"/>
- <!--unjar dest="${build.lib.dir}/build" src="${jboss.lib}/jboss-common.jar"/-->
+ <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jaxb-api.jar"/>
+ <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-common-core.jar"/>
<unjar dest="${build.lib.dir}/build" src="${jboss.server.lib}/jboss-j2ee.jar"/>
<unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-container.jar"/>
<unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-dependency.jar"/>
+ <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-logging-spi.jar"/>
<unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-microcontainer.jar"/>
<unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-remoting.jar"/>
<unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-xml-binding.jar"/>
Modified: trunk/docs/user-guide/project/en/modules/installation/install-tomcat.xml
===================================================================
--- trunk/docs/user-guide/project/en/modules/installation/install-tomcat.xml 2006-12-03 18:10:58 UTC (rev 1536)
+++ trunk/docs/user-guide/project/en/modules/installation/install-tomcat.xml 2006-12-03 20:56:50 UTC (rev 1537)
@@ -25,16 +25,22 @@
</listitem>
<listitem>
<para>
- Copy activation.jar, mailapi.jar, log4j.jar to ${tomcat.home}/common/lib.
+ Copy the following jars to ${tomcat.home}/common/lib
+ <itemizedlist>
+ <listitem>activation.jar</listitem>
+ <listitem>jbossws-core.jar</listitem>
+ <listitem>jbossws-tomcat-integration.jar</listitem>
+ <listitem>jbossws-thirdparty.jar</listitem>
+ <listitem>jboss-jaxrpc.jar</listitem>
+ <listitem>jboss-jaxws.jar</listitem>
+ <listitem>jboss-saaj.jar</listitem>
+ <listitem>log4j.jar</listitem>
+ <listitem>mailapi.jar</listitem>
+ </itemizedlist>
</para>
</listitem>
<listitem>
<para>
- Copy jbossws-core.jar, jbossws-tomcat-integration.jar, jbossws-thirdparty.jar to ${tomcat.home}/common/lib.
- </para>
- </listitem>
- <listitem>
- <para>
Copy jbossws.war to ${tomcat.home}/webapps.
</para>
</listitem>
Modified: trunk/src/ant/build-release.xml
===================================================================
--- trunk/src/ant/build-release.xml 2006-12-03 18:10:58 UTC (rev 1536)
+++ trunk/src/ant/build-release.xml 2006-12-03 20:56:50 UTC (rev 1537)
@@ -156,6 +156,9 @@
<include name="jbossws-core.jar"/>
<include name="jbossws-tomcat-integration.jar"/>
<include name="jbossws-thirdparty.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
</fileset>
</copy>
<copy todir="${build.bin.dist}/lib/tomcat/webapps" overwrite="true">
Modified: trunk/src/main/resources/jbossws.war/Tomcat/META-INF/jboss-beans.xml
===================================================================
--- trunk/src/main/resources/jbossws.war/Tomcat/META-INF/jboss-beans.xml 2006-12-03 18:10:58 UTC (rev 1536)
+++ trunk/src/main/resources/jbossws.war/Tomcat/META-INF/jboss-beans.xml 2006-12-03 20:56:50 UTC (rev 1537)
@@ -23,9 +23,8 @@
<property name="serviceEndpointManager"><inject bean="ServiceEndpointManager"/></property>
</bean>
- <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.other.GenericServiceEndpointPublisher">
- <property name="serviceEndpointDeployer"><inject bean="ServiceEndpointDeployer"/></property>
- <property name="serviceEndpointServlet">org.jboss.ws.integration.other.GenericServiceEndpointServlet</property>
+ <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.tomcat.TomcatServiceEndpointPublisher">
+ <property name="serviceEndpointServlet">org.jboss.ws.integration.tomcat.TomcatServiceEndpointServlet</property>
<property name="deployDir">${catalina.home}/jbossws-deploy</property>
<property name="targetDir">${catalina.home}/webapps</property>
<property name="interval">500</property>
@@ -36,7 +35,7 @@
-->
<bean name="SubscriptionManager" class="org.jboss.ws.eventing.mgmt.SubscriptionManager"/>
- <bean name="ServerConfig" class="org.jboss.ws.integration.other.ServerConfigImpl"/>
+ <bean name="ServerConfig" class="org.jboss.ws.integration.tomcat.ServerConfigImpl"/>
<bean name="KernelLocator" class="org.jboss.ws.server.KernelLocator"/>
18 years, 3 months
JBossWS SVN: r1536 - trunk/docs/online/jax-ws-hello-world
by jbossws-commits＠lists.jboss.org
Author: sam.griffith(a)jboss.com
Date: 2006-12-03 13:10:58 -0500 (Sun, 03 Dec 2006)
New Revision: 1536
Modified:
trunk/docs/online/jax-ws-hello-world/build.xml
Log:
test from Textmate
Modified: trunk/docs/online/jax-ws-hello-world/build.xml
===================================================================
--- trunk/docs/online/jax-ws-hello-world/build.xml 2006-12-03 18:02:10 UTC (rev 1535)
+++ trunk/docs/online/jax-ws-hello-world/build.xml 2006-12-03 18:10:58 UTC (rev 1536)
@@ -16,14 +16,18 @@
<property name="jboss.server" value="${jboss.dir}/server/${server.config}"/>
<property name="jboss.server.lib" value="${jboss.server}/lib"/>
<property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
+
<!-- JDK Detection -->
<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
+
<!-- Check for new WS jar file -->
<available file="${jboss.client}/jbossws-client.jar" value="jbossws-client.jar" property="jbossws.client.jar"/>
+
<!-- Mapper definitions -->
<!-- <mapper id="deployedFileMapper" type="regexp" from="*hello*.war"/> -->
- <available property="jbossws.client.jar" value="jbossws14-client.jar" file="${jboss.client}/jbossws14-client.jar"/>
<available property="jbossws.client.jar" value="jbossws-client.jar" file="${jboss.client}/jbossws-client.jar"/>
+
+<!-- Path Definitions -->
<path id="client.classpath">
<fileset dir="${jboss.client}">
<include name="activation.jar"/>
@@ -42,19 +46,21 @@
<path refid="client.classpath"/>
<pathelement location="${jboss.server.lib}/jboss.jar"/>
</path>
+
<!-- Targets -->
<target name="generate-sources" depends="" description="Generate the deployment resources." if="HAVE_JDK_1.5">
<!-- Define a taskdef for the wstools ant task -->
<echo message="Inside generate-sources"/>
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${jboss.client}/*.jar"/>
+ <classpath refid="client.classpath"/>
<classpath path="${top.dir}/classes"/>
- <classpath path="${top.dir}"/>
+ <classpath path="${top.dir}"/>
</taskdef>
<echo message="wstools about to run"/>
<wstools dest="${top.dir}/META-INF" config="${resources.dir}/wstools-config.xml"/>
</target>
+
<target name="clean">
<echo message="In clean"/>
<delete file="${top.dir}/helloworldws.war"/>
@@ -72,6 +78,7 @@
<src path="${java.dir}"/>
</javac>
</target>
+
<!--
Compile the generated java sources
-->
@@ -80,6 +87,7 @@
<src path="${build.wstools.java}"/>
</javac>
</target>
+
<target name="main" depends="compile15, generate-sources, compile-generated" if="jbossws.client.jar">
<echo message="In main"/>
<war warfile="helloworldws.war" webxml="${src.dir}/metadata/web.xml">
@@ -91,11 +99,13 @@
</war>
<antcall target="deploy"/>
</target>
+
<target name="deploy">
<echo message="In deploy"/>
<copy file="${top.dir}/helloworldws.war" todir="${jboss.server.deploy}"/>
<delete file="${top.dir}/helloworldws.war"/>
</target>
+
<target name="undeploy">
<echo message="In undeploy"/>
<delete>
18 years, 3 months
JBossWS SVN: r1535 - in trunk/docs/online: . jax-ws-hello-world jax-ws-hello-world/classes jax-ws-hello-world/classes/org jax-ws-hello-world/classes/org/jboss jax-ws-hello-world/classes/org/jboss/samples jax-ws-hello-world/resources
by jbossws-commits＠lists.jboss.org
Author: sam.griffith(a)jboss.com
Date: 2006-12-03 13:02:10 -0500 (Sun, 03 Dec 2006)
New Revision: 1535
Added:
trunk/docs/online/jax-ws-hello-world/
trunk/docs/online/jax-ws-hello-world/build.xml
trunk/docs/online/jax-ws-hello-world/classes/
trunk/docs/online/jax-ws-hello-world/classes/org/
trunk/docs/online/jax-ws-hello-world/classes/org/jboss/
trunk/docs/online/jax-ws-hello-world/classes/org/jboss/samples/
trunk/docs/online/jax-ws-hello-world/classes/org/jboss/samples/EndpointInterface.class
trunk/docs/online/jax-ws-hello-world/classes/org/jboss/samples/HelloWorldWS.class
trunk/docs/online/jax-ws-hello-world/resources/
trunk/docs/online/jax-ws-hello-world/resources/wstools-config.xml
Log:
Sam's simple example
Added: trunk/docs/online/jax-ws-hello-world/build.xml
===================================================================
--- trunk/docs/online/jax-ws-hello-world/build.xml 2006-12-03 10:58:35 UTC (rev 1534)
+++ trunk/docs/online/jax-ws-hello-world/build.xml 2006-12-03 18:02:10 UTC (rev 1535)
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!-- Build file for JSR 181 POJO Hello World Web Service Example using new WS Stack -->
+<project name="JSR 181 POJO Hello World Web Service Buildfile" default="main" basedir=".">
+<!-- Standard Properties -->
+ <property name="top.dir" value="${basedir}"/>
+ <property name="user.home.dir" value="/Users/sgriffith/"/>
+ <property name="server.config" value="default"/>
+ <property name="top.dir" value="."/>
+ <property name="src.dir" value="${top.dir}/src"/>
+ <property name="build.classes" value="${top.dir}/classes"/>
+ <property name="java.dir" value="${top.dir}/src/java"/>
+ <property name="resources.dir" value="${top.dir}/resources"/>
+ <property name="jboss.dir" value="${user.home.dir}/jboss-5.0.0.Beta1"/>
+ <property name="jboss.client" value="${jboss.dir}/client"/>
+ <property name="jboss.lib" value="${jboss.dir}/lib"/>
+ <property name="jboss.server" value="${jboss.dir}/server/${server.config}"/>
+ <property name="jboss.server.lib" value="${jboss.server}/lib"/>
+ <property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
+<!-- JDK Detection -->
+ <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
+<!-- Check for new WS jar file -->
+ <available file="${jboss.client}/jbossws-client.jar" value="jbossws-client.jar" property="jbossws.client.jar"/>
+<!-- Mapper definitions -->
+<!-- <mapper id="deployedFileMapper" type="regexp" from="*hello*.war"/> -->
+ <available property="jbossws.client.jar" value="jbossws14-client.jar" file="${jboss.client}/jbossws14-client.jar"/>
+ <available property="jbossws.client.jar" value="jbossws-client.jar" file="${jboss.client}/jbossws-client.jar"/>
+ <path id="client.classpath">
+ <fileset dir="${jboss.client}">
+ <include name="activation.jar"/>
+ <include name="commons-logging.jar"/>
+ <include name="javassist.jar"/>
+ <include name="jbossall-client.jar"/>
+ <include name="jbossretro-rt.jar"/>
+ <include name="jboss-backport-concurrent.jar"/>
+ <include name="${jbossws.client.jar}"/>
+ <include name="log4j.jar"/>
+ <include name="mail.jar"/>
+ <include name="jboss-logging-log4j.jar"/>
+ </fileset>
+ </path>
+ <path id="compile.classpath">
+ <path refid="client.classpath"/>
+ <pathelement location="${jboss.server.lib}/jboss.jar"/>
+ </path>
+<!-- Targets -->
+ <target name="generate-sources" depends="" description="Generate the deployment resources." if="HAVE_JDK_1.5">
+<!-- Define a taskdef for the wstools ant task -->
+ <echo message="Inside generate-sources"/>
+ <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
+ <classpath refid="compile.classpath"/>
+ <classpath path="${jboss.client}/*.jar"/>
+ <classpath path="${top.dir}/classes"/>
+ <classpath path="${top.dir}"/>
+ </taskdef>
+ <echo message="wstools about to run"/>
+ <wstools dest="${top.dir}/META-INF" config="${resources.dir}/wstools-config.xml"/>
+ </target>
+ <target name="clean">
+ <echo message="In clean"/>
+ <delete file="${top.dir}/helloworldws.war"/>
+ <delete dir="${build.classes}"/>
+ <mkdir dir="${build.classes}"/>
+ </target>
+<!--
+ Compile the java sources
+ -->
+<!--
+ Compile the java sources with jdk-1.5
+ -->
+ <target name="compile15" depends="" description="compile the sources" if="HAVE_JDK_1.5">
+ <javac destdir="${build.classes}" classpathref="compile.classpath" debug="on">
+ <src path="${java.dir}"/>
+ </javac>
+ </target>
+<!--
+ Compile the generated java sources
+ -->
+ <target name="compile-generated" depends="" description="compile the generated sources">
+ <javac destdir="${build.classes}" classpathref="compile.classpath" debug="on">
+ <src path="${build.wstools.java}"/>
+ </javac>
+ </target>
+ <target name="main" depends="compile15, generate-sources, compile-generated" if="jbossws.client.jar">
+ <echo message="In main"/>
+ <war warfile="helloworldws.war" webxml="${src.dir}/metadata/web.xml">
+<!-- <webinf dir="${src.dir}/metadata" />
+ -->
+ <classes dir="${top.dir}/classes">
+ <include name="org/jboss/samples/HelloWorldWS.class"/>
+ </classes>
+ </war>
+ <antcall target="deploy"/>
+ </target>
+ <target name="deploy">
+ <echo message="In deploy"/>
+ <copy file="${top.dir}/helloworldws.war" todir="${jboss.server.deploy}"/>
+ <delete file="${top.dir}/helloworldws.war"/>
+ </target>
+ <target name="undeploy">
+ <echo message="In undeploy"/>
+ <delete>
+ <fileset id="web_service_wars" dir="${jboss.server.deploy}" includes="*hello*.war"/>
+ </delete>
+ </target>
+</project>
Added: trunk/docs/online/jax-ws-hello-world/classes/org/jboss/samples/EndpointInterface.class
===================================================================
(Binary files differ)
Property changes on: trunk/docs/online/jax-ws-hello-world/classes/org/jboss/samples/EndpointInterface.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/online/jax-ws-hello-world/classes/org/jboss/samples/HelloWorldWS.class
===================================================================
(Binary files differ)
Property changes on: trunk/docs/online/jax-ws-hello-world/classes/org/jboss/samples/HelloWorldWS.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/online/jax-ws-hello-world/resources/wstools-config.xml
===================================================================
--- trunk/docs/online/jax-ws-hello-world/resources/wstools-config.xml 2006-12-03 10:58:35 UTC (rev 1534)
+++ trunk/docs/online/jax-ws-hello-world/resources/wstools-config.xml 2006-12-03 18:02:10 UTC (rev 1535)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -config wstools-config.xml
+-->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+
+ <global>
+ <package-namespace package="org.jboss.samples.helloworld" namespace="http://org.jboss.ws/samples/helloword"/>
+ </global>
+ <wsdl-java location="resources/HelloWorld.wsdl">
+ <mapping file="jaxrpc-mapping.xml" />
+ </wsdl-java>
+
+</configuration>
\ No newline at end of file
18 years, 3 months
JBossWS SVN: r1534 - branches/dlofthouse
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-12-03 05:58:35 -0500 (Sun, 03 Dec 2006)
New Revision: 1534
Removed:
branches/dlofthouse/JBWS-981/
Log:
Branch no longer required.
18 years, 3 months
JBossWS SVN: r1533 - in trunk/src: main/java/org/jboss/ws/integration/jboss50 main/java/org/jboss/ws/metadata/builder/jaxws test/java/org/jboss/test/ws/jaxws/jbws981
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-12-03 05:54:48 -0500 (Sun, 03 Dec 2006)
New Revision: 1533
Modified:
trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java
trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
Log:
JBWS-981 - Ported implementation from branches/jbossws-1.0 and modified for JBoss 5
Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java 2006-12-03 10:02:52 UTC (rev 1532)
+++ trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java 2006-12-03 10:54:48 UTC (rev 1533)
@@ -28,6 +28,7 @@
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.jboss.deployers.spi.deployer.DeploymentUnit;
@@ -231,6 +232,7 @@
<jboss-web>
<security-domain>java:/jaas/cts</security-domain>
<context-root>/ws/ejbN/</context-root>
+ <virtual-host>some.domain.com</virtual-host>
</jboss-web>
*/
Element jbossWeb = DOMUtils.createElement("jboss-web");
@@ -267,6 +269,38 @@
Element root = (Element)jbossWeb.appendChild(DOMUtils.createElement("context-root"));
root.appendChild(DOMUtils.createTextNode(contextRoot));
+ String[] virtualHosts = null;
+ for (EndpointMetaData epMetaData : epMetaDataList)
+ {
+ ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
+ String[] next = sepMetaData.getVirtualHosts();
+ if (next != null && next.length > 0)
+ {
+ Arrays.sort(next);
+ if (virtualHosts == null)
+ {
+ virtualHosts = next;
+ }
+ else
+ {
+ if (Arrays.equals(virtualHosts, next) == false)
+ {
+ throw new WSException("All endpoints must define the same virtual hosts");
+ }
+ }
+ }
+ }
+
+ if (virtualHosts != null)
+ {
+ for (String current : virtualHosts)
+ {
+ Element virtualHost = (Element)jbossWeb.appendChild(DOMUtils.createElement("virtual-host"));
+ virtualHost.appendChild(DOMUtils.createTextNode(current));
+ }
+ }
+
+
return jbossWeb;
}
Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java 2006-12-03 10:02:52 UTC (rev 1532)
+++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java 2006-12-03 10:54:48 UTC (rev 1533)
@@ -129,6 +129,13 @@
sepMetaData.setTransportGuarantee(transportGuarantee);
}
}
+
+ // virtual hosts
+ String[] virtualHosts = anPortComponent.virtualHosts();
+ if (virtualHosts != null & virtualHosts.length > 0)
+ {
+ sepMetaData.setVirtualHosts(virtualHosts);
+ }
}
}
}
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2006-12-03 10:02:52 UTC (rev 1532)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2006-12-03 10:54:48 UTC (rev 1533)
@@ -22,15 +22,12 @@
package org.jboss.test.ws.jaxws.jbws981;
import javax.ejb.Stateless;
-import javax.jws.WebMethod;
import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.jboss.logging.Logger;
import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.ws.annotation.PortComponent;
/**
*
@@ -55,7 +52,7 @@
catch (Exception e)
{
log.error(e);
- return e.getMessage();
+ return "Unable to get WebModule MBean for virtual host - virtual-host not handled from @PortComponent";
}
return message;
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2006-12-03 10:02:52 UTC (rev 1532)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2006-12-03 10:54:48 UTC (rev 1533)
@@ -55,7 +55,7 @@
if (true) return;
if (port == null)
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080jaxws-jbws981/EJB3Bean?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws981/EJB3Bean?wsdl");
QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws981", "TestService");
Service.create(wsdlURL, serviceName);
Service service = Service.create(wsdlURL, serviceName);
@@ -65,10 +65,10 @@
public void testCall() throws Exception
{
- System.out.println("FIXME: [JBWS-981] Virtual host configuration for EJB endpoints");
+ System.out.println("FIXME: [JBWS-981] Virtual host configuration for EJB endpoints (Enable once JBossAS supports virtual-host element)");
if (true) return;
String message = "hello";
- assertEquals(message, port.hello(message));
+ assertEquals("Web service mapped to virtual host.", port.hello(message));
}
}
\ No newline at end of file
18 years, 3 months
JBossWS SVN: r1532 - in branches/dlofthouse/JBWS-981/src: main/java/org/jboss/ws/integration/jboss50 main/java/org/jboss/ws/metadata/builder/jaxws test/java/org/jboss/test/ws/jaxws/jbws981
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-12-03 05:02:52 -0500 (Sun, 03 Dec 2006)
New Revision: 1532
Modified:
branches/dlofthouse/JBWS-981/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java
branches/dlofthouse/JBWS-981/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java
branches/dlofthouse/JBWS-981/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java
branches/dlofthouse/JBWS-981/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
Log:
JBWS-981 - Ported implementation from branches/jbossws-1.0 and modified for JBoss 5
Modified: branches/dlofthouse/JBWS-981/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java
===================================================================
--- branches/dlofthouse/JBWS-981/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java 2006-12-03 09:58:32 UTC (rev 1531)
+++ branches/dlofthouse/JBWS-981/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java 2006-12-03 10:02:52 UTC (rev 1532)
@@ -28,6 +28,7 @@
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.jboss.deployers.spi.deployer.DeploymentUnit;
@@ -231,6 +232,7 @@
<jboss-web>
<security-domain>java:/jaas/cts</security-domain>
<context-root>/ws/ejbN/</context-root>
+ <virtual-host>some.domain.com</virtual-host>
</jboss-web>
*/
Element jbossWeb = DOMUtils.createElement("jboss-web");
@@ -267,6 +269,38 @@
Element root = (Element)jbossWeb.appendChild(DOMUtils.createElement("context-root"));
root.appendChild(DOMUtils.createTextNode(contextRoot));
+ String[] virtualHosts = null;
+ for (EndpointMetaData epMetaData : epMetaDataList)
+ {
+ ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
+ String[] next = sepMetaData.getVirtualHosts();
+ if (next != null && next.length > 0)
+ {
+ Arrays.sort(next);
+ if (virtualHosts == null)
+ {
+ virtualHosts = next;
+ }
+ else
+ {
+ if (Arrays.equals(virtualHosts, next) == false)
+ {
+ throw new WSException("All endpoints must define the same virtual hosts");
+ }
+ }
+ }
+ }
+
+ if (virtualHosts != null)
+ {
+ for (String current : virtualHosts)
+ {
+ Element virtualHost = (Element)jbossWeb.appendChild(DOMUtils.createElement("virtual-host"));
+ virtualHost.appendChild(DOMUtils.createTextNode(current));
+ }
+ }
+
+
return jbossWeb;
}
Modified: branches/dlofthouse/JBWS-981/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java
===================================================================
--- branches/dlofthouse/JBWS-981/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java 2006-12-03 09:58:32 UTC (rev 1531)
+++ branches/dlofthouse/JBWS-981/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java 2006-12-03 10:02:52 UTC (rev 1532)
@@ -129,6 +129,13 @@
sepMetaData.setTransportGuarantee(transportGuarantee);
}
}
+
+ // virtual hosts
+ String[] virtualHosts = anPortComponent.virtualHosts();
+ if (virtualHosts != null & virtualHosts.length > 0)
+ {
+ sepMetaData.setVirtualHosts(virtualHosts);
+ }
}
}
}
Modified: branches/dlofthouse/JBWS-981/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java
===================================================================
--- branches/dlofthouse/JBWS-981/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2006-12-03 09:58:32 UTC (rev 1531)
+++ branches/dlofthouse/JBWS-981/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2006-12-03 10:02:52 UTC (rev 1532)
@@ -22,15 +22,12 @@
package org.jboss.test.ws.jaxws.jbws981;
import javax.ejb.Stateless;
-import javax.jws.WebMethod;
import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.jboss.logging.Logger;
import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.ws.annotation.PortComponent;
/**
*
@@ -55,7 +52,7 @@
catch (Exception e)
{
log.error(e);
- return e.getMessage();
+ return "Unable to get WebModule MBean for virtual host - virtual-host not handled from @PortComponent";
}
return message;
Modified: branches/dlofthouse/JBWS-981/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-981/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2006-12-03 09:58:32 UTC (rev 1531)
+++ branches/dlofthouse/JBWS-981/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2006-12-03 10:02:52 UTC (rev 1532)
@@ -52,10 +52,10 @@
protected void setUp() throws Exception
{
super.setUp();
- if (true) return;
+ if (false) return;
if (port == null)
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080jaxws-jbws981/EJB3Bean?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws981/EJB3Bean?wsdl");
QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws981", "TestService");
Service.create(wsdlURL, serviceName);
Service service = Service.create(wsdlURL, serviceName);
@@ -66,9 +66,9 @@
public void testCall() throws Exception
{
System.out.println("FIXME: [JBWS-981] Virtual host configuration for EJB endpoints");
- if (true) return;
+ if (false) return;
String message = "hello";
- assertEquals(message, port.hello(message));
+ assertEquals("Web service mapped to virtual host.", port.hello(message));
}
}
\ No newline at end of file
18 years, 3 months
JBossWS SVN: r1531 - branches/dlofthouse
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-12-03 04:58:32 -0500 (Sun, 03 Dec 2006)
New Revision: 1531
Added:
branches/dlofthouse/JBWS-981/
Log:
Branch from trunk for JBWS-981
Copied: branches/dlofthouse/JBWS-981 (from rev 1530, trunk)
18 years, 3 months
JBossWS SVN: r1530 - trunk/docs
by jbossws-commits＠lists.jboss.org
Author: sam.griffith(a)jboss.com
Date: 2006-12-01 21:18:29 -0500 (Fri, 01 Dec 2006)
New Revision: 1530
Added:
trunk/docs/online/
Log:
This is the hello-world jax-ws example for the docs. It is supposed to show the simplest hello-world, how to generate files using wstools and the simplest ANT build file for this sample.
Broken right now as it can't find the:
org/jboss/logging/Logger
18 years, 3 months