[jbossws-commits] JBossWS SVN: r1231 - in branches/jbossws-1.0: . src/main/java/org/jboss/ws/integration/tomcat src/main/resources/jbossws.war/Tomcat/META-INF src/main/resources/jbossws.war/Tomcat/WEB-INF

[jbossws-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2006-10-16 17:51:49 -0400 (Mon, 16 Oct 2006)
New Revision: 1231

Modified:
   branches/jbossws-1.0/build.xml
   branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java
   branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/META-INF/jboss-beans.xml
   branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/web.xml
Log:
JBWS-1305 - Fix deployment to Tomcat.


Modified: branches/jbossws-1.0/build.xml
===================================================================
--- branches/jbossws-1.0/build.xml	2006-10-16 15:33:10 UTC (rev 1230)
+++ branches/jbossws-1.0/build.xml	2006-10-16 21:51:49 UTC (rev 1231)
@@ -537,6 +537,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>

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java	2006-10-16 15:33:10 UTC (rev 1230)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java	2006-10-16 21:51:49 UTC (rev 1231)
@@ -67,7 +67,8 @@
          deployServiceEndpoints(getServletContext());
       }
       catch (Exception e)
-      {
+      {         
+         log.error("Unable to init servlet", e);
          Thread.currentThread().setContextClassLoader(ctxLoader);
       }
    }

Modified: branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/META-INF/jboss-beans.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/META-INF/jboss-beans.xml	2006-10-16 15:33:10 UTC (rev 1230)
+++ branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/META-INF/jboss-beans.xml	2006-10-16 21:51:49 UTC (rev 1231)
@@ -23,9 +23,9 @@
     <property name="serviceEndpointManager"><inject bean="ServiceEndpointManager"/></property>
   </bean>
   
-  <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.other.GenericServiceEndpointPublisher">
+  <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.tomcat.TomcatServiceEndpointPublisher">
     <property name="serviceEndpointDeployer"><inject bean="ServiceEndpointDeployer"/></property>
-    <property name="serviceEndpointServlet">org.jboss.ws.integration.other.GenericServiceEndpointServlet</property>
+    <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 +36,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"/>
   

Modified: branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/web.xml	2006-10-16 15:33:10 UTC (rev 1230)
+++ branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/web.xml	2006-10-16 21:51:49 UTC (rev 1231)
@@ -13,7 +13,7 @@
   
   <servlet>
     <servlet-name>ContextServlet</servlet-name>
-    <servlet-class>org.jboss.ws.integration.other.ContextServlet</servlet-class>
+    <servlet-class>org.jboss.ws.integration.tomcat.TomcatServiceEndpointServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>