From 9ed18ee34a063ad29803eb38487a1a7eec250d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Fri, 27 Oct 2017 15:55:26 +0200
Subject: get rid of tomcat stuff

---
 java/vaadin-u2f/build.xml                          | 32 ----------------------
 java/vaadin-u2f/ivy.xml                            |  2 +-
 .../src/main/resources/Application.properties      |  2 +-
 java/vaadin-u2f/tomcat.properties                  |  4 ---
 4 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 java/vaadin-u2f/tomcat.properties

diff --git a/java/vaadin-u2f/build.xml b/java/vaadin-u2f/build.xml
index bcac04b..252f8f7 100644
--- a/java/vaadin-u2f/build.xml
+++ b/java/vaadin-u2f/build.xml
@@ -26,16 +26,6 @@
         <property name="compile.deprecation"    value="false"/>
         <property name="compile.optimize"       value="true"/>
 
-        <property file="${basedir}/tomcat.properties"/>
-        <path id="cp.tomcat">
-            <fileset dir="${catalina.home}/bin">
-                <include name="*.jar"/>
-            </fileset>
-            <fileset dir="${catalina.home}/lib">
-                <include name="*.jar"/>
-            </fileset>
-        </path>
-        <taskdef classpathref="cp.tomcat" resource="org/apache/catalina/ant/catalina.tasks" />
         <path id="cp.build">
             <dirset dir="${classes.dir}" />
         </path>
@@ -134,7 +124,6 @@
             deprecation="${compile.deprecation}"
             optimize="${compile.optimize}"
             includeantruntime="false">
-            <classpath refid="cp.tomcat"/>
             <classpath refid="ivy.deps.server-side"/>
             <compilerarg value="-Xlint:all"/>
             <compilerarg value="-Xlint:-path"/>
@@ -262,25 +251,4 @@
         </java>
     </target>
 
-    <!-- tomcat specific targets -->
-
-    <target name="remove" depends="configure" description="remove application on servlet container">
-        <undeploy url="${manager.url}"
-            username="${manager.username}"
-            password="${manager.password}"
-            path="${app.path}"
-            failonerror="false"/>
-    </target>
-
-
-    <target name="install" depends="war,remove" description="install application to servlet container">
-        <copy  todir="/tmp" file="${dist.dir}/${war.name}"/>
-        <deploy url="${manager.url}"
-            username="${manager.username}"
-            password="${manager.password}"
-            path="${app.path}"
-            localWar="file://tmp/${war.name}"/>
-        <delete file="/tmp/${war.name}"/>
-    </target>
-
 </project>
diff --git a/java/vaadin-u2f/ivy.xml b/java/vaadin-u2f/ivy.xml
index 6f1e2a0..4966c64 100644
--- a/java/vaadin-u2f/ivy.xml
+++ b/java/vaadin-u2f/ivy.xml
@@ -21,9 +21,9 @@
         <dependency org="com.vaadin" name="vaadin-client-compiled" rev="&vaadin.version;"/>
         <dependency org="com.vaadin" name="vaadin-client-compiler" rev="&vaadin.version;" conf="widgetsets->default"/>
         <dependency org="ch.qos.logback" name="logback-classic" rev="1.2.1"/>
-        <dependency org="org.codehaus.janino" name="janino" rev="3.0.6"/>
         <dependency org="com.yahoo.platform.yui" name="yuicompressor" rev="2.4.8" conf="themes->default"/>
         <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="9.4.2.v20170220" conf="run->default"/>
         <dependency org="com.yubico" name="u2flib-server-core" rev="0.16.0"/>
+        <dependency org="javax.servlet" name="javax.servlet-api" rev="4.0.0"/>
     </dependencies>
 </ivy-module>
diff --git a/java/vaadin-u2f/src/main/resources/Application.properties b/java/vaadin-u2f/src/main/resources/Application.properties
index 512362b..2975d99 100644
--- a/java/vaadin-u2f/src/main/resources/Application.properties
+++ b/java/vaadin-u2f/src/main/resources/Application.properties
@@ -2,4 +2,4 @@ app.name=VaadinHelloWorld
 app.version=0.0.1
 app.path=/hello
 app.env=DEV
-app.logfile=/var/log/tomcat7/HelloWorld.log
+app.logfile=/tmp/HelloWorld.log
diff --git a/java/vaadin-u2f/tomcat.properties b/java/vaadin-u2f/tomcat.properties
deleted file mode 100644
index 7ec1b73..0000000
--- a/java/vaadin-u2f/tomcat.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-manager.username=manager
-manager.password=h46bh2j0
-manager.url=http://127.0.0.1:8080/manager/text
-catalina.home=/usr/share/tomcat7
-- 
cgit v1.1-2-g2b99