From 381dec657b91bb1c494c7bf1b4aaf7792c21d0fe Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Tue, 4 Nov 2014 18:01:21 +0100
Subject: [PATCH] UPD: splittof util-testing

---
 .classpath                                    |  1 +
 build.xml                                     | 82 ++++++++++++-------
 src/org/cacert/gigi/Gigi.java                 | 10 ++-
 .../gigi/email/CommandlineEmailProvider.java  |  0
 .../cacert/gigi/email/TestEmailProvider.java  |  0
 .../org/cacert/gigi/pages/Manager.java        |  0
 .../org/cacert/gigi/pages/Manager.templ       |  0
 .../org/cacert/gigi/pages/ManagerMails.templ  |  0
 .../org/cacert/gigi/util/DatabaseManager.java |  0
 .../org/cacert/gigi/util/SimpleSigner.java    |  0
 10 files changed, 61 insertions(+), 32 deletions(-)
 rename {src => util-testing}/org/cacert/gigi/email/CommandlineEmailProvider.java (100%)
 rename {src => util-testing}/org/cacert/gigi/email/TestEmailProvider.java (100%)
 rename {src => util-testing}/org/cacert/gigi/pages/Manager.java (100%)
 rename {src => util-testing}/org/cacert/gigi/pages/Manager.templ (100%)
 rename {src => util-testing}/org/cacert/gigi/pages/ManagerMails.templ (100%)
 rename {util => util-testing}/org/cacert/gigi/util/DatabaseManager.java (100%)
 rename {util => util-testing}/org/cacert/gigi/util/SimpleSigner.java (100%)

diff --git a/.classpath b/.classpath
index c9c9607c..544601d0 100644
--- a/.classpath
+++ b/.classpath
@@ -6,6 +6,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="util"/>
 	<classpathentry kind="src" path="tests"/>
+	<classpathentry kind="src" path="util-testing"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/MySQL"/>
diff --git a/build.xml b/build.xml
index ca9ef926..b0c8ecef 100644
--- a/build.xml
+++ b/build.xml
@@ -25,6 +25,7 @@
 	<path id="cacert-gigi.test.classpath">
 		<pathelement location="bin" />
 		<pathelement location="binutil" />
+		<pathelement location="binutil-testing" />
 		<pathelement location="bintest" />
 		<path refid="JUnit 4.libraryclasspath" />
 		<pathelement location="${mysqlconnector}" />
@@ -32,6 +33,7 @@
 	<target name="init">
 		<mkdir dir="bin" />
 		<mkdir dir="binutil" />
+		<mkdir dir="binutil-testing" />
 		<mkdir dir="bintest" />
 
 		<copy includeemptydirs="false" todir="bin">
@@ -58,6 +60,12 @@
 				<exclude name="**/*.java" />
 			</fileset>
 		</copy>
+		<copy includeemptydirs="false" todir="binutil-testing">
+			<fileset dir="util-testing">
+				<exclude name="**/*.launch" />
+				<exclude name="**/*.java" />
+			</fileset>
+		</copy>
 		<copy includeemptydirs="false" todir="bintest">
 			<fileset dir="tests">
 				<exclude name="**/*.launch" />
@@ -74,7 +82,7 @@
 
 	</target>
 	<target depends="clean,clean-test" name="cleanall" />
-	<target depends="build-project, native" name="build" />
+	<target depends="build-project, build-testing, native" name="build" />
 	<target depends="init" name="build-project">
 		<echo message="${ant.project.name}: ${ant.file}" />
 		<javac debug="true" debuglevel="${debuglevel}" destdir="bin"
@@ -93,16 +101,29 @@
 			<classpath refid="cacert-gigi.classpath" />
 		</javac>
 	</target>
+	<target depends="init, build-project" name="build-testing">
+		<javac debug="true" debuglevel="${debuglevel}" destdir="binutil-testing"
+			includeantruntime="false" source="${source}" target="${target}">
+			<src path="util-testing" />
+			<classpath refid="cacert-gigi.classpath" />
+		</javac>
+	</target>
 
 	<target name="native">
 		<exec executable="make" dir="natives"/>
 	</target>
 
-	<target depends="build" name="pack">
+	<target depends="build-project" name="pack">
 		<jar destfile="gigi.jar" basedir="bin" manifest="Gigi.MF" update="false"/>
 		<jar destfile="gigi.jar" basedir="binutil" update="on"/>
 	</target>
 
