Skip to content

Commit

Permalink
Ant build fix
Browse files Browse the repository at this point in the history
-Removed from Ant build the old resources management
-Deleted obsolete build files
  • Loading branch information
guido committed Jun 5, 2012
1 parent 6f8e87d commit 8ccd95e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 239 deletions.
15 changes: 3 additions & 12 deletions ant/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@

<target name="propertySetter">
<available property="deployed" file="${tomcat.application.path}" type="dir"/>
<available property="resources" file="${tomcat.resource.path}" type="dir"/>
</target>

<target name="clean" description="clean up build directory">
Expand Down Expand Up @@ -68,14 +67,6 @@
<replaceregexp file="${dist.path}/WEB-INF/solr.properties" match="configFile=.*" replace ='configFile=${solr.dist.path}/solr.xml'/>
</target>

<target name="resource_restore" depends="propertySetter" description="restore resources folder" if="resources">
<copy todir="${dist.path}">
<fileset dir="${tomcat.application.path}">
<include name="resources/"/>
</fileset>
</copy>
</target>

<target name="compile" depends="init" description="compilation on bin folder">
<javac srcdir="${src.path}" destdir="${build.path}" includeantruntime="false" optimize="true">
<classpath refid="class.path"/>
Expand Down Expand Up @@ -135,7 +126,7 @@
</target>

<taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask" classpathref="ant-class.path"/>
<target name="undeploy" depends="propertySetter,resource_restore" description="Remove web application" if="deployed">
<target name="undeploy" depends="propertySetter" description="Remove web application" if="deployed">
<delete file="${tomcat.deploy.path}/${webappname}.war"></delete>
<undeploy url="${tomcat.manager.url}" username="${tomcat.username}" password="${tomcat.password}"
path="/${webappname}"/>
Expand Down Expand Up @@ -186,6 +177,6 @@

<target name="DB full update" depends="DB_drop, DB_create, DB_restore"></target>

<target name="buildAll" depends="dist, resource_restore, stop, undeploy, compile, WAR build"></target>
<target name="buildAll" depends="dist, stop, undeploy, compile, WAR build"></target>

</project>
</project>
3 changes: 1 addition & 2 deletions ant/buildProperties.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<property name="tomcat.home.path" value="your_path"/>
<property name="tomcat.deploy.path" value="${tomcat.home.path}/webapps"/>
<property name="tomcat.application.path" value="${tomcat.deploy.path}/${webappname}"/>
<property name="tomcat.resource.path" value="${tomcat.application.path}/resources"/>
<property name="tomcat.username" value="your_user"/>
<property name="tomcat.password" value="your_pass"/>
<property name="tomcat.manager.url" value="http://${host}:8080/manager/text"/>
Expand All @@ -42,4 +41,4 @@
<property name="mysql.password" value="your_pass"/>
<property name="mysql.dump.path" value="sql"/>

</project>
</project>
182 changes: 0 additions & 182 deletions ant/old_myBuild.xml

This file was deleted.

43 changes: 0 additions & 43 deletions ant/old_myBuildProperties.xml

This file was deleted.

0 comments on commit 8ccd95e

Please sign in to comment.