From 5726b1b95368d2fb6b6fdce2ec2c9a866332e032 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Fri, 8 Jun 2012 17:06:01 +0000
Subject: [PATCH] Upgrade JHDF5 to SNAPSHOT-r25616. Remove jhdf5 from libraries
and rename cisd-hdf5 to cisd-jhdf5.
SVN: 25617
---
common/.classpath | 10 +++++-----
datastore_server/.classpath | 6 +++++-
datastore_server/build/build.xml | 10 +++++-----
screening/.classpath | 7 ++++++-
4 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/common/.classpath b/common/.classpath
index c27ffae4b2f..77e68820669 100644
--- a/common/.classpath
+++ b/common/.classpath
@@ -34,16 +34,16 @@
<classpathentry kind="lib" path="/libraries/spring/spring-context.jar"/>
<classpathentry kind="lib" path="/libraries/spring/spring-aop.jar" sourcepath="/libraries/spring/src.jar"/>
<classpathentry kind="lib" path="/libraries/spring/third-party/aopalliance.jar"/>
- <classpathentry kind="lib" path="/libraries/cisd-hdf5/cisd-jhdf5-core.jar"/>
- <classpathentry kind="lib" path="/libraries/cisd-hdf5/cisd-jhdf5-tools.jar"/>
- <classpathentry kind="lib" path="/libraries/cisd-hdf5/hdf5-linux-intel.jar"/>
- <classpathentry kind="lib" path="/libraries/cisd-hdf5/hdf5-macosx-intel.jar"/>
- <classpathentry kind="lib" path="/libraries/cisd-hdf5/hdf5-windows-intel.jar"/>
<classpathentry kind="lib" path="/libraries/cisd-args4j/cisd-args4j.jar" sourcepath="/libraries/cisd-args4j/cisd-args4j-src.zip"/>
<classpathentry kind="lib" path="/libraries/jetty7/lib/server/servlet-api-2.5.jar"/>
<classpathentry kind="lib" path="/libraries/spring/spring.jar" sourcepath="/libraries/spring/src.jar"/>
<classpathentry kind="lib" path="/libraries/spring/webmvc/spring-webmvc.jar" sourcepath="/libraries/spring/webmvc/src.jar"/>
<classpathentry kind="lib" path="/libraries/gwt2.4/gwt-servlet.jar"/>
<classpathentry kind="lib" path="/libraries/spring/third-party/stream-supporting-httpinvoker.jar" sourcepath="/libraries/spring/third-party/stream-supporting-httpinvoker-src.zip"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/cisd-jhdf5-core.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/cisd-jhdf5-tools.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/hdf5-linux-intel.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/hdf5-macosx-intel.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/hdf5-windows-intel.jar"/>
<classpathentry kind="output" path="targets/classes"/>
</classpath>
diff --git a/datastore_server/.classpath b/datastore_server/.classpath
index f06daab094e..720dd545d69 100644
--- a/datastore_server/.classpath
+++ b/datastore_server/.classpath
@@ -48,7 +48,6 @@
<classpathentry kind="lib" path="/libraries/jai/jai_codec.jar"/>
<classpathentry kind="lib" path="/libraries/jai/jai_core.jar"/>
<classpathentry kind="lib" path="/libraries/spring/spring-aop.jar" sourcepath="/libraries/spring/src.jar"/>
- <classpathentry kind="lib" path="/libraries/jhdf5/cisd-jhdf5-batteries_included_lin_win_mac.jar" sourcepath="/libraries/jhdf5/cisd-jhdf5-src.zip"/>
<classpathentry kind="lib" path="/libraries/spring/test/spring-test.jar" sourcepath="/libraries/spring/test/src.jar"/>
<classpathentry kind="lib" path="/libraries/spring/third-party/stream-supporting-httpinvoker.jar" sourcepath="/libraries/spring/third-party/stream-supporting-httpinvoker-src.zip"/>
<classpathentry kind="lib" path="/libraries/cifex/cifex.jar"/>
@@ -81,5 +80,10 @@
<classpathentry kind="lib" path="/libraries/spring/webmvc/spring-webmvc.jar"/>
<classpathentry kind="lib" path="/libraries/hibernate-core/hibernate-core.jar"/>
<classpathentry kind="lib" path="/libraries/jmock/hamcrest/hamcrest-integration.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/cisd-jhdf5-core.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/cisd-jhdf5-tools.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/hdf5-linux-intel.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/hdf5-macosx-intel.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/hdf5-windows-intel.jar"/>
<classpathentry kind="output" path="targets/classes"/>
</classpath>
diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index 7cc1bbacf59..bb3f8a75564 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -228,11 +228,11 @@
</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}/cisd-hdf5/cisd-jhdf5-core.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/cisd-hdf5/cisd-jhdf5-tools.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/cisd-hdf5/hdf5-linux-intel.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/cisd-hdf5/hdf5-macosx-intel.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/cisd-hdf5/hdf5-windows-intel.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/cisd-jhdf5/cisd-jhdf5-core.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/cisd-jhdf5/cisd-jhdf5-tools.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/cisd-jhdf5/hdf5-linux-intel.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/cisd-jhdf5/hdf5-macosx-intel.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/cisd-jhdf5/hdf5-windows-intel.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}" />
diff --git a/screening/.classpath b/screening/.classpath
index c078ebcbeca..c2a78068668 100644
--- a/screening/.classpath
+++ b/screening/.classpath
@@ -29,7 +29,6 @@
</attributes>
</classpathentry>
<classpathentry kind="lib" path="/libraries/spring/third-party/stream-supporting-httpinvoker.jar" sourcepath="/libraries/spring/third-party/stream-supporting-httpinvoker-src.zip"/>
- <classpathentry kind="lib" path="/libraries/jhdf5/cisd-jhdf5-batteries_included_lin_win_mac.jar" sourcepath="/libraries/jhdf5/cisd-jhdf5-src.zip"/>
<classpathentry kind="lib" path="/libraries/hdf5"/>
<classpathentry kind="lib" path="/libraries/nativedata"/>
<classpathentry kind="lib" path="/libraries/fastutil/fastutil.jar" sourcepath="/libraries/fastutil/fastutil-src.zip"/>
@@ -69,5 +68,11 @@
<classpathentry kind="lib" path="/libraries/reflections/lib/xml-apis-1.0.b2.jar"/>
<classpathentry kind="lib" path="/libraries/reflections/reflections.jar"/>
<classpathentry kind="lib" path="/libraries/slf4j/slf4j.jar" sourcepath="/libraries/slf4j/src.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/cisd-jhdf5-core.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/cisd-jhdf5-tools.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/hdf5-linux-intel.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/hdf5-macosx-intel.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-jhdf5/hdf5-windows-intel.jar"/>
+ <classpathentry kind="lib" path="/libraries/commons-io/commons-io.jar" sourcepath="/libraries/commons-io/src.zip"/>
<classpathentry kind="output" path="targets/www/WEB-INF/classes"/>
</classpath>
--
GitLab