+	<target depends="build-testing" name="pack-testing">
+		<jar destfile="gigi-testing.jar" basedir="bin" manifest="Gigi.MF" update="false"/>
+		<jar destfile="gigi-testing.jar" basedir="binutil" update="on"/>
+		<jar destfile="gigi-testing.jar" basedir="binutil-testing" update="on"/>
+	</target>
+
 	<target depends="test,native" name="bundle">
 		<zip destfile="gigi-linux_amd64.zip" basedir="."
 			includes="gigi.jar,native/*.so,doc/tableStructure.sql,static/**,templates/**" />
@@ -134,7 +155,7 @@
 
 	<target name="release" depends="bundle,static-bundle-release" />
 
-	<target depends="init,build-project" name="build-project-test">
+	<target depends="init,build-testing" name="build-project-test">
 		<echo message="${ant.project.name}: ${ant.file}" />
 		<javac debug="true" debuglevel="${debuglevel}" destdir="bintest"
 			includeantruntime="false" source="${source}" target="${target}">
@@ -161,14 +182,14 @@
 			<arg value="-noprompt" />
 		</exec>
 	</target>
-	<target name="reset-db">
+	<target name="reset-db" depends="build-project">
 		<copy file="config/test.properties" tofile="config/gigi.properties"/>
 		<java classname="org.cacert.gigi.util.DatabaseManager">
 			<arg value="--test"/>
-			<classpath refid="cacert-gigi.classpath" />
+			<classpath refid="cacert-gigi.test.classpath" />
 		</java>
 	</target>
-	<target name="test" depends="build-project-test,generateKeys,FetchLocales,pack,reset-db">
+	<target name="test" depends="build-project-test,generateKeys,FetchLocales,pack-testing,pack,reset-db">
 		<delete failonerror="false">
 			<fileset dir=".">
 				<include name="jacoco.exec"/>
@@ -236,43 +257,44 @@
 
 		</jacoco:report>
 	</target>
-   	<target name="install-native" depends="native">
+	<target name="install-native" depends="native">
 		<mkdir dir="${env.DESTDIR}/usr/lib/jni"/>
 		<copy file="natives/libsetuid.so" todir="${env.DESTDIR}/usr/lib/jni"/>
 	</target>
-        <target name="install" depends="install-common">
-		<mkdir dir="${env.DESTDIR}/usr/share/cacert-gigi/static"/>
-                <copy todir="${env.DESTDIR}/usr/share/cacert-gigi/static">
-			<fileset dir="static"/>
+	<target name="install" depends="install-common">
+		<mkdir dir="${env.DESTDIR}/usr/share/cacert-gigi/static" />
+		<copy todir="${env.DESTDIR}/usr/share/cacert-gigi/static">
+			<fileset dir="static" />
 		</copy>
-                <delete file="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4-test.png"/>
-        </target>
-        <target name="install-testing" depends="install-common">
-		<mkdir dir="${env.DESTDIR}/usr/share/cacert-gigi/static"/>
-                <copy todir="${env.DESTDIR}/usr/share/cacert-gigi/static">
-			<fileset dir="static"/>
+		<delete file="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4-test.png" />
+		<copy file="gigi.jar" tofile="${env.DESTDIR}/usr/share/java/gigi.jar"/>
+	</target>
+	<target name="install-testing" depends="install-common">
+		<mkdir dir="${env.DESTDIR}/usr/share/cacert-gigi/static" />
+		<copy todir="${env.DESTDIR}/usr/share/cacert-gigi/static">
+			<fileset dir="static" />
 		</copy>
-                <move file="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4-test.png" tofile="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4.png"/>
-                <delete file="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4-test.png"/>
-        </target>
+		<move file="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4-test.png" tofile="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4.png" />
+		<delete file="${env.DESTDIR}/usr/share/cacert-gigi/static/static/images/cacert4-test.png" />
+		<copy file="gigi-testing.jar" tofile="${env.DESTDIR}/usr/share/java/gigi.jar"/>
+	</target>
 
 	<target name="install-common" depends="pack">
-		<mkdir dir="${env.DESTDIR}/usr/share/java"/>
-		<copy file="gigi.jar" tofile="${env.DESTDIR}/usr/share/java/gigi.jar"/>
+		<mkdir dir="${env.DESTDIR}/usr/share/java" />
 
 		<mkdir dir="${env.DESTDIR}/usr/bin"/>
 		<copy file="doc/scripts/gigi" tofile="${env.DESTDIR}/usr/bin/gigi"/>
 
 		<chmod file="${env.DESTDIR}/usr/bin/gigi" perm="+x"/>
 		<mkdir dir="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/"/>
-                <copy file="doc/tableStructure.sql" tofile="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/mysql.sql"/>
+		<copy file="doc/tableStructure.sql" tofile="${env.DESTDIR}/usr/share/dbconfig-common/data/${PACKAGE}/install/mysql.sql"/>
 
 		<mkdir dir="${env.DESTDIR}/var/lib/cacert-gigi/doc"/>
