Revision: 17662
http://sourceforge.net/p/gate/code/17662
Author: markagreenwood
Date: 2014-03-14 16:19:05 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
final removal of all the old datastore security code, and updating all the
other core code that touched it in anyway
Modified Paths:
--------------
gate/trunk/plugins/Learning/src/gate/learning/EvaluationBasedOnDocs.java
gate/trunk/plugins/Teamware_Tools/src/gate/qa/QAForTeamwarePR.java
gate/trunk/plugins/Web_Crawler_Websphinx/src/crawl/SphinxWrapper.java
gate/trunk/src/main/gate/DataStore.java
gate/trunk/src/main/gate/DataStoreRegister.java
gate/trunk/src/main/gate/Factory.java
gate/trunk/src/main/gate/LanguageResource.java
gate/trunk/src/main/gate/corpora/SerialCorpusImpl.java
gate/trunk/src/main/gate/creole/AbstractLanguageResource.java
gate/trunk/src/main/gate/creole/ir/lucene/LuceneIndexManager.java
gate/trunk/src/main/gate/gui/NameBearerHandle.java
gate/trunk/src/main/gate/gui/SerialDatastoreViewer.java
gate/trunk/src/main/gate/persist/LuceneDataStoreImpl.java
gate/trunk/src/main/gate/persist/SerialDataStore.java
gate/trunk/src/main/gate/util/CorpusBenchmarkTool.java
gate/trunk/src/main/gate/util/CorpusSaver.java
gate/trunk/src/test/gate/creole/ir/TestIndex.java
gate/trunk/src/test/gate/persist/TestPersist.java
Removed Paths:
-------------
gate/trunk/src/main/gate/gui/AccessRightsDialog.java
gate/trunk/src/main/gate/security/
Modified:
gate/trunk/plugins/Learning/src/gate/learning/EvaluationBasedOnDocs.java
===================================================================
--- gate/trunk/plugins/Learning/src/gate/learning/EvaluationBasedOnDocs.java
2014-03-14 15:22:24 UTC (rev 17661)
+++ gate/trunk/plugins/Learning/src/gate/learning/EvaluationBasedOnDocs.java
2014-03-14 16:19:05 UTC (rev 17662)
@@ -492,7 +492,7 @@
Corpus corpusTest;
corpusTest = Factory.newCorpus("testCorpus");
if(corpusOn.getDataStore() != null) {
- Corpus corpusTestTemp =
(Corpus)corpusOn.getDataStore().adopt(corpusTest, null);
+ Corpus corpusTestTemp =
(Corpus)corpusOn.getDataStore().adopt(corpusTest);
Factory.deleteResource(corpusTest);
corpusTest = corpusTestTemp;
corpusTest.getDataStore().sync(corpusTest);
Modified: gate/trunk/plugins/Teamware_Tools/src/gate/qa/QAForTeamwarePR.java
===================================================================
--- gate/trunk/plugins/Teamware_Tools/src/gate/qa/QAForTeamwarePR.java
2014-03-14 15:22:24 UTC (rev 17661)
+++ gate/trunk/plugins/Teamware_Tools/src/gate/qa/QAForTeamwarePR.java
2014-03-14 16:19:05 UTC (rev 17662)
@@ -22,7 +22,6 @@
import gate.persist.PersistenceException;
import gate.qa.Measure;
import gate.qa.QualityAssurancePR;
-import gate.security.SecurityException;
import gate.util.OffsetComparator;
import java.awt.Color;
Modified: gate/trunk/plugins/Web_Crawler_Websphinx/src/crawl/SphinxWrapper.java
===================================================================
--- gate/trunk/plugins/Web_Crawler_Websphinx/src/crawl/SphinxWrapper.java
2014-03-14 15:22:24 UTC (rev 17661)
+++ gate/trunk/plugins/Web_Crawler_Websphinx/src/crawl/SphinxWrapper.java
2014-03-14 16:19:05 UTC (rev 17662)
@@ -12,23 +12,32 @@
*/
package crawl;
-import websphinx.*;
-import gate.creole.*;
+import gate.Corpus;
+import gate.Document;
+import gate.Factory;
+import gate.FeatureMap;
+import gate.Gate;
+import gate.corpora.DocumentImpl;
+import gate.creole.ResourceInstantiationException;
import gate.persist.PersistenceException;
-import gate.security.SecurityException;
-import gate.corpora.*;
-import gate.*;
-import java.util.*;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.Date;
+import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-import java.io.UnsupportedEncodingException;
-import java.net.*;
-import java.nio.charset.Charset;
import javax.mail.internet.ContentType;
import javax.mail.internet.ParseException;
+
import org.apache.commons.lang.StringUtils;
+import websphinx.Crawler;
+import websphinx.Link;
+import websphinx.Page;
+
public class SphinxWrapper extends Crawler{
private static final long serialVersionUID = -6524027714398026402L;
Modified: gate/trunk/src/main/gate/DataStore.java
===================================================================
--- gate/trunk/src/main/gate/DataStore.java 2014-03-14 15:22:24 UTC (rev
17661)
+++ gate/trunk/src/main/gate/DataStore.java 2014-03-14 16:19:05 UTC (rev
17662)
@@ -16,15 +16,13 @@
package gate;
-import java.util.List;
-
import gate.event.DatastoreListener;
import gate.persist.PersistenceException;
-import gate.security.*;
-import gate.security.SecurityException;
import gate.util.FeatureBearer;
import gate.util.NameBearer;
+import java.util.List;
+
/** Models all sorts of data storage.
*/
public interface DataStore extends FeatureBearer, NameBearer {
@@ -86,10 +84,9 @@
/** Get the autosaving behaviour of the LR. */
public boolean isAutoSaving();
-
+
/** Adopt a resource for persistence. */
- public LanguageResource adopt(LanguageResource lr, SecurityInfo secInfo)
- throws PersistenceException, gate.security.SecurityException;
+ public LanguageResource adopt(LanguageResource lr) throws
PersistenceException;
/**
* Get a resource from the persistent store.
@@ -153,31 +150,15 @@
* has read access to the LR
*/
public boolean canReadLR(Object lrID)
- throws PersistenceException, gate.security.SecurityException;
+ throws PersistenceException;
/**
* Checks if the user (identified by the sessionID)
* has write access to the LR
*/
public boolean canWriteLR(Object lrID)
- throws PersistenceException, gate.security.SecurityException;
-
- /** get security information for LR . */
- public SecurityInfo getSecurityInfo(LanguageResource lr)
throws PersistenceException;
- /** set security information for LR . */
- public void setSecurityInfo(LanguageResource lr,SecurityInfo si)
- throws PersistenceException, gate.security.SecurityException;
-
- /** identify user using this datastore */
- public void setSession(Session s)
- throws gate.security.SecurityException;
-
- /** identify user using this datastore */
- public Session getSession(Session s)
- throws gate.security.SecurityException;
-
/**
* Try to acquire exlusive lock on a resource from the persistent store.
* Always call unlockLR() when the lock is no longer needed
Modified: gate/trunk/src/main/gate/DataStoreRegister.java
===================================================================
--- gate/trunk/src/main/gate/DataStoreRegister.java 2014-03-14 15:22:24 UTC
(rev 17661)
+++ gate/trunk/src/main/gate/DataStoreRegister.java 2014-03-14 16:19:05 UTC
(rev 17662)
@@ -78,7 +78,6 @@
boolean res = super.remove(o);
if (res) {
fireDatastoreClosed(new CreoleEvent((DataStore) o,
CreoleEvent.DATASTORE_CLOSED));
- removeSecurityData((DataStore) o);
}
return res;
} // remove
@@ -97,32 +96,8 @@
fireDatastoreClosed(new CreoleEvent(iter.next(),
CreoleEvent.DATASTORE_CLOSED));
} // while
} // clear()
-
- /** A hashmap from datastore to security data (current user and group) */
- private static Map<DataStore, Map<Object,Object>> securityData = new
HashMap<DataStore, Map<Object,Object>>();
-
+
/**
- * Returns the security data for this datastore
- */
- public static Map<Object,Object> getSecurityData(DataStore ds) {
- return securityData.get(ds);
- }
-
- /**
- * Adds security data for this datastore
- */
- public static void addSecurityData(DataStore ds, Map<Object,Object> secData)
{
- DataStoreRegister.securityData.put(ds, secData);
- }
-
- /**
- * Removes the security data for this datastore
- */
- public static void removeSecurityData(DataStore ds) {
- DataStoreRegister.securityData.remove(ds);
- }
-
- /**
* Removes a previously registered {@link gate.event.CreoleListener} from the
* list of listeners for this DataStoreRegister. Normally the only listener
* that is registered with the DataStoreRegister is the {@link
CreoleRegister}
Modified: gate/trunk/src/main/gate/Factory.java
===================================================================
--- gate/trunk/src/main/gate/Factory.java 2014-03-14 15:22:24 UTC (rev
17661)
+++ gate/trunk/src/main/gate/Factory.java 2014-03-14 16:19:05 UTC (rev
17662)
@@ -34,7 +34,6 @@
import gate.jape.parser.ParseCpsl;
import gate.persist.PersistenceException;
import gate.persist.SerialDataStore;
-import gate.security.SecurityException;
import gate.util.BomStrippingInputStreamReader;
import gate.util.Out;
import gate.util.SimpleFeatureMapImpl;
Modified: gate/trunk/src/main/gate/LanguageResource.java
===================================================================
--- gate/trunk/src/main/gate/LanguageResource.java 2014-03-14 15:22:24 UTC
(rev 17661)
+++ gate/trunk/src/main/gate/LanguageResource.java 2014-03-14 16:19:05 UTC
(rev 17662)
@@ -17,7 +17,6 @@
package gate;
import gate.persist.PersistenceException;
-import gate.security.SecurityException;
/** Models all sorts of language resources.
*/
Modified: gate/trunk/src/main/gate/corpora/SerialCorpusImpl.java
===================================================================
--- gate/trunk/src/main/gate/corpora/SerialCorpusImpl.java 2014-03-14
15:22:24 UTC (rev 17661)
+++ gate/trunk/src/main/gate/corpora/SerialCorpusImpl.java 2014-03-14
16:19:05 UTC (rev 17662)
@@ -41,7 +41,6 @@
import gate.event.DatastoreEvent;
import gate.event.DatastoreListener;
import gate.persist.PersistenceException;
-import gate.security.SecurityException;
import gate.util.Err;
import gate.util.GateRuntimeException;
import gate.util.MethodNotImplementedException;
@@ -239,7 +238,7 @@
// if the document is not already adopted, we need to do that
// first
if(doc.getLRPersistenceId() == null) {
- doc = (Document)this.getDataStore().adopt(doc, null);
+ doc = (Document)this.getDataStore().adopt(doc);
this.getDataStore().sync(doc);
this.setDocumentPersistentID(index, doc.getLRPersistenceId());
}
@@ -250,10 +249,6 @@
throw new GateRuntimeException("Error unloading document from corpus"
+ "because document sync failed: " + ex.getMessage(), ex);
}
- catch(gate.security.SecurityException ex1) {
- throw new GateRuntimeException("Error unloading document from corpus"
- + "because of document access error: " + ex1.getMessage(),ex1);
- }
}
// 3. remove the document from the memory
// do this, only if the saving has succeeded
Modified: gate/trunk/src/main/gate/creole/AbstractLanguageResource.java
===================================================================
--- gate/trunk/src/main/gate/creole/AbstractLanguageResource.java
2014-03-14 15:22:24 UTC (rev 17661)
+++ gate/trunk/src/main/gate/creole/AbstractLanguageResource.java
2014-03-14 16:19:05 UTC (rev 17662)
@@ -19,9 +19,7 @@
import gate.DataStore;
import gate.LanguageResource;
import gate.persist.PersistenceException;
-import gate.security.SecurityException;
-
/** A convenience implementation of LanguageResource with some default code.
*/
abstract public class AbstractLanguageResource
Modified: gate/trunk/src/main/gate/creole/ir/lucene/LuceneIndexManager.java
===================================================================
--- gate/trunk/src/main/gate/creole/ir/lucene/LuceneIndexManager.java
2014-03-14 15:22:24 UTC (rev 17661)
+++ gate/trunk/src/main/gate/creole/ir/lucene/LuceneIndexManager.java
2014-03-14 16:19:05 UTC (rev 17662)
@@ -115,8 +115,6 @@
throw new IndexException(ioe.getMessage());
} catch (gate.persist.PersistenceException pe){
pe.printStackTrace();
- } catch (gate.security.SecurityException se){
- se.printStackTrace();
}
}
Deleted: gate/trunk/src/main/gate/gui/AccessRightsDialog.java
===================================================================
--- gate/trunk/src/main/gate/gui/AccessRightsDialog.java 2014-03-14
15:22:24 UTC (rev 17661)
+++ gate/trunk/src/main/gate/gui/AccessRightsDialog.java 2014-03-14
16:19:05 UTC (rev 17662)
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1995-2012, The University of Sheffield. See the file
- * COPYRIGHT.txt in the software or at http://gate.ac.uk/gate/COPYRIGHT.txt
- *
- * This file is part of GATE (see http://gate.ac.uk/), and is free
- * software, licenced under the GNU Library General Public License,
- * Version 2, June 1991 (in the distribution as file licence.html,
- * and also available at http://gate.ac.uk/gate/licence.html).
- *
- * Kalina Bontcheva 19/11/2001
- *
- * $Id$
- *
- */
-
-package gate.gui;
-
-import java.awt.Component;
-
-import javax.swing.*;
-
-import gate.security.SecurityInfo;
-
-public class AccessRightsDialog {
- private static JRadioButton gr_gw = new JRadioButton();
- private static JRadioButton gr_ow = new JRadioButton();
- private static JRadioButton or_ow = new JRadioButton();
- private static JRadioButton wr_gw = new JRadioButton();
- private static ButtonGroup group;
-
- public static boolean showDialog(Component parentComponent){
- gr_gw.setText("Group read/group write");
- gr_ow.setText("Group read/owner write");
- or_ow.setText("Owner read/owner write");
- wr_gw.setText("All read/group write");
-
- JPanel panel1 = new JPanel();
- panel1.setLayout(new BoxLayout(panel1,BoxLayout.Y_AXIS));
-
- group = new ButtonGroup();
- group.add(gr_gw);
- group.add(gr_ow);
- group.add(or_ow);
- group.add(wr_gw);
- gr_gw.setSelected(true);
-
- panel1.add(wr_gw);
- panel1.add(Box.createHorizontalStrut(30));
- panel1.add(gr_gw);
- panel1.add(Box.createHorizontalStrut(30));
- panel1.add(gr_ow);
- panel1.add(Box.createHorizontalStrut(30));
- panel1.add(or_ow);
- panel1.add(Box.createHorizontalStrut(30));
-
- return
- OkCancelDialog.showDialog(parentComponent,
- panel1,
- "Choose access mode");
-
- }
-
- public static int getSelectedMode() {
- if(gr_gw.isSelected())
- return SecurityInfo.ACCESS_GR_GW;
- else if(gr_ow.isSelected())
- return SecurityInfo.ACCESS_GR_OW;
- else if(or_ow.isSelected())
- return SecurityInfo.ACCESS_OR_OW;
- else if(wr_gw.isSelected())
- return SecurityInfo.ACCESS_WR_GW;
-
- return -1;
- }
-
-}
\ No newline at end of file
Modified: gate/trunk/src/main/gate/gui/NameBearerHandle.java
===================================================================
--- gate/trunk/src/main/gate/gui/NameBearerHandle.java 2014-03-14 15:22:24 UTC
(rev 17661)
+++ gate/trunk/src/main/gate/gui/NameBearerHandle.java 2014-03-14 16:19:05 UTC
(rev 17662)
@@ -52,10 +52,6 @@
import gate.event.StatusListener;
import gate.persist.LuceneDataStoreImpl;
import gate.persist.PersistenceException;
-import gate.security.Group;
-import gate.security.SecurityException;
-import gate.security.SecurityInfo;
-import gate.security.User;
import gate.swing.XJFileChooser;
import gate.swing.XJMenuItem;
import gate.swing.XJPopupMenu;
@@ -1342,19 +1338,7 @@
+ " seconds");
}
else {
- Map<Object,Object> securityData = DataStoreRegister
- .getSecurityData(ds);
- SecurityInfo si = null;
- // check whether the datastore supports security data
- // serial ones do not for example
- if(securityData != null) {
- // first get the type of access from the user
- if(!AccessRightsDialog.showDialog(window)) return;
- int accessType = AccessRightsDialog.getSelectedMode();
- if(accessType < 0) return;
- si = new SecurityInfo(accessType, (User)securityData
- .get("user"), (Group)securityData.get("group"));
- }// if security info
+
StatusListener sListener = (StatusListener)gate.Gate
.getListeners().get("gate.event.StatusListener");
MainFrame.lockGUI("Saving "
@@ -1364,7 +1348,7 @@
sListener.statusChanged("Saving: "
+ ((LanguageResource)target).getName());
double timeBefore = System.currentTimeMillis();
- LanguageResource lr = ds.adopt((LanguageResource)target, si);
+ LanguageResource lr = ds.adopt((LanguageResource)target);
ds.sync(lr);
if(ds instanceof LuceneDataStoreImpl
&& lr instanceof IndexedCorpus) {
@@ -1414,11 +1398,6 @@
JOptionPane.showMessageDialog(getLargeView(), "Save failed!\n "
+ pe.toString(), "GATE", JOptionPane.ERROR_MESSAGE);
}
- catch(gate.security.SecurityException se) {
- MainFrame.unlockGUI();
- JOptionPane.showMessageDialog(getLargeView(), "Save failed!\n "
- + se.toString(), "GATE", JOptionPane.ERROR_MESSAGE);
- }
finally {
MainFrame.unlockGUI();
}
Modified: gate/trunk/src/main/gate/gui/SerialDatastoreViewer.java
===================================================================
--- gate/trunk/src/main/gate/gui/SerialDatastoreViewer.java 2014-03-14
15:22:24 UTC (rev 17661)
+++ gate/trunk/src/main/gate/gui/SerialDatastoreViewer.java 2014-03-14
16:19:05 UTC (rev 17662)
@@ -29,7 +29,6 @@
import gate.event.DatastoreEvent;
import gate.event.DatastoreListener;
import gate.persist.PersistenceException;
-import gate.security.SecurityException;
import gate.util.Err;
import gate.util.GateRuntimeException;
import gate.util.Strings;
Modified: gate/trunk/src/main/gate/persist/LuceneDataStoreImpl.java
===================================================================
--- gate/trunk/src/main/gate/persist/LuceneDataStoreImpl.java 2014-03-14
15:22:24 UTC (rev 17661)
+++ gate/trunk/src/main/gate/persist/LuceneDataStoreImpl.java 2014-03-14
16:19:05 UTC (rev 17662)
@@ -23,7 +23,6 @@
import gate.event.CorpusListener;
import gate.event.CreoleEvent;
import gate.event.CreoleListener;
-import gate.security.SecurityException;
import gate.util.Files;
import gate.util.GateRuntimeException;
import gate.util.Strings;
Modified: gate/trunk/src/main/gate/persist/SerialDataStore.java
===================================================================
--- gate/trunk/src/main/gate/persist/SerialDataStore.java 2014-03-14
15:22:24 UTC (rev 17661)
+++ gate/trunk/src/main/gate/persist/SerialDataStore.java 2014-03-14
16:19:05 UTC (rev 17662)
@@ -27,9 +27,6 @@
import gate.creole.ResourceData;
import gate.event.DatastoreEvent;
import gate.event.DatastoreListener;
-import gate.security.SecurityException;
-import gate.security.SecurityInfo;
-import gate.security.Session;
import gate.util.AbstractFeatureBearer;
import gate.util.Files;
import gate.util.GateRuntimeException;
@@ -266,11 +263,11 @@
)
);
} // delete(lr)
-
- /** Adopt a resource for persistence. */
+
+ /** Adopt a resource for persistence. */
@Override
- public LanguageResource adopt(LanguageResource lr,SecurityInfo secInfo)
- throws PersistenceException,gate.security.SecurityException {
+ public LanguageResource adopt(LanguageResource lr)
+ throws PersistenceException {
//ignore security info
@@ -425,7 +422,7 @@
//if the document is not already adopted, we need to do that first
if (doc.getLRPersistenceId() == null) {
if (DEBUG) Out.prln("Document adopted" + doc.getName());
- doc = (Document) this.adopt(doc, null);
+ doc = (Document) this.adopt(doc);
this.sync(doc);
if (DEBUG) Out.prln("Document sync-ed");
corpus.setDocumentPersistentID(i, doc.getLRPersistenceId());
@@ -722,7 +719,7 @@
*/
@Override
public boolean canReadLR(Object lrID)
- throws PersistenceException, gate.security.SecurityException{
+ throws PersistenceException{
return true;
}
@@ -732,7 +729,7 @@
*/
@Override
public boolean canWriteLR(Object lrID)
- throws PersistenceException, gate.security.SecurityException{
+ throws PersistenceException{
return true;
}
@@ -749,46 +746,6 @@
return name;
}
-
-
- /** get security information for LR . */
- @Override
- public SecurityInfo getSecurityInfo(LanguageResource lr)
- throws PersistenceException {
-
- throw new UnsupportedOperationException("security information is not
supported "+
- "for SerialDataStore");
- }
-
- /** set security information for LR . */
- @Override
- public void setSecurityInfo(LanguageResource lr,SecurityInfo si)
- throws PersistenceException, gate.security.SecurityException {
-
- throw new UnsupportedOperationException("security information is not
supported "+
- "for SerialDataStore");
-
- }
-
-
- /** identify user using this datastore */
- @Override
- public void setSession(Session s)
- throws gate.security.SecurityException {
-
- // do nothing
- }
-
-
-
- /** identify user using this datastore */
- @Override
- public Session getSession(Session s)
- throws gate.security.SecurityException {
-
- return null;
- }
-
/**
* Try to acquire exlusive lock on a resource from the persistent store.
* Always call unlockLR() when the lock is no longer needed
Modified: gate/trunk/src/main/gate/util/CorpusBenchmarkTool.java
===================================================================
--- gate/trunk/src/main/gate/util/CorpusBenchmarkTool.java 2014-03-14
15:22:24 UTC (rev 17661)
+++ gate/trunk/src/main/gate/util/CorpusBenchmarkTool.java 2014-03-14
16:19:05 UTC (rev 17662)
@@ -499,7 +499,7 @@
doc.setName(files[i].getName());
processDocument(doc);
- final LanguageResource lr = sds.adopt(doc, null);
+ final LanguageResource lr = sds.adopt(doc);
sds.sync(lr);
javax.swing.SwingUtilities.invokeLater(new Runnable() {
@Override
@@ -526,11 +526,6 @@
new GateRuntimeException("CorpusBenchmark: " + ex2.getMessage())
.initCause(ex2);
}
- catch (gate.security.SecurityException ex3) {
- throw (GateRuntimeException)
- new GateRuntimeException("CorpusBenchmark: " + ex3.getMessage())
- .initCause(ex3);
- }
} //generateCorpus
protected void evaluateCorpus(File fileDir,
Modified: gate/trunk/src/main/gate/util/CorpusSaver.java
===================================================================
--- gate/trunk/src/main/gate/util/CorpusSaver.java 2014-03-14 15:22:24 UTC
(rev 17661)
+++ gate/trunk/src/main/gate/util/CorpusSaver.java 2014-03-14 16:19:05 UTC
(rev 17662)
@@ -41,7 +41,7 @@
try {
Corpus corpus = Factory.newCorpus("bnc");
- LanguageResource lr = ds.adopt(corpus, null);
+ LanguageResource lr = ds.adopt(corpus);
ds.sync(lr);
theCorpus = (Corpus) lr;
} catch (Exception ex) {
@@ -230,7 +230,7 @@
//then store it in the DS and add to corpus
if (saveMode) {
- Document lr = (Document)ds.adopt(doc, null);
+ Document lr = (Document)ds.adopt(doc);
theCorpus.add(lr);
theCorpus.unloadDocument( lr);
Modified: gate/trunk/src/test/gate/creole/ir/TestIndex.java
===================================================================
--- gate/trunk/src/test/gate/creole/ir/TestIndex.java 2014-03-14 15:22:24 UTC
(rev 17661)
+++ gate/trunk/src/test/gate/creole/ir/TestIndex.java 2014-03-14 16:19:05 UTC
(rev 17662)
@@ -72,7 +72,7 @@
Corpus corp = Factory.newCorpus("LuceneTestCorpus");
corp.add(doc0);
- corpus = (Corpus) sds.adopt(corp,null);
+ corpus = (Corpus) sds.adopt(corp);
sds.sync(corpus);
} catch (Exception e) {
Modified: gate/trunk/src/test/gate/persist/TestPersist.java
===================================================================
--- gate/trunk/src/test/gate/persist/TestPersist.java 2014-03-14 15:22:24 UTC
(rev 17661)
+++ gate/trunk/src/test/gate/persist/TestPersist.java 2014-03-14 16:19:05 UTC
(rev 17662)
@@ -99,7 +99,7 @@
doc.setDataStore(new SerialDataStore(new File("z:\\").toURI().toURL()
.toString()));
try {
- sds.adopt(doc, null);
+ sds.adopt(doc);
} catch(PersistenceException e) {
cannotSync = true;
}
@@ -109,7 +109,7 @@
doc.setName("Alicia Tonbridge, a Document");
// save the document
- Document persDoc = (Document)sds.adopt(doc, null);
+ Document persDoc = (Document)sds.adopt(doc);
sds.sync(persDoc);
Object lrPersistenceId = persDoc.getLRPersistenceId();
@@ -170,7 +170,7 @@
Factory.newFeatureMap());
// save the document
- Document persDoc = (Document)sds.adopt(doc, null);
+ Document persDoc = (Document)sds.adopt(doc);
sds.sync(persDoc);
// remember the persistence ID for reading back
@@ -225,7 +225,7 @@
Corpus corp = Factory.newCorpus("Hamish test corpus");
corp.add(doc);
corp.add(doc2);
- LanguageResource persCorpus = sds.adopt(corp, null);
+ LanguageResource persCorpus = sds.adopt(corp);
sds.sync(persCorpus);
// read the documents back
@@ -303,7 +303,7 @@
Factory.newFeatureMap());
// save the document
- Document persDoc = (Document)sds.adopt(doc, null);
+ Document persDoc = (Document)sds.adopt(doc);
sds.sync(persDoc);
// remember the persistence ID for reading back
@@ -345,7 +345,7 @@
Factory.newFeatureMap());
// save the document
- Document persDoc = (Document)sds.adopt(doc, null);
+ Document persDoc = (Document)sds.adopt(doc);
sds.sync(persDoc);
// DSR should have one member
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
