You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/03/08 09:09:10 UTC

svn commit: r1298290 - in /incubator/openmeetings/trunk/singlewebapp/WebContent: WEB-INF/web.xml openmeetings/WEB-INF/conf/axis2.xml

Author: solomax
Date: Thu Mar  8 08:09:09 2012
New Revision: 1298290

URL: http://svn.apache.org/viewvc?rev=1298290&view=rev
Log:
Axis configuration is updated to eliminate warnings

Modified:
    incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xml

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml?rev=1298290&r1=1298289&r2=1298290&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml Thu Mar  8 08:09:09 2012
@@ -123,10 +123,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <servlet-name>AxisAdminServlet</servlet-name>
-        <servlet-class>org.apache.axis2.transport.http.AxisAdminServlet</servlet-class>
-    </servlet>
-    <servlet>
         <servlet-name>ServerUDP</servlet-name>
         <servlet-class>org.openmeetings.server.servlets.ServerOutputHandler</servlet-class>
     </servlet>
@@ -186,21 +182,9 @@
     <!-- Axis2 -->
     <servlet-mapping>
         <servlet-name>AxisServlet</servlet-name>
-        <url-pattern>/servlet/AxisServlet</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>AxisServlet</servlet-name>
-        <url-pattern>*.jws</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>AxisServlet</servlet-name>
         <url-pattern>/services/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>AxisAdminServlet</servlet-name>
-        <url-pattern>/axis2-admin/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
         <servlet-name>ServerUDP</servlet-name>
         <url-pattern>/serverUDP</url-pattern>
     </servlet-mapping>
@@ -220,15 +204,6 @@
         <extension>inc</extension>
         <mime-type>text/plain</mime-type>
     </mime-mapping>
-    <!-- Axis2 -->
-    <error-page>
-        <error-code>404</error-code>
-        <location>/axis2-web/Error/error404.jsp</location>
-    </error-page>
-    <error-page>
-        <error-code>500</error-code>
-        <location>/axis2-web/Error/error500.jsp</location>
-    </error-page>
      
     <security-constraint>
         <web-resource-collection>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xml?rev=1298290&r1=1298289&r2=1298290&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xml Thu Mar  8 08:09:09 2012
@@ -193,32 +193,13 @@
     <!-- ================================================= -->
     <!-- Transport Ins -->
     <!-- ================================================= -->
-    <transportReceiver name="http"
-                       class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port">8080</parameter>
-        <!-- Here is the complete list of supported parameters (see example settings further below):
-            port: the port to listen on (default 6060)
-            hostname:  if non-null, url prefix used in reply-to endpoint references                                 (default null)
-            originServer:  value of http Server header in outgoing messages                                         (default "Simple-Server/1.1")
-            requestTimeout:  value in millis of time that requests can wait for data                                (default 20000)
-            requestTcpNoDelay:  true to maximize performance and minimize latency                                   (default true)
-                                false to minimize bandwidth consumption by combining segments
-            requestCoreThreadPoolSize:  number of threads available for request processing (unless queue fills up)  (default 25)
-            requestMaxThreadPoolSize:  number of threads available for request processing if queue fills up         (default 150)
-                                       note that default queue never fills up:  see HttpFactory
-            threadKeepAliveTime:  time to keep threads in excess of core size alive while inactive                  (default 180)
-                                  note that no such threads can exist with default unbounded request queue
-            threadKeepAliveTimeUnit:  TimeUnit of value in threadKeepAliveTime (default SECONDS)                    (default SECONDS)
-        -->
-        <!-- <parameter name="hostname">http://www.myApp.com/ws</parameter> -->
-        <!-- <parameter name="originServer">My-Server/1.1</parameter>           -->
-        <!-- <parameter name="requestTimeout">10000</parameter>                   -->
-        <!-- <parameter name="requestTcpNoDelay">false</parameter>                   -->
-        <!-- <parameter name="requestCoreThreadPoolSize">50</parameter>                      -->
-        <!-- <parameter name="requestMaxThreadPoolSize">100</parameter>                     -->
-        <!-- <parameter name="threadKeepAliveTime">240000</parameter>                  -->
-        <!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter>            -->
-    </transportReceiver>
+	<transportReceiver name="http" class="org.apache.axis2.transport.http.AxisServletListener">
+    	<parameter name="port">8080</parameter>
+	</transportReceiver>
+
+	<transportReceiver name="https" class="org.apache.axis2.transport.http.AxisServletListener">
+    	<parameter name="port">8443</parameter>
+	</transportReceiver>
 
     <!-- This is where you'd put custom transports.  See the transports project -->
     <!-- for more.  http://ws.apache.org/commons/transport                      -->