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 314... | Line 314... | ||
314 | <fileset dir="${common.lib.dir}/reflections"> |
314 | <fileset dir="${common.lib.dir}/reflections"> |
315 | <include name="**/*.jar"/> |
315 | <include name="**/*.jar"/> |
316 | </fileset> |
316 | </fileset> |
317 | 317 | ||
318 | 318 | ||
- | 319 | ||
- | 320 | ||
319 | </copy> |
321 | </copy> |
320 | <copy file="${dist.dir}/estgweb.jar" todir="${build.dir.war}/WEB-INF/lib"/> |
322 | <copy file="${dist.dir}/estgweb.jar" todir="${build.dir.war}/WEB-INF/lib"/> |
321 | <copy todir="${build.dir.war}/WEB-INF" overwrite="true"> |
323 | <copy todir="${build.dir.war}/WEB-INF" overwrite="true"> |
322 | <fileset dir="${conf.dir}/WEB-INF"> |
324 | <fileset dir="${conf.dir}/WEB-INF"> |
323 | <include name="**/*.*"/> |
325 | <include name="**/*.*"/> |