Rev 1821 | Rev 1830 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1821 | Rev 1827 | ||
---|---|---|---|
Line 88... | Line 88... | ||
88 | <!--<taskdef name="tomcat.roles" classname="org.apache.catalina.ant.RolesTask" classpathref="pathToToolsLib"/>--> |
88 | <!--<taskdef name="tomcat.roles" classname="org.apache.catalina.ant.RolesTask" classpathref="pathToToolsLib"/>--> |
89 | <taskdef name="tomcat.start" classname="org.apache.catalina.ant.StartTask" classpathref="pathToToolsLib"/> |
89 | <taskdef name="tomcat.start" classname="org.apache.catalina.ant.StartTask" classpathref="pathToToolsLib"/> |
90 | <taskdef name="tomcat.stop" classname="org.apache.catalina.ant.StopTask" classpathref="pathToToolsLib"/> |
90 | <taskdef name="tomcat.stop" classname="org.apache.catalina.ant.StopTask" classpathref="pathToToolsLib"/> |
91 | <taskdef name="tomcat.undeploy" classname="org.apache.catalina.ant.UndeployTask" classpathref="pathToToolsLib"/> |
91 | <taskdef name="tomcat.undeploy" classname="org.apache.catalina.ant.UndeployTask" classpathref="pathToToolsLib"/> |
92 | <taskdef name="tomcat.deploy" classname="org.apache.catalina.ant.DeployTask" classpathref="pathToToolsLib"/> |
92 | <taskdef name="tomcat.deploy" classname="org.apache.catalina.ant.DeployTask" classpathref="pathToToolsLib"/> |
93 | <taskdef name="tomcat.install" classname="org.apache.catalina.ant.InstallTask" classpathref="pathToToolsLib"/> |
93 | <!--<taskdef name="tomcat.install" classname="org.apache.catalina.ant.InstallTask" classpathref="pathToToolsLib"/>--> |
94 | <taskdef name="tomcat.jasper" classname="org.apache.jasper.JspC"> |
94 | <taskdef name="tomcat.jasper" classname="org.apache.jasper.JspC"> |
95 | <classpath id="jspc.classpath"> |
95 | <classpath id="jspc.classpath"> |
96 | <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> |
96 | <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> |
97 | <fileset dir="${tomcat.home}/bin"> |
97 | <fileset dir="${tomcat.home}/bin"> |
98 | <include name="*.jar"/> |
98 | <include name="*.jar"/> |
99 | </fileset> |
99 | </fileset> |
100 | <fileset dir="${tomcat.home}/server/lib"> |
100 | <fileset dir="${tomcat.libs.common.home}"> |
101 | <include name="*.jar"/> |
101 | <include name="*.jar"/> |
102 | </fileset> |
102 | </fileset> |
103 | <fileset dir="${tomcat.home}/common/lib"> |
103 | <fileset dir="${tomcat.libs.ant.home}"> |
104 | <include name="*.jar"/> |
104 | <include name="*.jar"/> |
105 | </fileset> |
105 | </fileset> |
106 | </classpath> |
106 | </classpath> |
107 | </taskdef> |
107 | </taskdef> |
108 | 108 | ||
109 | 109 | ||
110 | <!-- |
110 | <!-- |
111 | TOMCAT Instalation Tasks |
111 | TOMCAT Instalation Tasks |
112 | --> |
112 | --> |
113 | <target name="tomcat.deployContext" depends="build.war"> |
113 | <!--<target name="tomcat.deployContext" depends="build.war"> |
114 | <echo message="${tomcat.manager}"/> |
114 | <echo message="${tomcat.manager}"/> |
115 | <tomcat.install url="${tomcat.manager}" path="${tomcat.context.path.install}" |
115 | <tomcat.install url="${tomcat.manager}" path="${tomcat.context.path.install}" |
116 | config="file://${basedir}/${dist.dir}/estgweb.xml" |
116 | config="file://${basedir}/${dist.dir}/estgweb.xml" |
117 | username="${tomcat.username}" password="${tomcat.password}" /> |
117 | username="${tomcat.username}" password="${tomcat.password}" /> |
118 | </target> |
118 | </target>--> |
119 | <!-- |
119 | <!-- |
120 | <target name="tomcat.deployContextOnly" depends=""> |
120 | <target name="tomcat.deployContextOnly" depends=""> |
121 | <echo message="${tomcat.manager}"/> |
121 | <echo message="${tomcat.manager}"/> |
122 | <tomcat.install url="${tomcat.manager}" path="${tomcat.context.path.install}" |
122 | <tomcat.install url="${tomcat.manager}" path="${tomcat.context.path.install}" |
123 | config="file://${basedir}/${dist.dir}/estgweb.xml" |
123 | config="file://${basedir}/${dist.dir}/estgweb.xml" |
Line 173... | Line 173... | ||
173 | <antcall target="generateJsonJspsFile"/> |
173 | <antcall target="generateJsonJspsFile"/> |
174 | <antcall target="generateJsonSoaServicesFile"/> |
174 | <antcall target="generateJsonSoaServicesFile"/> |
175 | </target> |
175 | </target> |
176 | 176 | ||
177 | <target name="compile" depends="initDirs" description="Compile All"> |
177 | <target name="compile" depends="initDirs" description="Compile All"> |
178 | <javac encoding="UTF-8" source="1.6" target="1.6" destdir="${build.dir.classes}" debug="true" optimize="true" fork="true" failonerror="true" nowarn="true"> |
178 | <javac encoding="UTF-8" source="1.8" target="1.8" destdir="${build.dir.classes}" debug="true" optimize="true" fork="true" failonerror="true" nowarn="true"> |
- | 179 | <!--<compilerarg line="-Xlint:deprecation" />--> |
|
179 | <src path="${src.dir}"/> |
180 | <src path="${src.dir}"/> |
180 | <src path="${gen.dir.java}"/> |
181 | <src path="${gen.dir.java}"/> |
181 | <classpath refid="pathToToolsLib"/> |
182 | <classpath refid="pathToToolsLib"/> |
182 | </javac> |
183 | </javac> |
183 | </target> |
184 | </target> |
184 | <target name="compileToolFiles" description="Compile Mappings Builder"> |
185 | <target name="compileToolFiles" description="Compile Mappings Builder"> |
185 | <javac destdir="${build.dir.classes}" srcdir="${src.dir}" debug="true" optimize="true" deprecation="true" verbose="true" failonerror="true"> |
186 | <javac encoding="UTF-8" source="1.8" target="1.8" destdir="${build.dir.classes}" srcdir="${src.dir}" debug="true" optimize="true" deprecation="true" verbose="true" failonerror="true"> |
186 | <include name="${mapping.buider.class.file}"/> |
187 | <include name="${mapping.buider.class.file}"/> |
187 | <include name="${scripts.buider.class.file}"/> |
188 | <include name="${scripts.buider.class.file}"/> |
188 | <include name="${jsp.interfaces.web.json.class.file}"/> |
189 | <include name="${jsp.interfaces.web.json.class.file}"/> |
189 | <classpath refid="pathToToolsLib"/> |
190 | <classpath refid="pathToToolsLib"/> |
190 | </javac> |
191 | </javac> |
Line 314... | Line 315... | ||
314 | <fileset dir="${common.lib.dir}/reflections"> |
315 | <fileset dir="${common.lib.dir}/reflections"> |
315 | <include name="**/*.jar"/> |
316 | <include name="**/*.jar"/> |
316 | </fileset> |
317 | </fileset> |
317 | 318 | ||
318 | 319 | ||
- | 320 | ||
- | 321 | ||
319 | </copy> |
322 | </copy> |
320 | <copy file="${dist.dir}/estgweb.jar" todir="${build.dir.war}/WEB-INF/lib"/> |
323 | <copy file="${dist.dir}/estgweb.jar" todir="${build.dir.war}/WEB-INF/lib"/> |
321 | <copy todir="${build.dir.war}/WEB-INF" overwrite="true"> |
324 | <copy todir="${build.dir.war}/WEB-INF" overwrite="true"> |
322 | <fileset dir="${conf.dir}/WEB-INF"> |
325 | <fileset dir="${conf.dir}/WEB-INF"> |
323 | <include name="**/*.*"/> |
326 | <include name="**/*.*"/> |
Line 363... | Line 366... | ||
363 | </target> |
366 | </target> |
364 | 367 | ||
365 | <target name="jasper" depends="copy.jsps.war"> |
368 | <target name="jasper" depends="copy.jsps.war"> |
366 | <delete dir="${build.dir.jsp}"/> |
369 | <delete dir="${build.dir.jsp}"/> |
367 | <mkdir dir="${build.dir.jsp}"/> |
370 | <mkdir dir="${build.dir.jsp}"/> |
368 | <tomcat.jasper compilersourcevm="1.6" compilertargetvm="1.6" validateXml="false" uriroot="${build.dir.war}" webXmlFragment="${build.dir.war}/WEB-INF/generated_web.xml" addWebXmlMappings="true" outputDir="${build.dir.jsp}" /> |
371 | <tomcat.jasper compilersourcevm="1.8" compilertargetvm="1.8" validateXml="false" uriroot="${build.dir.war}" webXmlFragment="${build.dir.war}/WEB-INF/generated_web.xml" addWebXmlMappings="true" outputDir="${build.dir.jsp}" /> |
369 | <javac encoding="UTF-8" source="1.6" target="1.6" destdir="${build.dir.war}/WEB-INF/classes" debug="true" optimize="true" fork="true" failonerror="true" nowarn="true"> |
372 | <javac encoding="UTF-8" source="1.8" target="1.8" destdir="${build.dir.war}/WEB-INF/classes" debug="true" optimize="true" fork="true" failonerror="true" nowarn="true"> |
- | 373 | <compilerarg line="-Xlint:deprecation" /> |
|
- | 374 | <!--<compilerarg line="-Xlint:unchecked" />--> |
|
370 | <src path="${build.dir.jsp}"/> |
375 | <src path="${build.dir.jsp}"/> |
371 | <src path="${build.dir}/"/> |
376 | <src path="${build.dir}/"/> |
372 | <classpath path="${build.dir.classes}"/> |
377 | <classpath path="${build.dir.classes}"/> |
373 | <classpath refid="pathToToolsLib"/> |
378 | <classpath refid="pathToToolsLib"/> |
374 | </javac> |
379 | </javac> |
Line 713... | Line 718... | ||
713 | <column name="repositoryStream" sql-type="VARCHAR(255)"/> |
718 | <column name="repositoryStream" sql-type="VARCHAR(255)"/> |
714 | </property> |
719 | </property> |
715 | 720 | ||
716 | --> |
721 | --> |
717 | <target name="compileUtils" depends="initDirs"> |
722 | <target name="compileUtils" depends="initDirs"> |
718 | <javac encoding="UTF-8" source="1.6" target="1.6" destdir="${build.dir.classes}" debug="true" optimize="true" failonerror="true" nowarn="true"> |
723 | <javac encoding="UTF-8" source="1.8" target="1.8" destdir="${build.dir.classes}" debug="true" optimize="true" failonerror="true" nowarn="true"> |
- | 724 | <compilerarg line="-Xlint:deprecation" /> |
|
719 | <src path="${src.dir}/pt/estgp/estgweb/utils"/> |
725 | <src path="${src.dir}/pt/estgp/estgweb/utils"/> |
720 | <src path="${src.dir}/jomm/utils"/> |
726 | <src path="${src.dir}/jomm/utils"/> |
721 | <classpath refid="pathToToolsLib"/> |
727 | <classpath refid="pathToToolsLib"/> |
722 | </javac> |
728 | </javac> |
723 | </target> |
729 | </target> |
724 | 730 | ||
725 | <target name="compileEnhancedTypes" depends="compileUtils"> |
731 | <target name="compileEnhancedTypes" depends="compileUtils"> |
726 | <javac encoding="UTF-8" source="1.6" target="1.6" destdir="${build.dir.classes}" debug="true" optimize="true" failonerror="true" nowarn="true"> |
732 | <javac encoding="UTF-8" source="1.8" target="1.8" destdir="${build.dir.classes}" debug="true" optimize="true" failonerror="true" nowarn="true"> |
- | 733 | <compilerarg line="-Xlint:deprecation" /> |
|
727 | <src path="${src.dir}/pt/estgp/estgweb/domain/typesgen"/> |
734 | <src path="${src.dir}/pt/estgp/estgweb/domain/typesgen"/> |
728 | <classpath refid="pathToToolsLib"/> |
735 | <classpath refid="pathToToolsLib"/> |
729 | </javac> |
736 | </javac> |
730 | </target> |
737 | </target> |
731 | 738 |