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"/>