Author: veithen
Date: Sun Mar 20 09:35:00 2011
New Revision: 1083382
URL: http://svn.apache.org/viewvc?rev=1083382&view=rev
Log:
Merged r1083379 and r1083381 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml
axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
axis/axis2/java/core/branches/1_6/pom.xml
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 20 09:35:00 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381
Modified:
axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml?rev=1083382&r1=1083381&r2=1083382&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml
(original)
+++ axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/pom.xml
Sun Mar 20 09:35:00 2011
@@ -24,7 +24,7 @@
<groupId>org.apache.axis2.examples</groupId>
<artifactId>java_first_jaxws</artifactId>
<name>JAXWS - Starting from Java Example</name>
- <version>1.1</version>
+ <version>1.6.1-SNAPSHOT</version>
<packaging>war</packaging>
<inceptionYear>2004</inceptionYear>
Modified:
axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml?rev=1083382&r1=1083381&r2=1083382&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
(original)
+++
axis/axis2/java/core/branches/1_6/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
Sun Mar 20 09:35:00 2011
@@ -168,31 +168,7 @@
<!-- 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>
+
class="org.apache.axis2.transport.http.AxisServletListener"/>
<!--Uncomment if you want to have TCP transport support-->
<!--transportReceiver name="tcp"
Modified: axis/axis2/java/core/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/pom.xml?rev=1083382&r1=1083381&r2=1083382&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/pom.xml Sun Mar 20 09:35:00 2011
@@ -94,6 +94,7 @@
<id>everything</id>
<modules>
<module>modules/distribution</module>
+ <module>modules/samples/java_first_jaxws</module>
</modules>
</profile>
<profile>
