# HG changeset patch # User robcast # Date 1186075367 -7200 # Node ID d09c9b1db0cba7e1307d54d6c041db2e404d8756 # Parent 5cfbd6f99cf2adee5d816653042dffa42d32fd2c new servlet version 1.7.0b - changed semaphore code to use Java 1.5 - changed digilib worker to do write the output outside the semaphore diff -r 5cfbd6f99cf2 -r d09c9b1db0cb servlet/src/digilib/servlet/Initialiser.java --- a/servlet/src/digilib/servlet/Initialiser.java Thu Aug 02 19:22:47 2007 +0200 +++ b/servlet/src/digilib/servlet/Initialiser.java Thu Aug 02 19:22:47 2007 +0200 @@ -20,7 +20,6 @@ */ package digilib.servlet; -import digilib.image.ImageOps; import java.io.File; import javax.servlet.ServletConfig; @@ -31,10 +30,9 @@ import org.apache.log4j.Logger; import org.apache.log4j.xml.DOMConfigurator; -import EDU.oswego.cs.dl.util.concurrent.FIFOSemaphore; -import EDU.oswego.cs.dl.util.concurrent.Semaphore; import digilib.auth.AuthOps; import digilib.auth.XMLAuthOps; +import digilib.image.ImageOps; import digilib.io.AliasingDocuDirCache; import digilib.io.DocuDirCache; import digilib.io.FileOps; @@ -137,8 +135,7 @@ ImageOps.setDocuImage(dlConfig.getDocuImageInstance()); // worker threads int nt = dlConfig.getAsInt("worker-threads"); - Semaphore lck = new FIFOSemaphore(nt); - DigilibWorker.setLock(lck); + DigilibWorker.setSemaphore(nt, true); int mt = dlConfig.getAsInt("max-waiting-threads"); DigilibWorker.setMaxWaitingThreads(mt); // set as the servlets main config diff -r 5cfbd6f99cf2 -r d09c9b1db0cb servlet/src/digilib/servlet/Scaler.java --- a/servlet/src/digilib/servlet/Scaler.java Thu Aug 02 19:22:47 2007 +0200 +++ b/servlet/src/digilib/servlet/Scaler.java Thu Aug 02 19:22:47 2007 +0200 @@ -59,7 +59,7 @@ private static final long serialVersionUID = -325080527268912852L; /** digilib servlet version (for all components) */ - public static final String dlVersion = "1.6.1"; + public static final String dlVersion = "1.7.0b"; /** logger for accounting requests */ private static Logger accountlog = Logger.getLogger("account.request");