-                <exec executable="ln">
-                  <arg value="-s"/>
-                  <arg value="/usr/share/dbconfig-common/data/${PACKAGE}/install/mysql.sql"/>
-                  <arg value="${env.DESTDIR}/var/lib/cacert-gigi/doc/tableStructure.sql"/>
-                </exec>
+		<exec executable="ln">
+			<arg value="-s"/>
+			<arg value="/usr/share/dbconfig-common/data/${PACKAGE}/install/mysql.sql"/>
+			<arg value="${env.DESTDIR}/var/lib/cacert-gigi/doc/tableStructure.sql"/>
+		</exec>
 		<mkdir dir="${env.DESTDIR}/var/lib/cacert-gigi/natives"/>
 		<delete failonerror="false" file="${env.DESTDIR}/var/lib/cacert-gigi/static"/>
 		<exec executable="ln">
@@ -286,8 +308,8 @@
 			<arg value="${env.DESTDIR}/var/lib/cacert-gigi/natives/libsetuid.so"/>
 		</exec>
 
-                <mkdir dir="${env.DESTDIR}/etc/cacert-gigi"/>
-                <!--<copy todir="${env.DESTDIR}/DEBIAN">
+		<mkdir dir="${env.DESTDIR}/etc/cacert-gigi"/>
+		<!--<copy todir="${env.DESTDIR}/DEBIAN">
 			<fileset dir="debian">
 			</fileset>
 		</copy>-->
diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index e454819d..4532aa49 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -29,7 +29,6 @@ import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.LogoutPage;
 import org.cacert.gigi.pages.MainPage;
-import org.cacert.gigi.pages.Manager;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.pages.PolicyIndex;
 import org.cacert.gigi.pages.RootCertPage;
@@ -117,7 +116,14 @@ public class Gigi extends HttpServlet {
             putPage(CreateOrgPage.DEFAULT_PATH, new CreateOrgPage(), "Admin");
             putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Admin");
             if (testing) {
-                putPage(Manager.PATH + "/*", Manager.getInstance(), "Admin");
+                try {
+                    Class<?> manager = Class.forName("org.cacert.gigi.pages.Manager");
+                    Page p = (Page) manager.getMethod("getInstance").invoke(null);
+                    String pa = (String) manager.getField("PATH").get(null);
+                    putPage(pa + "/*", p, "Admin");
+                } catch (ReflectiveOperationException e) {
+                    e.printStackTrace();
+                }
             }
 
             putPage("/wot/rules", new StaticPage("CAcert Web of Trust Rules", AssurePage.class.getResourceAsStream("Rules.templ")), "CAcert Web of Trust");
diff --git a/src/org/cacert/gigi/email/CommandlineEmailProvider.java b/util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java
similarity index 100%
rename from src/org/cacert/gigi/email/CommandlineEmailProvider.java
rename to util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java
diff --git a/src/org/cacert/gigi/email/TestEmailProvider.java b/util-testing/org/cacert/gigi/email/TestEmailProvider.java
similarity index 100%
rename from src/org/cacert/gigi/email/TestEmailProvider.java
rename to util-testing/org/cacert/gigi/email/TestEmailProvider.java
diff --git a/src/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java
similarity index 100%
rename from src/org/cacert/gigi/pages/Manager.java
rename to util-testing/org/cacert/gigi/pages/Manager.java
diff --git a/src/org/cacert/gigi/pages/Manager.templ b/util-testing/org/cacert/gigi/pages/Manager.templ
similarity index 100%
rename from src/org/cacert/gigi/pages/Manager.templ
rename to util-testing/org/cacert/gigi/pages/Manager.templ
diff --git a/src/org/cacert/gigi/pages/ManagerMails.templ b/util-testing/org/cacert/gigi/pages/ManagerMails.templ
similarity index 100%
rename from src/org/cacert/gigi/pages/ManagerMails.templ
rename to util-testing/org/cacert/gigi/pages/ManagerMails.templ
diff --git a/util/org/cacert/gigi/util/DatabaseManager.java b/util-testing/org/cacert/gigi/util/DatabaseManager.java
similarity index 100%
rename from util/org/cacert/gigi/util/DatabaseManager.java
rename to util-testing/org/cacert/gigi/util/DatabaseManager.java
diff --git a/util/org/cacert/gigi/util/SimpleSigner.java b/util-testing/org/cacert/gigi/util/SimpleSigner.java
similarity index 100%
rename from util/org/cacert/gigi/util/SimpleSigner.java
rename to util-testing/org/cacert/gigi/util/SimpleSigner.java
-- 
2.39.2