LMS-2490 cisd-jhdf5-batteries_included_lin_win_mac.jar included in generic...

LMS-2490 cisd-jhdf5-batteries_included_lin_win_mac.jar included in generic datastore server dist and not in datastore_server.jar of screening

SVN: 22891

datastore_server/build/build.xml

@@ -119,6 +119,7 @@
   	</copy>
   	<copy file="${lib}/cisd-base/cisd-base.jar" todir="${dist.datastore_server.lib}" />
     <copy file="${lib}/cisd-args4j/cisd-args4j.jar" todir="${dist.datastore_server.lib}" />
+    <copy file="${lib}/jhdf5/cisd-jhdf5-batteries_included_lin_win_mac.jar" todir="${dist.datastore_server.lib}" />
     <copy file="${lib}/cifex/cifex.jar" todir="${dist.datastore_server.lib}" />
     <copy file="${lib}/activation/activation.jar" todir="${dist.datastore_server.lib}" />
     <copy file="${lib}/mail/mail.jar" todir="${dist.datastore_server.lib}" />

screening/build/build.xml

@@ -49,10 +49,6 @@
 				<include name="*.class" />
 				<include name="${build.info.filename}" />
 			</fileset>
-    	<zipfileset src="${lib}/jhdf5/cisd-jhdf5-batteries_included_lin_win_mac.jar">
-    		<exclude name="META_INF/*"/>
-    		<include name="**/*"/>
-    	</zipfileset>
     	<fileset dir="${lib}/nativedata">
     		<include name="native/**/*"/>
     	</fileset>
@@ -83,10 +79,6 @@
 	
   <target name="make-full-dss-dist" depends="datastore_server.prepare-dist-libs, compute-dss-checksum">
     <jar update="true" destfile="${dss-jar.file}">
-    	<zipfileset src="${lib}/jhdf5/cisd-jhdf5-batteries_included_lin_win_mac.jar">
-    		<exclude name="META_INF/*"/>
-    		<include name="**/*"/>
-    	</zipfileset>
       <fileset dir="source">
         <include name="sql/imaging/**/*.sql" />
       </fileset>