You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/01/04 00:40:25 UTC
svn commit: r1226996 - in /axis/axis1/java/trunk: axis-war/pom.xml
axis-war/src/test/web.xml
axis/src/main/java/org/apache/axis/transport/http/AxisServlet.java
docs/reference.html
Author: veithen
Date: Tue Jan 3 23:40:25 2012
New Revision: 1226996
URL: http://svn.apache.org/viewvc?rev=1226996&view=rev
Log:
* Fixed AXIS-2866.
* Prevent the axis-war build from writing class files to src/main/webapp.
Modified:
axis/axis1/java/trunk/axis-war/pom.xml
axis/axis1/java/trunk/axis-war/src/test/web.xml
axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/transport/http/AxisServlet.java
axis/axis1/java/trunk/docs/reference.html
Modified: axis/axis1/java/trunk/axis-war/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-war/pom.xml?rev=1226996&r1=1226995&r2=1226996&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-war/pom.xml (original)
+++ axis/axis1/java/trunk/axis-war/pom.xml Tue Jan 3 23:40:25 2012
@@ -54,6 +54,35 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-web-xml</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <!-- Since we run a Jetty instance in the same JVM as Maven (Note that
+ this is not optimal, but the run-forked goal doesn't work in this
+ case), we can't use system properties. Therefore we supply the
+ configuration using context parameters in web.xml, but this requires
+ filtering. -->
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/test</directory>
+ <includes>
+ <include>web.xml</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>7.5.4.v20111024</version>
@@ -63,7 +92,7 @@
<stopPort>9999</stopPort>
<webAppConfig>
<contextPath>/axis</contextPath>
- <descriptor>${basedir}/src/test/web.xml</descriptor>
+ <descriptor>${project.build.directory}/web.xml</descriptor>
</webAppConfig>
</configuration>
<executions>
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=1226996&r1=1226995&r2=1226996&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-war/src/test/web.xml (original)
+++ axis/axis1/java/trunk/axis-war/src/test/web.xml Tue Jan 3 23:40:25 2012
@@ -10,6 +10,10 @@ Application 2.3//EN" "http://java.sun.co
<param-name>axis.development.system</param-name>
<param-value>true</param-value>
</context-param>
+ <context-param>
+ <param-name>axis.jws.servletClassDir</param-name>
+ <param-value>${project.build.directory}/tmp/jwsClasses</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/AxisServlet.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/transport/http/AxisServlet.java?rev=1226996&r1=1226995&r2=1226996&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/transport/http/AxisServlet.java (original)
+++ axis/axis1/java/trunk/axis/src/main/java/org/apache/axis/transport/http/AxisServlet.java Tue Jan 3 23:40:25 2012
@@ -190,7 +190,7 @@ public class AxisServlet extends AxisSer
* should fix any NPE's in the mean time.
*/
if (jwsClassDir != null) {
- if (getHomeDir() != null) {
+ if (getHomeDir() != null && !new File(jwsClassDir).isAbsolute()) {
jwsClassDir = getHomeDir() + jwsClassDir;
}
} else {
Modified: axis/axis1/java/trunk/docs/reference.html
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/docs/reference.html?rev=1226996&r1=1226995&r2=1226996&view=diff
==============================================================================
--- axis/axis1/java/trunk/docs/reference.html (original)
+++ axis/axis1/java/trunk/docs/reference.html Tue Jan 3 23:40:25 2012
@@ -22,6 +22,7 @@
</ul>
<li><a href="#Deployment">Deployment (WSDD) Reference</a></li>
<li><a href="#global_configuration">Global Axis Configuration</a></li>
+ <li><a href="#servlet_configuration">AxisServlet Configuration</a></li>
<li><a href="#individual_service">Individual Service Configuration</a></li>
<li><a href="#axis_logging">Axis Logging Configuration</a></li>
<li><a href="#axis_components">Pre-Configured Axis Components
@@ -855,10 +856,6 @@ new class implementing <tt>EngineConfigu
to use alternate configuration mechanisms. </td>
</tr>
<tr>
- <td><b>axis.jws.servletClassDir</b></td>
- <td>Path to where compiled JWS pages are placed. </td>
- </tr>
- <tr>
<td><b>axis.sendMinimizedElements</b></td>
<td>Flag to turn on support for a when .NET1.0 can't correctly
handle some bits of XML <a
@@ -912,6 +909,18 @@ container. </td>
<!-- end table -->
</tbody>
</table>
+<h2><a name="servlet_configuration">AxisServlet configuration</a></h2>
+<p>The following properties are recognized by AxisServlet. They may be specified as servlet parameters,
+context parameters or system properties:</p>
+<table>
+ <tbody>
+ <tr>
+ <td><b>axis.jws.servletClassDir</b></td>
+ <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>
+ </tbody>
+</table>
<h2><a name="individual_service">Individual Service Configuration</a></h2>
<p>Here is a service element with examples of the current set of options you can set. More may exists (consult the source, as usual).</p>
<pre>