Switching to maven for building katalyzer

icpc-live · Nov 24, 2017 · de68dd3 · de68dd3
1 parent 775f53b
commit de68dd3
Show file tree

Hide file tree

Showing 139 changed files with 417 additions and 149 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 /config.yaml
 /katalyze/bin
 /output
+/katalyze/target
 .metadata
 *.class
 *~

diff --git a/katalyze/Makefile b/katalyze/Makefile
diff --git a/katalyze/build.xml b/katalyze/build.xml
diff --git a/katalyze/build_jar.xml b/katalyze/build_jar.xml
diff --git a/katalyze/lib/commons-beanutils-1.8.3.jar b/katalyze/lib/commons-beanutils-1.8.3.jar
diff --git a/katalyze/lib/commons-beanutils-core-1.8.3.jar b/katalyze/lib/commons-beanutils-core-1.8.3.jar
diff --git a/katalyze/lib/commons-collections-3.2.1.jar b/katalyze/lib/commons-collections-3.2.1.jar
diff --git a/katalyze/lib/commons-configuration-1.9.jar b/katalyze/lib/commons-configuration-1.9.jar
diff --git a/katalyze/lib/commons-lang-2.6.jar b/katalyze/lib/commons-lang-2.6.jar
diff --git a/katalyze/lib/commons-logging-1.1.1.jar b/katalyze/lib/commons-logging-1.1.1.jar
diff --git a/katalyze/lib/commons-logging-adapters-1.1.1.jar b/katalyze/lib/commons-logging-adapters-1.1.1.jar
diff --git a/katalyze/lib/configurations-yaml-0.5.jar b/katalyze/lib/configurations-yaml-0.5.jar
diff --git a/katalyze/lib/ezmorph-1.0.6.jar b/katalyze/lib/ezmorph-1.0.6.jar
diff --git a/katalyze/lib/jcommon-1.0.16.jar b/katalyze/lib/jcommon-1.0.16.jar
diff --git a/katalyze/lib/jfreechart-1.0.13-swt.jar b/katalyze/lib/jfreechart-1.0.13-swt.jar
diff --git a/katalyze/lib/jfreechart-1.0.13.jar b/katalyze/lib/jfreechart-1.0.13.jar
diff --git a/katalyze/lib/json-lib-2.4-jdk15.jar b/katalyze/lib/json-lib-2.4-jdk15.jar
diff --git a/katalyze/lib/junit-4.11.jar b/katalyze/lib/junit-4.11.jar
diff --git a/katalyze/lib/log4j-1.2.16.jar b/katalyze/lib/log4j-1.2.16.jar
diff --git a/katalyze/lib/mysql-connector-java-5.0.8-bin.jar b/katalyze/lib/mysql-connector-java-5.0.8-bin.jar
diff --git a/katalyze/lib/snakeyaml-1.16.jar b/katalyze/lib/snakeyaml-1.16.jar
diff --git a/katalyze/lib/twitter4j-core-4.0.6.jar b/katalyze/lib/twitter4j-core-4.0.6.jar
diff --git a/katalyze/pom.xml b/katalyze/pom.xml
@@ -0,0 +1,112 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>autoanalyst</groupId>
+  <artifactId>katalyzer</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>autoanalyst Katalyzer</name>
+  <url>http://maven.apache.org</url>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.7.0</version>
+        <configuration>
+          <!-- or whatever version you use -->
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>
+                ${project.build.directory}/libs
+              </outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.0.2</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+              <classpathPrefix>libs/</classpathPrefix>
+              <mainClass>
+                katalyzeapp.Katalyze
+              </mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jfree</groupId>
+      <artifactId>jfreechart</artifactId>
+      <version>1.0.13</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.json-lib</groupId>
+      <artifactId>json-lib</artifactId>
+      <version>2.4</version>
+      <classifier>jdk15</classifier>
+    </dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>6.0.6</version>
+    </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.17</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>1.19</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+      <version>1.10</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.twitter4j</groupId>
+      <artifactId>twitter4j-core</artifactId>
+      <version>4.0.6</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/katalyze/run_katalyze.sh b/katalyze/run_katalyze.sh
@@ -1,18 +1,14 @@
 #!/bin/bash
 # This script assumes it is run from its own directory.
 
