You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2006/01/10 12:41:46 UTC
svn commit: r367571 - in /webservices/axis2/trunk/java: maven.xml
modules/webapp/upload.jsp
Author: chinthaka
Date: Tue Jan 10 03:41:34 2006
New Revision: 367571
URL: http://svn.apache.org/viewcvs?rev=367571&view=rev
Log:
- applying Azeez' patch.
Modified:
webservices/axis2/trunk/java/maven.xml
webservices/axis2/trunk/java/modules/webapp/upload.jsp
Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/maven.xml?rev=367571&r1=367570&r2=367571&view=diff
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Tue Jan 10 03:41:34 2006
@@ -357,7 +357,8 @@
<!-- ================================================================ -->
<!--- Create the War -->
<!-- ================================================================ -->
- <goal name="war" prereqs="init-dist,cache-war-deps">
+ <goal name="war" prereqs="jar,init-dist,cache-war-deps">
+
<ant:mkdir dir="target/temp/war/lib"/>
<ant:mkdir dir="target/temp/war/toWEB-INF/modules"/>
<ant:mkdir dir="target/temp/war/toWEB-INF/services"/>
@@ -387,14 +388,12 @@
<ant:war destfile="target/dist/axis2.war"
webxml="modules/webapp/conf/web.xml">
- <ant:fileset dir="modules/webapp"/>
- <ant:lib dir="target/temp/war/lib"/>
- <ant:lib dir="${min_dep_cache}">
- <ant:include name="**"/>
- <ant:exclude name="**servlet**"/>
- <ant:exclude name="ant*.jar"/>
- </ant:lib>
- <ant:lib dir="${std_dep_cache}">
+ <ant:fileset dir="modules/webapp">
+ <ant:exclude name="project.xml" />
+ <ant:exclude name="**/*.iml" />
+ <ant:exclude name="**/.*" />
+ </ant:fileset>
+ <ant:lib dir="target/temp/war/lib">
<ant:include name="**"/>
<ant:exclude name="**servlet**"/>
<ant:exclude name="ant*.jar"/>
@@ -713,7 +712,8 @@
</j:if>
</goal>
- <goal name="cache-war-deps" prereqs="init-dist,cache-std-deps">
+ <!--<goal name="cache-war-deps" prereqs="init-dist,cache-std-deps">-->
+ <goal name="cache-war-deps" prereqs="init-dist">
<ant:mkdir dir="${war_dep_cache}"/>
<j:if test="${warDeps.uptodate != 'yes'}">
<macros:copy-deps copyToDir="${war_dep_cache}"
Modified: webservices/axis2/trunk/java/modules/webapp/upload.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/upload.jsp?rev=367571&r1=367570&r2=367571&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/upload.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/upload.jsp Tue Jan 10 03:41:34 2006
@@ -6,6 +6,9 @@
<%@ page import="java.io.IOException"%>
<%@ page import="java.util.Iterator"%>
<%@ page import="java.util.List"%>
+<%@ page import="org.apache.commons.fileupload.FileUpload"%>
+<%@ page import="org.apache.commons.fileupload.DiskFileUpload"%>
+<%@ page import="org.apache.commons.fileupload.FileItem"%>
<%@ page contentType="text/html;charset=UTF-8" language="java"
%>
<%