--- build.xml.in.orig	2007-01-24 20:54:29.000000000 +0100
+++ build.xml.in	2007-01-24 21:01:04.000000000 +0100
@@ -14,7 +14,7 @@
 	<property name="builddir" value="build"/>
 	<property name="jardir" value="lib"/>
 	<property name="infodir" value="info"/>
-	<property name="build.compiler" value="@ANT_JAVAC@"/>
+	<property name="build.compiler" value="modern"/>
 	<property name="doc" value="@enabledoc@"/>
 
 	<target name="init">
@@ -72,7 +72,11 @@
 	<target name="jar" depends="compile@webdav@">
 		<jar jarfile="${jardir}/comfiretools.jar" 
 			basedir="${builddir}"
-			includes="com/openexchange/tools/**, com/openexchange/ssl/**, com/openexchange/api/**" />
+			includes="com/openexchange/tools/**, com/openexchange/api/**"
+			excludes="com/openexchange/ssl/" />
+		<jar jarfile="${jardir}/oxssl.jar"
+			basedir="${builddir}"
+			includes="com/openexchange/ssl/**" />
 		<jar jarfile="${jardir}/nas.jar"
 			basedir="${builddir}"
 			includes="**.class, com/openexchange/server/**, com/openexchange/thread/**, com/openexchange/lizenz/**, com/openexchange/event/**"
 	
--- javabuild/Makefile.am.orig	2007-01-24 21:16:58.000000000 +0100
+++ javabuild/Makefile.am	2007-01-24 21:17:35.000000000 +0100
@@ -6,12 +6,12 @@
 	@ANT@ -f ../build.xml
 
 misc:
-	@JAVAH@ -jni -classpath ../lib/comfiretools.jar -o ../src/misc/ssl/com_openexchange_ssl_SSLCtx.h com.openexchange.ssl.SSLCtx
-	@JAVAH@ -jni -classpath ../lib/comfiretools.jar -o ../src/misc/ssl/com_openexchange_ssl_SSLException.h com.openexchange.ssl.SSLException
-	@JAVAH@ -jni -classpath ../lib/comfiretools.jar -o ../src/misc/ssl/com_openexchange_ssl_SSLServerSocket.h com.openexchange.ssl.SSLServerSocket
-	@JAVAH@ -jni -classpath ../lib/comfiretools.jar -o ../src/misc/ssl/com_openexchange_ssl_SSLSocket.h com.openexchange.ssl.SSLSocket
-	@JAVAH@ -jni -classpath ../lib/comfiretools.jar -o ../src/misc/ssl/com_openexchange_ssl_SSLInputStream.h com.openexchange.ssl.SSLInputStream
-	@JAVAH@ -jni -classpath ../lib/comfiretools.jar -o ../src/misc/ssl/com_openexchange_ssl_SSLOutputStream.h com.openexchange.ssl.SSLOutputStream
+	@JAVAH@ -jni -classpath ../lib/oxssl.jar -o ../src/misc/ssl/com_openexchange_ssl_SSLCtx.h com.openexchange.ssl.SSLCtx
+	@JAVAH@ -jni -classpath ../lib/oxssl.jar -o ../src/misc/ssl/com_openexchange_ssl_SSLException.h com.openexchange.ssl.SSLException
+	@JAVAH@ -jni -classpath ../lib/oxssl.jar -o ../src/misc/ssl/com_openexchange_ssl_SSLServerSocket.h com.openexchange.ssl.SSLServerSocket
+	@JAVAH@ -jni -classpath ../lib/oxssl.jar -o ../src/misc/ssl/com_openexchange_ssl_SSLSocket.h com.openexchange.ssl.SSLSocket
+	@JAVAH@ -jni -classpath ../lib/oxssl.jar -o ../src/misc/ssl/com_openexchange_ssl_SSLInputStream.h com.openexchange.ssl.SSLInputStream
+	@JAVAH@ -jni -classpath ../lib/oxssl.jar -o ../src/misc/ssl/com_openexchange_ssl_SSLOutputStream.h com.openexchange.ssl.SSLOutputStream
 
 clean:
 	@ANT@ -f ../build.xml clean