From ba24c4cf96b9ada4ce319b792201ad8ad7505fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Mon, 13 Mar 2017 08:38:56 +0100
Subject: java : vaadin : set src/main/resources, fix ivy-report,remove tasks

---
 java/vaadin/Application.properties                    |  3 ---
 java/vaadin/build.xml                                 | 10 +++++++---
 java/vaadin/src/main/resources/Application.properties |  3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)
 delete mode 100644 java/vaadin/Application.properties
 create mode 100644 java/vaadin/src/main/resources/Application.properties

diff --git a/java/vaadin/Application.properties b/java/vaadin/Application.properties
deleted file mode 100644
index 193ca7f..0000000
--- a/java/vaadin/Application.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-app.name=VaadinHelloWorld
-app.version=0.0.1
-app.path=/hello
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/src/main/resources/Application.properties b/java/vaadin/src/main/resources/Application.properties
new file mode 100644
index 0000000..193ca7f
--- /dev/null
+++ b/java/vaadin/src/main/resources/Application.properties
@@ -0,0 +1,3 @@
+app.name=VaadinHelloWorld
+app.version=0.0.1
+app.path=/hello
-- 
cgit v1.1-2-g2b99