Skip to content

Commit 3abe9ab

Browse files
committed
Changed project structure to easy WAR creation.
Now ant war creates dist/mystamps.war file.
1 parent 4a7fe04 commit 3abe9ab

File tree

109 files changed

+16
-13
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+16
-13
lines changed

.gitignore

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,2 @@
1-
logs/site.log
2-
WEB-INF/classes/ru/mystamps/db/*.class
3-
WEB-INF/classes/ru/mystamps/site/*.class
4-
WEB-INF/classes/ru/mystamps/i18n/*.properties
5-
WEB-INF/classes/ru/mystamps/site/beans/*.class
6-
WEB-INF/classes/ru/mystamps/site/filters/*.class
7-
WEB-INF/classes/ru/mystamps/site/validators/*.class
8-
WEB-INF/classes/ru/mystamps/site/converters/*.class
9-
WEB-INF/classes/ru/mystamps/site/utils/*.class
1+
build
2+
dist/mystamps.war

build.xml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22

33
<target name="init" description="Initiate environment">
44
<property name="src.dir" value="src" />
5-
<property name="build.dir" value="WEB-INF/classes" />
6-
<property name="buildlib.dir" value="WEB-INF/build-lib" />
7-
<property name="lib.dir" value="WEB-INF/lib" />
5+
<property name="build.dir" value="build" />
6+
<property name="lib.dir" value="lib" />
87
<property name="i18n.dir" value="ru/mystamps/i18n" />
8+
<property name="web.dir" value="webapp" />
9+
<property name="dist.dir" value="dist" />
10+
<property name="war.name" value="mystamps.war" />
911

1012
<path id="classpath">
1113
<fileset dir="${build.dir}" />
1214
<fileset dir="${lib.dir}" includes="*.jar" />
13-
<fileset dir="${buildlib.dir}" includes="*.jar" />
1415
</path>
1516

1617
<property name="verbose" value="false" />
@@ -33,4 +34,13 @@
3334
</delete>
3435
</target>
3536

37+
<target name="war" depends="init,compile" description="Create WAR-file">
38+
<war destfile="${dist.dir}/${war.name}" basedir="${web.dir}" webxml="${web.dir}/WEB-INF/web.xml">
39+
<classes dir="${build.dir}" />
40+
<lib dir="${lib.dir}">
41+
<exclude file="tomcat6-servlet-2.5-api-6.0.26.jar" />
42+
</lib>
43+
</war>
44+
</target>
45+
3646
</project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

404.jsp renamed to webapp/404.jsp

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

webapp/logs/site.log

Whitespace-only changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)