-# construct the colon-separated classpath of jar files in the lib directory,
-# plus the src directory 
-CP=`find lib/*.jar | tr '\n' ':'`src
-
 echo $CP
 
 # Read CDS connection data from global config file, using
 # some hackish YAML parsing.
 eval `cat ../config.yaml | sed -n '/^CDS:/,/^[[:space:]]*$/{/^[[:space:]]*\(baseurl\|user\|pass\):/{s/^[[:space:]]*\([a-z]*\):[[:space:]]*\(.*\)/\1=\2/;p}}'`
 
 # run!
-echo "<contest></contest>" |  java -classpath $CP katalyzeapp.Katalyze $@
+echo "<contest></contest>" |  java -jar target/katalyzer-1.0-SNAPSHOT.jar $@
 #cat data/kattislog_rehearsal_2011.txt | java -classpath $CP katalyzeapp.Katalyze $@
 #netcat 192.168.1.141 4714 | java -classpath $CP katalyzeapp.Katalyze $@
 #curl --user $user:$pass --no-buffer --netrc --insecure --max-time 360000 \

diff --git a/katalyze/run_local.sh b/katalyze/run_local.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
 
-# construct the colon-separated classpath of jar files in the lib directory,
-# plus the src directory 
-#CP=`find lib/*.jar -printf "lib/%f:"`src:bin
-CP=`find lib/*.jar | tr '\n' ':'`src
-
 # run!
-#cat data/kattislog_rehearsal_2011.txt | java -classpath $CP katalyzeapp.Katalyze $@
-java -classpath $CP katalyzeapp.Katalyze $@
+java -jar target/katalyzer-1.0-SNAPSHOT.jar $@
 
 # wait until input
 read x
diff --git a/katalyze/src/charts/ChartDumper.java → ...yze/src/main/java/charts/ChartDumper.java b/katalyze/src/charts/ChartDumper.java → ...yze/src/main/java/charts/ChartDumper.java
diff --git a/katalyze/src/charts/ChartDumperHook.java → ...src/main/java/charts/ChartDumperHook.java b/katalyze/src/charts/ChartDumperHook.java → ...src/main/java/charts/ChartDumperHook.java
diff --git a/katalyze/src/charts/ChartInfo.java → katalyze/src/main/java/charts/ChartInfo.java b/katalyze/src/charts/ChartInfo.java → katalyze/src/main/java/charts/ChartInfo.java
diff --git a/katalyze/src/charts/ContestChart.java → ...ze/src/main/java/charts/ContestChart.java b/katalyze/src/charts/ContestChart.java → ...ze/src/main/java/charts/ContestChart.java
diff --git a/katalyze/src/charts/ContestTimeGraph.java → ...rc/main/java/charts/ContestTimeGraph.java b/katalyze/src/charts/ContestTimeGraph.java → ...rc/main/java/charts/ContestTimeGraph.java
diff --git a/...c/charts/ProblemSubmissionsPerMinute.java → ...a/charts/ProblemSubmissionsPerMinute.java b/...c/charts/ProblemSubmissionsPerMinute.java → ...a/charts/ProblemSubmissionsPerMinute.java
diff --git a/...yze/src/charts/SubmissionsPerProblem.java → ...in/java/charts/SubmissionsPerProblem.java b/...yze/src/charts/SubmissionsPerProblem.java → ...in/java/charts/SubmissionsPerProblem.java
diff --git a/.../src/charts/TeamsHavingSolvedProblem.java → ...java/charts/TeamsHavingSolvedProblem.java b/.../src/charts/TeamsHavingSolvedProblem.java → ...java/charts/TeamsHavingSolvedProblem.java
diff --git a/katalyze/src/charts/TimeLineGraph.java → ...e/src/main/java/charts/TimeLineGraph.java b/katalyze/src/charts/TimeLineGraph.java → ...e/src/main/java/charts/TimeLineGraph.java
diff --git a/katalyze/src/clics/ExtendedScoreDump.java → ...rc/main/java/clics/ExtendedScoreDump.java b/katalyze/src/clics/ExtendedScoreDump.java → ...rc/main/java/clics/ExtendedScoreDump.java
diff --git a/katalyze/src/config/TwitterConfig.java → ...e/src/main/java/config/TwitterConfig.java b/katalyze/src/config/TwitterConfig.java → ...e/src/main/java/config/TwitterConfig.java