diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-03-02 09:47:12 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-03-02 09:47:12 +0530 |
| commit | 2b73f885f9b9bba01b220cd0199b8040e299086f (patch) | |
| tree | e3f4c980d93d49d25f2a5493814bce36e82d6e92 | |
| parent | 6ec01c2269e4e28c41c13dd09ff1a6dfeec6f7fb (diff) | |
Added servlet-api.jar to WEB-INF/lib
| -rw-r--r-- | com.gluster.storage.management.server/WebContent/WEB-INF/lib/servlet-api.jar | bin | 0 -> 176386 bytes | |||
| -rw-r--r-- | com.gluster.storage.management.server/build/glusterserver.ant | 80 |
2 files changed, 37 insertions, 43 deletions
diff --git a/com.gluster.storage.management.server/WebContent/WEB-INF/lib/servlet-api.jar b/com.gluster.storage.management.server/WebContent/WEB-INF/lib/servlet-api.jar Binary files differnew file mode 100644 index 00000000..e5bc672b --- /dev/null +++ b/com.gluster.storage.management.server/WebContent/WEB-INF/lib/servlet-api.jar diff --git a/com.gluster.storage.management.server/build/glusterserver.ant b/com.gluster.storage.management.server/build/glusterserver.ant index 9c878a53..3ba2ac7a 100644 --- a/com.gluster.storage.management.server/build/glusterserver.ant +++ b/com.gluster.storage.management.server/build/glusterserver.ant @@ -1,58 +1,52 @@ <project name="com.gluster.storage.management.server" basedir="." default="archive"> <echo message="basedir=${basedir}" /> <echo message="buckminster.output=${buckminster.output}" /> - <property name="WEB-INF" value="${basedir}/WebContent/WEB-INF" /> - <property name="OUT" value="${buckminster.output}/glusterserver/" /> - <!--property name="OUT" value="${basedir}/out" /--> - <property name="WAR_FILE_NAME" value="glustermc.war" /> - <property name="TEMP" value="${buckminster.output}/temp" /> + <property name="WEB-INF" value="${basedir}/WebContent/WEB-INF" /> + <property name="OUT" value="${buckminster.output}/glusterserver/" /> + <property name="WAR_FILE_NAME" value="glustermc.war" /> + <property name="TEMP" value="${buckminster.output}/temp" /> - <target name="help"> - <echo> + <target name="help"> + <echo> -------------------------------------------------- compile - Compile archive - Generate WAR file -------------------------------------------------- </echo> - </target> + </target> - <target name="init"> - <delete dir="${WEB-INF}/classes" /> - <mkdir dir="${WEB-INF}/classes" /> - </target> + <target name="init"> + <delete dir="${WEB-INF}/classes" /> + <mkdir dir="${WEB-INF}/classes" /> + </target> - <target name="compile" depends="init"> - <copy todir="${WEB-INF}/lib" flatten="true"> - <fileset dir="${buckminster.output}/.." casesensitive="yes"> - <include name="**/*.jar"/> - </fileset> - </copy> - <javac srcdir="${basedir}/src" - destdir="${WEB-INF}/classes" - classpathref="libs"> - </javac> - </target> + <target name="compile" depends="init"> + <copy todir="${WEB-INF}/lib" flatten="true"> + <fileset dir="${buckminster.output}/.." casesensitive="yes"> + <include name="**/*.jar" /> + </fileset> + </copy> + <javac srcdir="${basedir}/src" destdir="${WEB-INF}/classes" classpathref="libs"> + </javac> + </target> - <target name="archive" depends="compile"> - <delete dir="${OUT}" /> - <mkdir dir="${OUT}" /> - <delete dir="${TEMP}" /> - <mkdir dir="${TEMP}" /> - <copy todir="${TEMP}" > - <fileset dir="${basedir}/WebContent"> - </fileset> - </copy> - <!--move file="${TEMP}/log4j.properties" - todir="${TEMP}/WEB-INF/classes" /--> - <war destfile="${OUT}/${WAR_FILE_NAME}" - basedir="${TEMP}" - compress="true" - webxml="${TEMP}/WEB-INF/web.xml" /> - <delete dir="${TEMP}" /> - </target> + <target name="archive" depends="compile"> + <delete dir="${OUT}" /> + <mkdir dir="${OUT}" /> + <delete dir="${TEMP}" /> + <mkdir dir="${TEMP}" /> + <copy todir="${TEMP}"> + <fileset dir="${basedir}/WebContent"> + <!-- servlet-api.jar is required during compilation. At runtime, it is picked from tomcat lib directory --> + <exclude name="**/servlet-api.jar" /> + </fileset> + </copy> + <war destfile="${OUT}/${WAR_FILE_NAME}" basedir="${TEMP}" compress="true" webxml="${TEMP}/WEB-INF/web.xml" /> + <delete dir="${TEMP}" /> + </target> - <path id="libs"> - <fileset includes="*.jar" dir="${WEB-INF}/lib" /> - </path> + <path id="libs"> + <fileset includes="*.jar" dir="${WEB-INF}/lib" /> + </path> </project>
\ No newline at end of file |