Merge lp:~slub.team/goobi-production/bug-1013622 into lp:goobi-production/1.7

[Ralf Claussnitzer]

Changing <zipfileset> to <zipgroupfileset> deflates all dependend JARs and generates a big combined JAR file.

NOTE: This is probably violating licenses of the used libraries, especially if from Sun. Consider it a workaround.

[Henning Gerhardt (henning-gerhardt)]

looks good.

review: Approve

=== modified file 'build.xml'
--- build.xml	2012-05-09 15:19:19 +0000
+++ build.xml	2012-06-28 15:36:29 +0000
@@ -295,24 +295,15 @@
 
 	<!-- Build standalone CLI jar -->
 	<target name="jar" depends="compile, copy-config">
-
-		<manifestclasspath property="manifest.classpath" jarfile="${build.dist.jar}">
-			<classpath>
-				<fileset dir="${lib.dir}" includes="*.jar"/>
-			</classpath>
-		</manifestclasspath>
-
 		<jar destfile="${build.dist.jar}">
 			<fileset dir="${build.classes}" includes="**/*.class, log4j.properties, GoobiConfig.properties, hibernate.cfg.xml"/>
-			<zipfileset dir="${lib.dir}" prefix="lib"/>
-			
+			<zipgroupfileset dir="${lib.dir}" includes="*.jar"/>
 			<manifest>
 				<attribute name="Implementation-Title" value="${ant.project.name}"/>
 				<attribute name="Implementation-Version" value="${build.dist.version}"/>
 				<attribute name="Implementation-Vendor" value="${build.dist.vendor}"/>
 				<attribute name="Implementation-URL" value="${build.dist.url}"/>
 				<attribute name="Implementation-Build-Date" value="${TODAY_UK}"/>
-				<attribute name="Class-Path" value=". ${manifest.classpath}"/>
 				<attribute name="Main-Class" value="org.goobi.production.cli.CommandLineInterface"/>
 			</manifest>
 		</jar>