import java.util.Vector;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
this(archive, overwrite, vamsasdocument, null);
}
/**
+ * Constructor for accessing Files under file-lock management (ie a session file)
+ * @param archive
+ * @param vamsasdocument
+ * @param overwrite
+ * @throws IOException
+ */
+ public VamsasArchive(VamsasFile archive, boolean vamsasdocument, boolean overwrite) throws IOException {
+ this(archive.sessionFile, overwrite, vamsasdocument, archive);
+ }
+ /**
*
* @param archive file to write
* @param overwrite true if original contents should be deleted
this.vamsasdocument = vamsasdocument;
if (archive.exists() && !overwrite) {
this.original = archive;
- if (extantLock!=null)
+ if (extantLock!=null) {
this.odoclock = extantLock;
- else
- this.odoclock = new SessionFile(archive);
+ if (odoclock.fileLock==null || !odoclock.fileLock.isLocked())
+ odoclock.lockFile();
+ } else {
+ this.odoclock = new SessionFile(archive);
+ }
odoclock.lockFile(); // lock the file *immediatly*
this.archive = null; // archive will be a temp file when the open method is called
virginArchive=false;
else
rchive = new SessionFile(archive);
rchive.lockFile();
- if (rchive.fileLock==null || rchive.fileLock.rafile==null)
+ if (rchive.fileLock==null || rchive.fileLock.rafile==null || !rchive.fileLock.isLocked())
throw new IOException("Lock failed for new archive"+archive);
rchive.fileLock.rafile.setLength(0); // empty the archive.
virginArchive = true;
JarEntry je = new JarEntry(entry);
if (!addEntry(entry))
return false;
+ newarchive.flush();
newarchive.putNextEntry(je);
return true;
}
public boolean cancelArchive() {
if (newarchive!=null) {
try {
+ newarchive.closeEntry();
+ newarchive.putNextEntry(new JarEntry("deleted"));
+ newarchive.closeEntry();
newarchive.close();
} catch (Exception e) {
*/
public void closeArchive() throws IOException {
if (newarchive!=null) {
+ newarchive.flush();
newarchive.closeEntry();
if (!isDocumentWritten())
log.warn("Premature closure of archive '"+archive.getAbsolutePath()+"': No document has been written.");
- newarchive.close();
+ newarchive.finish();
updateOriginal();
closeAndReset();
} else {
rchive = new SessionFile(archive);
if (!rchive.lockFile())
throw new IOException("Failed to get lock on file "+archive);
- newarchive = new JarOutputStream(rchive.fileLock.getBufferedOutputStream(true));
+ Manifest newmanifest = new Manifest();
+ newarchive = new JarOutputStream(rchive.fileLock.getBufferedOutputStream(true), newmanifest);
entries = new Hashtable();
}
public void putVamsasDocument(VamsasDocument doc) throws IOException,
public void putVamsasDocument(VamsasDocument doc, VorbaIdFactory vorba) throws IOException,
org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
+ if (vamsasdocument)
+ doc.setVersion(VersionEntries.latestVersion()); // LATER: ensure this does the correct thing.
VorbaXmlBinder.putVamsasDocument(getDocumentOutputStream(), vorba, doc);
}