diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2017-03-13 08:38:56 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2017-03-13 08:38:56 +0100 |
| commit | ba24c4cf96b9ada4ce319b792201ad8ad7505fbf (patch) | |
| tree | cfc1d300d93098375bed1bb2c35039db19061823 | |
| parent | 2b787ed07ed0dfdcc15ec6e556c32a2f902eae34 (diff) | |
| download | share-ba24c4cf96b9ada4ce319b792201ad8ad7505fbf.zip share-ba24c4cf96b9ada4ce319b792201ad8ad7505fbf.tar.gz | |
java : vaadin : set src/main/resources, fix ivy-report,remove tasks
| -rw-r--r-- | java/vaadin/build.xml | 10 | ||||
| -rw-r--r-- | java/vaadin/src/main/resources/Application.properties (renamed from java/vaadin/Application.properties) | 0 |
2 files changed, 7 insertions, 3 deletions
diff --git a/java/vaadin/build.xml b/java/vaadin/build.xml index 6702c7a..5d9da2f 100644 --- a/java/vaadin/build.xml +++ b/java/vaadin/build.xml @@ -5,7 +5,7 @@ default="package-war"> <target name="configure"> - <property file="${basedir}/Application.properties"/> + <property file="${basedir}/src/main/resources/Application.properties"/> <property name="main.dir" value="${basedir}/src/main" /> <property name="build.dir" value="${basedir}/build"/> @@ -13,6 +13,7 @@ <property name="src.dir" value="${main.dir}/java" /> <property name="web.dir" value="${main.dir}/WebContent"/> + <property name="resources.dir" value="${main.dir}/resources"/> <property name="classes.dir" value="${build.dir}/WEB-INF/classes"/> <property name="lib.dir" value="${build.dir}/WEB-INF/lib"/> @@ -42,7 +43,7 @@ </target> <target name="ivy-report" depends="configure,resolve"> - <ivy:report conf="default" organisation="ch.asynk" module="${app.name}"/> + <ivy:report conf="server-side" organisation="ch.asynk" module="${app.name}"/> </target> <target name="clean" depends="configure" description="clean project"> @@ -94,6 +95,9 @@ <include name="**/*-javadoc.jar"/> </fileset> </delete> + <copy todir="${classes.dir}" flatten="true"> + <fileset dir="${resources.dir}"/> + </copy> <delete file="${dist.dir}/${war.name}"/> <war destfile="${dist.dir}/${war.name}" @@ -117,7 +121,7 @@ <!-- tomcat specific targets --> - <target name="remove" description="Remove application on servlet container"> + <target name="remove" depends="configure" description="Remove application on servlet container"> <undeploy url="${manager.url}" username="${manager.username}" password="${manager.password}" diff --git a/java/vaadin/Application.properties b/java/vaadin/src/main/resources/Application.properties index 193ca7f..193ca7f 100644 --- a/java/vaadin/Application.properties +++ b/java/vaadin/src/main/resources/Application.properties |