From 437bddf6cd7c20bf2ae724f9648fe3b2ab13e717 Mon Sep 17 00:00:00 2001
From: Alex Bertram <alex@bedatadriven.com>
Date: Thu, 14 May 2020 11:53:40 +0200
Subject: [PATCH] Additional cleanup

---
 .gitignore                       |   1 +
 activityinfo.iml                 | 139 -------------------------------
 activityinfo.properties.template |  38 ---------
 checkstyle.xml                   | 124 ---------------------------
 pom.xml                          |   2 +-
 5 files changed, 2 insertions(+), 302 deletions(-)
 delete mode 100644 activityinfo.iml
 delete mode 100644 activityinfo.properties.template
 delete mode 100644 checkstyle.xml

diff --git a/.gitignore b/.gitignore
index f2aa995738..51971c2cbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ war/WEB-INF/appengine-generated
 /ActivityInfo Chrome.launch
 /ActivityInfo Firefox.launch
 /target
+*.iml
diff --git a/activityinfo.iml b/activityinfo.iml
deleted file mode 100644
index 6730503212..0000000000
--- a/activityinfo.iml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/war/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/war" relative="/" />
-        </webroots>
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-          <root url="file://$MODULE_DIR$/target/generated-sources/gwt" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-    <facet type="gwt" name="GWT">
-      <configuration>
-        <setting name="additionalCompilerParameters" value="-Xss1M" />
-        <setting name="compilerParameters" value="-logLevel TRACE" />
-        <setting name="compilerMaxHeapSize" value="512" />
-        <setting name="gwtSdkUrl" value="file://$MAVEN_REPOSITORY$/com/google/gwt/gwt-dev/2.5.1/" />
-        <setting name="gwtSdkType" value="maven" />
-        <setting name="webFacet" value="Web" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/war/WEB-INF/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/gwt" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-      <excludeFolder url="file://$MODULE_DIR$/war" />
-      <excludeFolder url="file://$MODULE_DIR$/war/WEB-INF/classes" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.google.gwt:gwt-servlet:2.5.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.gwt:gwt-user:2.5.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:sources:1.0.0.GA" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20090211" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gaxb:gaxb:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.teklabs.gwt-i18n-server:gwt-i18n-server:0.7-bedatadriven2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xerial:sqlite-jdbc:3.6.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xerial.thirdparty:nestedvm:1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.gwt.inject:gin:1.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject.extensions:guice-assistedinject:3.0-rc2" level="project" />
-    <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
-    <orderEntry type="library" name="Maven: org.mindrot.bcrypt:bcrypt:0.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
-    <orderEntry type="library" name="Maven: com.bedatadriven.appengine.export:appengine-itext:0.1.1" level="project" />
-    <orderEntry type="library" name="Maven: bouncycastle:bcmail-jdk14:138" level="project" />
-    <orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk14:138" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bctsp-jdk14:1.38" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk14:1.38" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcmail-jdk14:1.38" level="project" />
-    <orderEntry type="library" name="Maven: com.bedatadriven.appengine.export:appengine-awt:0.1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.typography:sfntly:r147" level="project" />
-    <orderEntry type="library" name="Maven: com.bedatadriven.appengine.export:appengine-ppt:0.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.8" level="project" />
-    <orderEntry type="library" name="Maven: com.bedatadriven.appengine.export:appengine-jcharts:0.1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.bedatadriven.appengine.export:appengine-emf:0.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:4.2.8.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.0.GA" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.2.8.Final" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-spatial:4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:4.3.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.liquibase:liquibase-core:2.0.2-bdd" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.27" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.12" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker-gae:2.3.20" level="project" />
-    <orderEntry type="library" name="Maven: com.extjs:gxt:gwt22:2.2.5" level="project" />
-    <orderEntry type="library" name="Maven: org.discotools.gwt.leaflet:gwtl-core:0.3-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.google.gwt.google-apis:gwt-gears:1.2.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava-gwt:12.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:12.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
-    <orderEntry type="library" name="Maven: com.bedatadriven.rebar:rebar-appcache:2.4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.bedatadriven.rebar:rebar-time:2.4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.bedatadriven.rebar:rebar-sql:2.4.1" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.jsqlparser:jsqlparser:0.7.0" level="project" />
-    <orderEntry type="library" name="Maven: com.bedatadriven.rebar:rebar-sync:2.4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.bedatadriven.rebar:jpa-mapping:2.4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.bedatadriven.rebar:rebar-asyncfun:2.4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.inject:guice:3.0" level="project" />
-    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.inject.extensions:guice-servlet:3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:1.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: gson-gwt:gson-gwt:1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.dbunit:dbunit:2.4.8" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey.contribs:jersey-guice:1.17" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-servlet:1.17" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.17" level="project" />
-    <orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.17" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.17" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey.contribs:jersey-multipart:1.17" level="project" />
-    <orderEntry type="library" name="Maven: org.jvnet:mimepull:1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.ocpsoft.prettytime:prettytime:2.1.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.bedatadriven:jackson-geojson:0.7" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-jdk14:1.6.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/activityinfo.properties.template b/activityinfo.properties.template
deleted file mode 100644
index 17e6d1888e..0000000000
--- a/activityinfo.properties.template
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# This an example of the deployment property file for ActivityInfo.
-# In the production environment, properties are provided by the container,
-# but when developing, you can copy this file to your home directory
-# and configure access to your development database and to your S3 test account.
-#
-# For example, on Windows you should copy this file to :
-# C:\Users\Alex\activityinfo.properties
-#
-# On a *nix system,
-# /home/alex/activityinfo.properties
-#
-# BE VERY CAREFUL not to edit this file!
-# This is just a template, and will not be consulted by the server.
-# 
-# DO NOT add sensistive passwords here!!
-
-hibernate.dialect=org.hibernate.dialect.MySQLDialect
-hibernate.connection.driver_class=com.mysql.jdbc.Driver
-hibernate.connection.username=root
-hibernate.connection.password=adminpwd
-hibernate.connection.url=jdbc:mysql://localhost:3306/activityinfo
-
-hibernate.hbm2ddl.auto=update
-hibernate.show_sql=false
-hibernate.format_sql=false
-
-aws.accessKeyId=XYZ123
-aws.secretKey=PQY456
-
-smtp.host=localhost
-#smtp.port=25
-smtp.from=me@localhost
-smtp.from.name=developer
-#smtp.username=
-#smtp.password=
-#smtp.tls=true
-  	
\ No newline at end of file
diff --git a/checkstyle.xml b/checkstyle.xml
deleted file mode 100644
index 60774f0e45..0000000000
--- a/checkstyle.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
-
- 
--->
-
-<module name="Checker">
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-    <module name="FileTabCharacter"/>
-
-
-    <module name="TreeWalker">
-
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-<!-- SOMEDAY
-        <module name="ConstantName"/>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
--->
-
-        <!-- Checks for Headers                                -->
-        <!-- See http://checkstyle.sf.net/config_header.html   -->
-        <!-- <module name="Header">                            -->
-            <!-- The follow property value demonstrates the ability     -->
-            <!-- to have access to ANT properties. In this case it uses -->
-            <!-- the ${basedir} property to allow Checkstyle to be run  -->
-            <!-- from any directory within a project. See property      -->
-            <!-- expansion,                                             -->
-            <!-- http://checkstyle.sf.net/config.html#properties        -->
-            <!-- <property                                              -->
-            <!--     name="headerFile"                                  -->
-            <!--     value="${basedir}/java.header"/>                   -->
-        <!-- </module> -->
-
-        <!-- Following interprets the header file as regular expressions. -->
-        <!-- <module name="RegexpHeader"/>                                -->
-
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="IllegalImport">
-          <property name="illegalPkgs" value="sun, com.google.appengine.repackaged"/>
-        </module>
-        <module name="RedundantImport"/>
-        <module name="UnusedImports">
-          <property name="processJavadoc" value="true"/>
-        </module>
-
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="MethodParamPad"/>
-<!-- SOMEDAY        <module name="NoWhitespaceAfter"/> -->
-        <module name="NoWhitespaceBefore"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-  <!-- SOMEDAY      <module name="WhitespaceAfter"/> -->
-        <module name="WhitespaceAround"/>
-        <module name="GenericWhitespace"/>
-
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-<!--
-        SOMEDAY would like to enforce at some point
-         <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
- -->
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <module name="AvoidNestedBlocks"/>
-<!--  SOMEDAY        <module name="EmptyBlock"/> -->
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-<!--         <module name="AvoidInlineConditionals"/> -->
-        <!--  <module name="DoubleCheckedLocking"/> -->   <!-- MY FAVOURITE -->
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-        <module name="IllegalInstantiation"/>
-<!--  SOMEDAY         <module name="InnerAssignment"/> -->
-<!--  SOMEDAY       <module name="MagicNumber"/> -->
-<!--  NOT SURE IF I AGREE       <module name="MissingSwitchDefault"/> -->
-<!--  SOMEDAY        <module name="RedundantThrows"/> -->
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-
-<!--         <module name="DesignForExtension"/>
-        <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
-        <module name="InterfaceIsType"/>
-        <module name="VisibilityModifier"/> -->
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-
-        <module name="UpperEll"/>
-
-    </module>
-
-</module>
diff --git a/pom.xml b/pom.xml
index 9eaae848e5..7e79461d55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.activityinfo</groupId>
   <artifactId>activityinfo</artifactId>
-  <version>2.7.0-SNAPSHOT</version>
+  <version>2.7.0</version>
   <packaging>war</packaging>
   <name>ActivityInfo</name>