diff options
author | Henri Herscher <henri@oreka.org> | 2006-12-05 15:44:41 +0000 |
---|---|---|
committer | Henri Herscher <henri@oreka.org> | 2006-12-05 15:44:41 +0000 |
commit | c5b036d73e495c0f4dc930233844f1c5c7070995 (patch) | |
tree | ba48ef3f123b9b8a9766602d5fa4f41104d74acd | |
parent | ee7a36dae601748b943b9d6421252313db4d567e (diff) |
OrkWeb and OrkTrack ant deploy scripts can now optionally compile the java source code so that it is possible to be independant of Eclipse.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@359 09dcff7a-b715-0410-9601-b79a96267cd0
-rw-r--r-- | orktrack/deploy-template.xml | 37 | ||||
-rw-r--r-- | orkweb/deploy-template.xml | 37 |
2 files changed, 70 insertions, 4 deletions
diff --git a/orktrack/deploy-template.xml b/orktrack/deploy-template.xml index c882b36..d01e2dd 100644 --- a/orktrack/deploy-template.xml +++ b/orktrack/deploy-template.xml @@ -1,9 +1,13 @@ <?xml version="1.0"?> <project name="ServletDeploy" default="do_everything"> <!-- - This ANT script does NOT compile the application, + By default, this ANT script does NOT compile the application, we are relying on Eclipse to do all Java compilation. This script merely deploys the application to Tomcat. + + If you don't want to use Eclipse to compile, run this script + with target "compile_java" and it will compile all files, as well as + deploy the application to Tomcat. You will need Tomcat manager running and working login for Tomcat manager. To create a user for @@ -36,6 +40,7 @@ <property name="workspaceHome" value="c:/devOrk/" /> <property name="mgrUsername" value="admin" /> <property name="mgrPassword" value="" /> + <property name="javadependencies" value="c:/oreka-0.5-java-dependencies" /> <!-- Change these properties to suit your needs (End)--> @@ -49,7 +54,35 @@ <property name="mgrRemoveUrl" value="${mgrUrl}/remove" /> <property name="mgrDeployUrl" value="${mgrUrl}/install" /> <property name="orkbasejHome" value="${workspaceHome}/orkbasej" /> - + + <target name="compile_java_base"> + <mkdir dir="${orkbasejHome}/bin" /> + <javac srcdir="${orkbasejHome}/java" + destdir="${orkbasejHome}/bin" + fork="java$$javac.exe" + source="1.5"> + <classpath id="base.path"> + <fileset dir="${javadependencies}"> + <include name="**/*.jar"/> + </fileset> + </classpath> + </javac> + </target> + + <target name="compile_java" depends="compile_java_base"> + <mkdir dir="${contextHome}/WEB-INF/classes" /> + <javac srcdir="${workspaceHome}/${application}/src" + destdir="${contextHome}/WEB-INF/classes" + fork="java$$javac.exe" + source="1.5"> + <classpath> + <path refid="base.path"/> + <pathelement location="${orkbasejHome}/bin"/> + </classpath> + </javac> + <!--<antcall target="do_everything"/>--> + </target> + <target name="create_war"> <mkdir dir="${deployWarDir}" /> <delete file="${deployWarDir}/${application}.war" /> diff --git a/orkweb/deploy-template.xml b/orkweb/deploy-template.xml index f536b38..c707aff 100644 --- a/orkweb/deploy-template.xml +++ b/orkweb/deploy-template.xml @@ -1,9 +1,13 @@ <?xml version="1.0"?> <project name="ServletDeploy" default="do_everything"> <!-- - This ANT script does NOT compile the application, + By default, this ANT script does NOT compile the application, we are relying on Eclipse to do all Java compilation. This script merely deploys the application to Tomcat. + + If you don't want to use Eclipse to compile, run this script + with target "compile_java" and it will compile all files, as well as + deploy the application to Tomcat. You will need Tomcat manager running and working login for Tomcat manager. To create a user for @@ -36,6 +40,7 @@ <property name="workspaceHome" value="c:/devOrk/" /> <property name="mgrUsername" value="admin" /> <property name="mgrPassword" value="" /> + <property name="javadependencies" value="c:/oreka-0.5-java-dependencies" /> <!-- Change these properties to suit your needs (End)--> @@ -49,7 +54,35 @@ <property name="mgrRemoveUrl" value="${mgrUrl}/remove" /> <property name="mgrDeployUrl" value="${mgrUrl}/install" /> <property name="orkbasejHome" value="${workspaceHome}/orkbasej" /> - + + <target name="compile_java_base"> + <mkdir dir="${orkbasejHome}/bin" /> + <javac srcdir="${orkbasejHome}/java" + destdir="${orkbasejHome}/bin" + fork="java$$javac.exe" + source="1.5"> + <classpath id="base.path"> + <fileset dir="${javadependencies}"> + <include name="**/*.jar"/> + </fileset> + </classpath> + </javac> + </target> + + <target name="compile_java" depends="compile_java_base"> + <mkdir dir="${contextHome}/WEB-INF/classes" /> + <javac srcdir="${workspaceHome}/${application}/src" + destdir="${contextHome}/WEB-INF/classes" + fork="java$$javac.exe" + source="1.5"> + <classpath> + <path refid="base.path"/> + <pathelement location="${orkbasejHome}/bin"/> + </classpath> + </javac> + <!--<antcall target="do_everything"/>--> + </target> + <target name="create_war"> <mkdir dir="${deployWarDir}" /> <delete file="${deployWarDir}/${application}.war" /> |