[med-svn] r7767 - in trunk/packages/netcdf-java/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Mon Sep 12 15:14:22 UTC 2011
Author: malat-guest
Date: 2011-09-12 15:14:22 +0000 (Mon, 12 Sep 2011)
New Revision: 7767
Added:
trunk/packages/netcdf-java/trunk/debian/patches/fix_exception_sleepycat.patch
Modified:
trunk/packages/netcdf-java/trunk/debian/control
trunk/packages/netcdf-java/trunk/debian/patches/series
trunk/packages/netcdf-java/trunk/debian/rules
Log:
compiles for me
Modified: trunk/packages/netcdf-java/trunk/debian/control
===================================================================
--- trunk/packages/netcdf-java/trunk/debian/control 2011-09-12 13:54:39 UTC (rev 7766)
+++ trunk/packages/netcdf-java/trunk/debian/control 2011-09-12 15:14:22 UTC (rev 7767)
@@ -5,7 +5,7 @@
DM-Upload-Allowed: yes
Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Build-Depends: debhelper (>= 8), javahelper (>=0.25)
-Build-Depends-Indep: default-jdk, default-jdk-doc, ant
+Build-Depends-Indep: default-jdk, default-jdk-doc, ant, libjdom1-java, libslf4j-java, libcommons-httpclient-java, libdb-je-java, libehcache-java, libprotobuf-java, libquartz-java
Standards-Version: 3.9.2
Homepage: http://java.net/projects/jai-core/
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/jai-core/trunk/
Added: trunk/packages/netcdf-java/trunk/debian/patches/fix_exception_sleepycat.patch
===================================================================
--- trunk/packages/netcdf-java/trunk/debian/patches/fix_exception_sleepycat.patch (rev 0)
+++ trunk/packages/netcdf-java/trunk/debian/patches/fix_exception_sleepycat.patch 2011-09-12 15:14:22 UTC (rev 7767)
@@ -0,0 +1,176 @@
+[javac] cdm/src/main/java/thredds/inventory/DatasetCollectionManager.java:572: unreported exception com.sleepycat.je.DatabaseException; must be caught or declared to be thrown
+Index: netcdf-java-4.2/cdm/src/main/java/thredds/inventory/DatasetCollectionManager.java
+===================================================================
+--- netcdf-java-4.2.orig/cdm/src/main/java/thredds/inventory/DatasetCollectionManager.java 2011-09-12 16:39:09.000000000 +0200
++++ netcdf-java-4.2/cdm/src/main/java/thredds/inventory/DatasetCollectionManager.java 2011-09-12 16:41:05.000000000 +0200
+@@ -157,6 +157,8 @@
+ double olderThanV = tu.getValueInSeconds();
+ filters.add( new LastModifiedLimit((long) (1000 * olderThanV)));
+ return olderThanV;
++ } catch (com.sleepycat.je.DatabaseException e) {
++ logger.error(collectionName + ": Invalid time unit for olderThan = {}", olderThan);
+ } catch (Exception e) {
+ logger.error(collectionName + ": Invalid time unit for olderThan = {}", olderThan);
+ }
+@@ -570,6 +572,9 @@
+ if (collectionName == null) return; // eg no scan in ncml
+ try {
+ mm = new MetadataManager(collectionName);
++ } catch (com.sleepycat.je.DatabaseException e) {
++ e.printStackTrace();
++ throw new RuntimeException(e.getMessage());
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
+Index: netcdf-java-4.2/cdm/src/main/java/thredds/inventory/bdb/MetadataManager.java
+===================================================================
+--- netcdf-java-4.2.orig/cdm/src/main/java/thredds/inventory/bdb/MetadataManager.java 2011-09-12 16:42:08.000000000 +0200
++++ netcdf-java-4.2/cdm/src/main/java/thredds/inventory/bdb/MetadataManager.java 2011-09-12 17:07:06.000000000 +0200
+@@ -156,10 +156,9 @@
+ }
+
+ static public void showEnvStats(Formatter f) {
++ try {
+ if (myEnv == null)
+ setup();
+-
+- try {
+ EnvironmentStats stats = myEnv.getStats(null);
+ f.format("EnvironmentStats%n%s%n", stats);
+
+@@ -177,14 +176,23 @@
+ }
+
+ static public void sync() {
++ try {
+ if (myEnv != null)
+ myEnv.sync();
++ } catch (DatabaseException e) {
++ e.printStackTrace();
++}
+ }
+
+ static public List<String> getCollectionNames() {
++ try {
+ if (myEnv == null)
+ setup();
+ return myEnv.getDatabaseNames();
++ } catch (DatabaseException e) {
++ e.printStackTrace();
++}
++return null;
+ }
+
+ static public void deleteCollection(String collectionName) throws Exception {
+@@ -203,6 +211,8 @@
+ MetadataManager mm = new MetadataManager(collectionName);
+ mm.delete(key);
+ mm.close();
++ } catch (DatabaseException e) {
++ throw new RuntimeException(e);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+@@ -233,7 +243,11 @@
+ dbConfig.setAllowCreate(!readOnly);
+ if (!readOnly)
+ dbConfig.setDeferredWrite(true);
++try {
+ database = myEnv.openDatabase(null, collectionName, dbConfig);
++} catch ( DatabaseException e ) {
++ e.printStackTrace();
++}
+
+ openDatabases.add(this);
+ }
+@@ -243,6 +257,7 @@
+ openDatabase();
+ try {
+ database.put(null, new DatabaseEntry(key.getBytes(UTF8)), new DatabaseEntry(value.getBytes(UTF8)));
++ } catch (DatabaseException e) {
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e.getMessage());
+ }
+@@ -251,7 +266,10 @@
+ public void put(byte[] key, byte[] value) {
+ if (readOnly) return;
+ openDatabase();
++try {
+ database.put(null, new DatabaseEntry(key), new DatabaseEntry(value));
++ } catch (DatabaseException e) {
++}
+ }
+
+ public void put(String key, byte[] value) {
+@@ -259,6 +277,7 @@
+ openDatabase();
+ try {
+ database.put(null, new DatabaseEntry(key.getBytes(UTF8)), new DatabaseEntry(value));
++ } catch (DatabaseException e) {
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e.getMessage());
+ }
+@@ -267,7 +286,10 @@
+ public byte[] get(byte[] key) {
+ openDatabase();
+ DatabaseEntry value = new DatabaseEntry();
++try {
+ database.get(null, new DatabaseEntry(key), value, LockMode.DEFAULT);
++ } catch (DatabaseException e) {
++}
+ return value.getData();
+ }
+
+@@ -277,6 +299,8 @@
+ DatabaseEntry value = new DatabaseEntry();
+ database.get(null, new DatabaseEntry(key.getBytes(UTF8)), value, LockMode.DEFAULT);
+ return value.getData();
++ } catch (DatabaseException e) {
++ throw new RuntimeException(e);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+@@ -291,6 +315,8 @@
+ return new String(value.getData(), UTF8);
+ else
+ return null;
++ } catch (DatabaseException e) {
++ throw new RuntimeException(e);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+@@ -306,6 +332,7 @@
+ try {
+ DatabaseEntry entry = new DatabaseEntry(theKey.getBytes("UTF-8"));
+ database.delete(null, entry);
++ } catch (DatabaseException e) {
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+@@ -353,19 +380,26 @@
+ } catch (UnsupportedOperationException e) {
+ logger.error("Trying to delete " + collectionName, e);
+
++ } catch (DatabaseException e) {
+ } catch (UnsupportedEncodingException e) {
+ logger.error("Trying to delete " + collectionName, e);
+
+ } finally {
+ if (null != myCursor)
++try {
+ myCursor.close();
++ } catch (DatabaseException e) {
++}
+ }
+
+ }
+
+ public void close() {
+ if (database != null) {
++try {
+ database.close();
++ } catch (DatabaseException e) {
++}
+ openDatabases.remove(this);
+ database = null;
+ }
Modified: trunk/packages/netcdf-java/trunk/debian/patches/series
===================================================================
--- trunk/packages/netcdf-java/trunk/debian/patches/series 2011-09-12 13:54:39 UTC (rev 7766)
+++ trunk/packages/netcdf-java/trunk/debian/patches/series 2011-09-12 15:14:22 UTC (rev 7767)
@@ -1 +1,2 @@
+fix_exception_sleepycat.patch
remove_jpegparam.patch
Modified: trunk/packages/netcdf-java/trunk/debian/rules
===================================================================
--- trunk/packages/netcdf-java/trunk/debian/rules 2011-09-12 13:54:39 UTC (rev 7766)
+++ trunk/packages/netcdf-java/trunk/debian/rules 2011-09-12 15:14:22 UTC (rev 7767)
@@ -1,12 +1,15 @@
#!/usr/bin/make -f
JAVA_HOME=/usr/lib/jvm/default-java
+TODO=/home/mathieu/debian/debian-med/trunk/packages/netcdf-java/trunk/bla/lib/release/opendap-2.2.jar:/home/mathieu/debian/debian-med/trunk/packages/netcdf-java/trunk/bla/lib/external/visad.jar:/home/mathieu/debian/debian-med/trunk/packages/netcdf-java/trunk/bla/lib/release/grib-8.0.jar
+export CLASSPATH=/usr/share/java/quartz.jar:/usr/share/java/protobuf.jar:/usr/share/java/ehcache.jar:/usr/share/java/jdom1.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/db-je.jar:$(TODO)
+ANT_OPTS=-Dbuild.sysclasspath=first
%:
dh $@ --with javahelper
override_dh_auto_build:
- ant -DBUILD_TYPE=fcs -f build.xml all
+ ant $(ANT_OPTS) -f cdm/build.xml
get-orig-source:
./debian/get-orig-source
More information about the debian-med-commit
mailing list