Author: veithen
Date: Wed Jan 4 00:25:09 2012
New Revision: 1227001
URL: http://svn.apache.org/viewvc?rev=1227001&view=rev
Log:
* Fixed AXIS-2867.
* Prevent the axis-war build from creating an attachments directory in
src/main/webapp.
Modified:
axis/axis1/java/trunk/axis-war/src/test/web.xml
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/transport/http/AxisServletBase.java
axis/axis1/java/trunk/docs/reference.html
Modified: axis/axis1/java/trunk/axis-war/src/test/web.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-war/src/test/web.xml?rev=1227001&r1=1227000&r2=1227001&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-war/src/test/web.xml (original)
+++ axis/axis1/java/trunk/axis-war/src/test/web.xml Wed Jan 4 00:25:09 2012
@@ -14,6 +14,10 @@ Application 2.3//EN" "http://java.sun.co
<param-name>axis.jws.servletClassDir</param-name>
<param-value>${project.build.directory}/tmp/jwsClasses</param-value>
</context-param>
+ <context-param>
+ <param-name>axis.attachments.Directory</param-name>
+ <param-value>${project.build.directory}/tmp/attachments</param-value>
+ </context-param>
<listener>
<listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
Modified:
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/transport/http/AxisServletBase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/transport/http/AxisServletBase.java?rev=1227001&r1=1227000&r2=1227001&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/transport/http/AxisServletBase.java
(original)
+++
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/transport/http/AxisServletBase.java
Wed Jan 4 00:25:09 2012
@@ -258,7 +258,13 @@ public class AxisServletBase extends Htt
protected static Map getEngineEnvironment(HttpServlet servlet) {
Map environment = new HashMap();
- String attdir= servlet.getInitParameter(AxisEngine.ENV_ATTACHMENT_DIR);
+ String attdir =
AxisProperties.getProperty(AxisEngine.ENV_ATTACHMENT_DIR);
+ if (attdir == null) {
+ attdir = servlet.getInitParameter(AxisEngine.ENV_ATTACHMENT_DIR);
+ }
+ if (attdir == null) {
+ attdir =
servlet.getServletContext().getInitParameter(AxisEngine.ENV_ATTACHMENT_DIR);
+ }
if (attdir != null)
environment.put(AxisEngine.ENV_ATTACHMENT_DIR, attdir);
Modified: axis/axis1/java/trunk/docs/reference.html
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/docs/reference.html?rev=1227001&r1=1227000&r2=1227001&view=diff
==============================================================================
--- axis/axis1/java/trunk/docs/reference.html (original)
+++ axis/axis1/java/trunk/docs/reference.html Wed Jan 4 00:25:09 2012
@@ -919,6 +919,11 @@ context parameters or system properties:
<td>Path to where compiled JWS pages are placed. This may be an absolute
path or a path relative
to the web application root.</td>
</tr>
+ <tr>
+ <td><b>axis.attachments.Directory</b></td>
+ <td>The directory where temporary files for attachments are stored.
Defaults to the WEB-INF/attachments
+ directory for exploded WARs.</td>
+ </tr>
</tbody>
</table>
<h2><a name="individual_service">Individual Service Configuration</a></h2>
