|
Lines 34-40
Link Here
|
| 34 |
|
34 |
|
| 35 |
<!-- Compile internal server components --> |
35 |
<!-- Compile internal server components --> |
| 36 |
<javac srcdir="java" destdir="${tomcat.classes}" |
36 |
<javac srcdir="java" destdir="${tomcat.classes}" |
| 37 |
@@ -525,7 +527,7 @@ |
37 |
@@ -518,14 +520,14 @@ |
|
|
38 |
|
| 39 |
</target> |
| 40 |
|
| 41 |
- <target name="package" depends="compile,build-manifests" > |
| 42 |
+ <target name="package" depends="compile,build-examples,build-manifests" > |
| 43 |
<!-- Common Annotations 1.0 JAR File --> |
| 44 |
<jarIt jarfile="${annotations-api.jar}" |
| 45 |
filesDir="${tomcat.classes}" |
| 38 |
filesId="files.annotations-api" |
46 |
filesId="files.annotations-api" |
| 39 |
manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
47 |
manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
| 40 |
|
48 |
|
|
Lines 76-84
Link Here
|
| 76 |
|
84 |
|
| 77 |
<copy todir="${tomcat.build}/webapps"> |
85 |
<copy todir="${tomcat.build}/webapps"> |
| 78 |
<fileset dir="webapps"> |
86 |
<fileset dir="webapps"> |
| 79 |
@@ -745,14 +747,14 @@ |
87 |
@@ -743,16 +745,16 @@ |
| 80 |
|
88 |
</xslt> |
| 81 |
<target name="deploy" depends="package,build-docs" |
89 |
</target> |
|
|
90 |
|
| 91 |
- <target name="deploy" depends="package,build-docs" |
| 92 |
+ <target name="deploy" depends="package, build-examples, build-docs" |
| 82 |
description="Default. Builds a working Tomcat instance"> |
93 |
description="Default. Builds a working Tomcat instance"> |
| 83 |
- |
94 |
- |
| 84 |
+<!-- |
95 |
+<!-- |
|
Lines 93-118
Link Here
|
| 93 |
<!-- Copy scripts --> |
104 |
<!-- Copy scripts --> |
| 94 |
<copy todir="${tomcat.build}/bin"> |
105 |
<copy todir="${tomcat.build}/bin"> |
| 95 |
<fileset dir="bin"> |
106 |
<fileset dir="bin"> |
| 96 |
@@ -809,7 +811,7 @@ |
107 |
@@ -786,7 +788,6 @@ |
| 97 |
source="${compile.source}" |
108 |
<fileset dir="webapps"> |
| 98 |
target="${compile.target}" |
109 |
<include name="ROOT/**"/> |
| 99 |
optimize="${compile.optimize}" |
110 |
<exclude name="ROOT/index.jsp"/> |
|
|
111 |
- <include name="examples/**"/> |
| 112 |
<include name="manager/**"/> |
| 113 |
<include name="host-manager/**"/> |
| 114 |
</fileset> |
| 115 |
@@ -802,38 +803,13 @@ |
| 116 |
<filterset refid="version.filters"/> |
| 117 |
</copy> |
| 118 |
|
| 119 |
- <!-- Build classes for examples webapp --> |
| 120 |
- <javac srcdir="webapps/examples/WEB-INF/classes" |
| 121 |
- destdir="${tomcat.build}/webapps/examples/WEB-INF/classes" |
| 122 |
- debug="${compile.debug}" deprecation="${compile.deprecation}" |
| 123 |
- source="${compile.source}" |
| 124 |
- target="${compile.target}" |
| 125 |
- optimize="${compile.optimize}" |
| 100 |
- classpath="${tomcat.classes}" |
126 |
- classpath="${tomcat.classes}" |
| 101 |
+ classpath="${tomcat.classes}:${jsp-api.jar}" |
127 |
- excludes="**/CVS/**,**/.svn/**" |
| 102 |
excludes="**/CVS/**,**/.svn/**" |
128 |
- encoding="ISO-8859-1" |
| 103 |
encoding="ISO-8859-1" |
129 |
- includeantruntime="false"> |
| 104 |
includeantruntime="false"> |
130 |
- </javac> |
| 105 |
@@ -821,7 +823,7 @@ |
131 |
- |
| 106 |
source="${compile.source}" |
132 |
- <javac srcdir="webapps/examples/jsp/plugin/applet" |
| 107 |
target="${compile.target}" |
133 |
- destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet" |
| 108 |
optimize="${compile.optimize}" |
134 |
- debug="${compile.debug}" deprecation="${compile.deprecation}" |
|
|
135 |
- source="${compile.source}" |
| 136 |
- target="${compile.target}" |
| 137 |
- optimize="${compile.optimize}" |
| 109 |
- classpath="$tomcat.lcasses}" |
138 |
- classpath="$tomcat.lcasses}" |
| 110 |
+ classpath="${tomcat.classes}:${jsp-api.jar}" |
139 |
- excludes="**/CVS/**,**/.svn/**" |
| 111 |
excludes="**/CVS/**,**/.svn/**" |
140 |
- encoding="ISO-8859-1" |
| 112 |
encoding="ISO-8859-1" |
141 |
- includeantruntime="false"> |
| 113 |
includeantruntime="false"> |
142 |
- </javac> |
| 114 |
@@ -829,11 +831,11 @@ |
143 |
- |
| 115 |
|
|
|
| 116 |
<!-- Add sources for examples --> |
144 |
<!-- Add sources for examples --> |
| 117 |
<antcall target="examples-sources" /> |
145 |
<antcall target="examples-sources" /> |
| 118 |
- |
146 |
- |
|
Lines 125-131
Link Here
|
| 125 |
</target> |
153 |
</target> |
| 126 |
|
154 |
|
| 127 |
<target name="examples-sources" description="Create examples sources" |
155 |
<target name="examples-sources" description="Create examples sources" |
| 128 |
@@ -1008,7 +1010,7 @@ |
156 |
@@ -1008,7 +984,7 @@ |
| 129 |
|
157 |
|
| 130 |
</target> |
158 |
</target> |
| 131 |
|
159 |
|
|
Lines 134-136
Link Here
|
| 134 |
<mkdir dir="${test.classes}"/> |
162 |
<mkdir dir="${test.classes}"/> |
| 135 |
<!-- Compile --> |
163 |
<!-- Compile --> |
| 136 |
<javac srcdir="test" destdir="${test.classes}" |
164 |
<javac srcdir="test" destdir="${test.classes}" |
|
|
165 |
@@ -2431,4 +2407,42 @@ |
| 166 |
<echo file="${file}.md5" message="${value}${md5sum.binary-prefix}${filename}" /> |
| 167 |
</target> |
| 168 |
|
| 169 |
+ <!-- Additional target to built the examples --> |
| 170 |
+ <target name="build-examples" unless="nobuild.examples" description="Compiles the examples"> |
| 171 |
+ <!-- Copy other regular webapps --> |
| 172 |
+ <copy todir="${tomcat.build}/webapps"> |
| 173 |
+ <fileset dir="webapps"> |
| 174 |
+ <include name="examples/**"/> |
| 175 |
+ </fileset> |
| 176 |
+ </copy> |
| 177 |
+ |
| 178 |
+ <!-- Build classes for examples webapp --> |
| 179 |
+ <javac srcdir="webapps/examples/WEB-INF/classes" |
| 180 |
+ destdir="${tomcat.build}/webapps/examples/WEB-INF/classes" |
| 181 |
+ debug="${compile.debug}" deprecation="${compile.deprecation}" |
| 182 |
+ source="${compile.source}" |
| 183 |
+ target="${compile.target}" |
| 184 |
+ optimize="${compile.optimize}" |
| 185 |
+ classpath="${tomcat.classes}:${jsp-api.jar}" |
| 186 |
+ excludes="**/CVS/**,**/.svn/**" |
| 187 |
+ encoding="ISO-8859-1" |
| 188 |
+ includeantruntime="false"> |
| 189 |
+ </javac> |
| 190 |
+ |
| 191 |
+ <javac srcdir="webapps/examples/jsp/plugin/applet" |
| 192 |
+ destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet" |
| 193 |
+ debug="${compile.debug}" deprecation="${compile.deprecation}" |
| 194 |
+ source="${compile.source}" |
| 195 |
+ target="${compile.target}" |
| 196 |
+ optimize="${compile.optimize}" |
| 197 |
+ classpath="${tomcat.classes}:${jsp-api.jar}" |
| 198 |
+ excludes="**/CVS/**,**/.svn/**" |
| 199 |
+ encoding="ISO-8859-1" |
| 200 |
+ includeantruntime="false"> |
| 201 |
+ </javac> |
| 202 |
+ |
| 203 |
+ <!-- Add sources for examples --> |
| 204 |
+ <antcall target="examples-sources" /> |
| 205 |
+ </target> |
| 206 |
+ |
| 207 |
</project> |
