Menu
▾
▴
[gate-cvs] SF.net SVN: gate:[14848] gate/trunk/src/gate
|
From: <mar...@us...> - 2011-12-22 18:23:02
|
Revision: 14848
http://gate.svn.sourceforge.net/gate/?rev=14848&view=rev
Author: markagreenwood
Date: 2011-12-22 18:22:53 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
removed a bunch more db stuff that we don't want to support any longer
Modified Paths:
--------------
gate/trunk/src/gate/DataStoreRegister.java
gate/trunk/src/gate/Factory.java
gate/trunk/src/gate/Gate.java
gate/trunk/src/gate/Main.java
gate/trunk/src/gate/TestGate.java
gate/trunk/src/gate/creole/annic/apache/lucene/store/Directory.java
gate/trunk/src/gate/gui/MainFrame.java
gate/trunk/src/gate/persist/SerialDataStore.java
Removed Paths:
-------------
gate/trunk/src/gate/gui/UserGroupEditor.java
gate/trunk/src/gate/gui/UserPasswordDialog.java
gate/trunk/src/gate/persist/ConnectionPool.java
gate/trunk/src/gate/persist/DBHelper.java
gate/trunk/src/gate/security/AccessControllerImpl.java
gate/trunk/src/gate/security/GroupImpl.java
gate/trunk/src/gate/security/TestSecurity.java
gate/trunk/src/gate/security/UserImpl.java
gate/trunk/src/gate/util/InvalidDatabaseException.java
gate/trunk/src/gate/util/NoSuchObjectException.java
gate/trunk/src/gate/util/OpenTransactionsException.java
Modified: gate/trunk/src/gate/DataStoreRegister.java
===================================================================
--- gate/trunk/src/gate/DataStoreRegister.java 2011-12-22 17:56:56 UTC (rev 14847)
+++ gate/trunk/src/gate/DataStoreRegister.java 2011-12-22 18:22:53 UTC (rev 14848)
@@ -16,11 +16,16 @@
package gate;
-import java.util.*;
-
import gate.event.CreoleEvent;
import gate.event.CreoleListener;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
/**
* Records all the open DataStores.
*/
@@ -38,12 +43,6 @@
// be a capability to add new data store classes via creole.xml metadata
// and resource jars
- // Oracle - hide it as it is obsolete
-// names.put("gate.persist.OracleDataStore", "OracleDataStore: Oracle-specific RDBMS storage over JDBC");
-
- // Postgres - hide it as it is obsolete
-// names.put("gate.persist.PostgresDataStore", "PostgresDataStore: PostgreSQL-specific RDBMS storage over JDBC");
-
// filesystem
names.put("gate.persist.SerialDataStore", "SerialDataStore: file-based storage using Java serialisation");
Modified: gate/trunk/src/gate/Factory.java
===================================================================
--- gate/trunk/src/gate/Factory.java 2011-12-22 17:56:56 UTC (rev 14847)
+++ gate/trunk/src/gate/Factory.java 2011-12-22 18:22:53 UTC (rev 14848)
@@ -854,22 +854,6 @@
accessControllerPool = new HashMap();
} // static initialiser
-
- /**
- * Creates and opens a new AccessController (if not available in the pool).
- */
- public static synchronized AccessController createAccessController(String jdbcURL)
- throws PersistenceException {
-
- if (false == accessControllerPool.containsKey(jdbcURL)) {
- AccessController ac = new AccessControllerImpl(jdbcURL);
- ac.open();
- accessControllerPool.put(jdbcURL,ac);
- }
-
- return (AccessController)accessControllerPool.get(jdbcURL);
- } // createAccessController()
-
} // abstract Factory
Modified: gate/trunk/src/gate/Gate.java
===================================================================
--- gate/trunk/src/gate/Gate.java 2011-12-22 17:56:56 UTC (rev 14847)
+++ gate/trunk/src/gate/Gate.java 2011-12-22 18:22:53 UTC (rev 14848)
@@ -96,13 +96,6 @@
*/
public static final int HASH_STH_SIZE = 4;
- /**
- * The database schema owner (GATEADMIN is default) this one should not be
- * hardcoded but set in the XML initialization files
- *
- */
- public static final String DB_OWNER = "gateadmin";
-
/** The list of builtin URLs to search for CREOLE resources. */
private static String builtinCreoleDirectoryUrls[] = {
// "http://derwent.dcs.shef.ac.uk/gate.ac.uk/creole/"
Modified: gate/trunk/src/gate/Main.java
===================================================================
--- gate/trunk/src/gate/Main.java 2011-12-22 17:56:56 UTC (rev 14847)
+++ gate/trunk/src/gate/Main.java 2011-12-22 18:22:53 UTC (rev 14848)
@@ -20,7 +20,6 @@
import gate.gui.OptionsDialog;
import gate.gui.ShellSlacFrame;
import gate.gui.Splash;
-import gate.gui.UserGroupEditor;
import gate.util.BomStrippingInputStreamReader;
import gate.util.CorpusBenchmarkTool;
import gate.util.Err;
@@ -45,8 +44,6 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -118,9 +115,6 @@
if(batchMode) {
if(DEBUG) Out.prln("running batch process");
batchProcess();
- } else if(dbAdminMode) {
- if(DEBUG) Out.prln("running dbAdmin");
- dbAdmin();
} else {
runGui();
}
@@ -326,13 +320,6 @@
registerCreoleUrls();
} // runGui()
- /** Run the db admin interface. */
- private static void dbAdmin() throws GateException {
- try { UserGroupEditor.main(null); } catch(Exception e) {
- throw new GateException(e);
- }
- } // dbAdmin()
-
/**
* Reads the user config data and applies the required settings.
* This must be called <b>after</b> {@link Gate#init()} but <b>before</b>
@@ -555,9 +542,6 @@
/** Are we in batch mode? */
public static boolean batchMode = false;
- /** Are we in db admin mode? */
- public static boolean dbAdminMode = false;
-
/** Don't save collection after batch? */
private static boolean destroyColl = false;
@@ -581,10 +565,6 @@
int c;
while( (c = g.getopt()) != -1 )
switch(c) {
- // -a
- case 'a':
- dbAdminMode = true;
- break;
// -h
case 'h':
help();
Modified: gate/trunk/src/gate/TestGate.java
===================================================================
--- gate/trunk/src/gate/TestGate.java 2011-12-22 17:56:56 UTC (rev 14847)
+++ gate/trunk/src/gate/TestGate.java 2011-12-22 18:22:53 UTC (rev 14848)
@@ -100,19 +100,6 @@
/** Status flag for error exit. */
private static final int STATUS_ERROR = 1;
- private static final String
- defOracleDriver = "jdbc:oracle:thin:@derwent:1521:dbgate";
- private static final String
- saiOracleDriver = "jdbc:oracle:thin:GATEUSER/gate@192.168.128.7:1521:GATE04";
- private static final String
- defPSQLDriver = "jdbc:postgresql://redmires/gate";
- private static final String
- saiPSQLDriver = "jdbc:postgresql://sirma/gate";
-
-
- public static String oracleDriver = defOracleDriver;
- public static String psqlDriver = defPSQLDriver;
-
/** Main routine for the GATE test suite.
* Command-line arguments:
* <UL>
@@ -153,10 +140,6 @@
case 'a':
autoloadingMode = true;
break;
- case 's':
- oracleDriver = saiOracleDriver;
- psqlDriver = saiPSQLDriver;
- break;
// -i gate.xml site-wide init file
case 'i':
String optionString = g.getOptarg();
@@ -197,11 +180,6 @@
junitArgs[0] = "gate.TestGate";
junitArgs[1] = "";
- // NOTE: the DB tests fail under this one (doesn't load oracle driver,
- // even after the Class.forName call)
- Class clazz = null;
- clazz = Class.forName("oracle.jdbc.driver.OracleDriver");
- clazz = null;
junit.swingui.TestRunner.main(junitArgs);
} else { // by default us the single-run GUI version
Modified: gate/trunk/src/gate/creole/annic/apache/lucene/store/Directory.java
===================================================================
--- gate/trunk/src/gate/creole/annic/apache/lucene/store/Directory.java 2011-12-22 17:56:56 UTC (rev 14847)
+++ gate/trunk/src/gate/creole/annic/apache/lucene/store/Directory.java 2011-12-22 18:22:53 UTC (rev 14848)
@@ -25,7 +25,6 @@
* <p> Java's i/o APIs not used directly, but rather all i/o is
* through this API. This permits things such as: <ul>
* <li> implementation of RAM-based indices;
- * <li> implementation indices stored in a database, via JDBC;
* <li> implementation of an index as a single file;
* </ul>
*
Modified: gate/trunk/src/gate/gui/MainFrame.java
===================================================================
--- gate/trunk/src/gate/gui/MainFrame.java 2011-12-22 17:56:56 UTC (rev 14847)
+++ gate/trunk/src/gate/gui/MainFrame.java 2011-12-22 18:22:53 UTC (rev 14848)
@@ -3501,12 +3501,6 @@
else if(className.equals("gate.persist.LuceneDataStoreImpl")) {
createSearchableDataStore();
}
- else if(className.equals("gate.persist.OracleDataStore")) {
- JOptionPane.showMessageDialog(MainFrame.this,
- "Oracle datastores can only be created "
- + "by your Oracle administrator!", "GATE",
- JOptionPane.ERROR_MESSAGE);
- }
else {
throw new UnsupportedOperationException("Unimplemented option!\n"
+ "Use a serial datastore");
@@ -4036,149 +4030,6 @@
else if(className.indexOf("DocServiceDataStore") != -1) {
openDocServiceDataStore();
}
- else if(className.equals("gate.persist.OracleDataStore")
- || className.equals("gate.persist.PostgresDataStore")) {
- List dbPaths = new ArrayList();
- for(Object o : DataStoreRegister.getConfigData().keySet()) {
- String keyName = (String) o;
- if(keyName.startsWith("url")) {
- dbPaths.add(DataStoreRegister.getConfigData().get(keyName));
- }
- }
- if(dbPaths.isEmpty())
- throw new GateRuntimeException(
- "JDBC URL not configured in gate.xml");
- // by default make it the first
- String storageURL = (String)dbPaths.get(0);
- if(dbPaths.size() > 1) {
- Object[] paths = dbPaths.toArray();
- answer =
- JOptionPane.showInputDialog(MainFrame.this,
- "Select a database", "GATE", JOptionPane.QUESTION_MESSAGE,
- null, paths, paths[0]);
- if(answer != null)
- storageURL = (String)answer;
- else return;
- }
- DataStore ds = null;
- AccessController ac = null;
- try {
- // 1. login the user
- // ac = new AccessControllerImpl(storageURL);
- ac = Factory.createAccessController(storageURL);
- Assert.assertNotNull(ac);
- ac.open();
-
- Session mySession;
- User usr;
- Group grp;
- try {
- String userName = "";
- String userPass = "";
- String group = "";
-
- JPanel listPanel = new JPanel();
- listPanel.setLayout(new BoxLayout(listPanel, BoxLayout.X_AXIS));
-
- JPanel panel1 = new JPanel();
- panel1.setLayout(new BoxLayout(panel1, BoxLayout.Y_AXIS));
- panel1.add(new JLabel("User name: "));
- panel1.add(new JLabel("Password: "));
- panel1.add(new JLabel("Group: "));
-
- JPanel panel2 = new JPanel();
- panel2.setLayout(new BoxLayout(panel2, BoxLayout.Y_AXIS));
- JTextField usrField = new JTextField(30);
- panel2.add(usrField);
- JPasswordField pwdField = new JPasswordField(30);
- panel2.add(pwdField);
- JComboBox grpField = new JComboBox(ac.listGroups().toArray());
- grpField.setSelectedIndex(0);
- panel2.add(grpField);
-
- listPanel.add(panel1);
- listPanel.add(Box.createHorizontalStrut(20));
- listPanel.add(panel2);
-
- if(OkCancelDialog.showDialog(MainFrame.this.getContentPane(),
- listPanel, "Please enter login details")) {
-
- userName = usrField.getText();
- userPass = new String(pwdField.getPassword());
- group = (String)grpField.getSelectedItem();
-
- if(userName.equals("") || userPass.equals("")
- || group.equals("")) {
- JOptionPane
- .showMessageDialog(
- MainFrame.this,
- "You must provide non-empty user name, password and group!",
- "Login error", JOptionPane.ERROR_MESSAGE);
- return;
- }
- }
- else if(OkCancelDialog.userHasPressedCancel) { return; }
-
- grp = ac.findGroup(group);
- usr = ac.findUser(userName);
- mySession = ac.login(userName, userPass, grp.getID());
-
- // save here the user name, pass and group in
- // local gate.xml
-
- }
- catch(gate.security.SecurityException ex) {
- JOptionPane.showMessageDialog(MainFrame.this, ex.getMessage(),
- "Login error", JOptionPane.ERROR_MESSAGE);
- ac.close();
- return;
- }
-
- if(!ac.isValidSession(mySession)) {
- JOptionPane.showMessageDialog(MainFrame.this,
- "Incorrect session obtained. "
- + "Probably there is a problem with the database!",
- "Login error", JOptionPane.ERROR_MESSAGE);
- ac.close();
- return;
- }
-
- // 2. open the oracle datastore
- ds = Factory.openDataStore(className, storageURL);
- // set the session, so all get/adopt/etc work
- ds.setSession(mySession);
-
- // 3. add the security data for this datastore
- // this saves the user and group information, so it
- // can
- // be used later when resources are created with
- // certain rights
- FeatureMap securityData = Factory.newFeatureMap();
- securityData.put("user", usr);
- securityData.put("group", grp);
- DataStoreRegister.addSecurityData(ds, securityData);
- }
- catch(PersistenceException pe) {
- JOptionPane.showMessageDialog(MainFrame.this,
- "Datastore open error!\n " + pe.toString(), "GATE",
- JOptionPane.ERROR_MESSAGE);
- }
- catch(gate.security.SecurityException se) {
- JOptionPane.showMessageDialog(MainFrame.this,
- "User identification error!\n " + se.toString(), "GATE",
- JOptionPane.ERROR_MESSAGE);
- try {
- if(ac != null) ac.close();
- if(ds != null) ds.close();
- }
- catch(gate.persist.PersistenceException ex) {
- JOptionPane.showMessageDialog(MainFrame.this,
- "Persistence error!\n " + ex.toString(), "GATE",
- JOptionPane.ERROR_MESSAGE);
- }
- }
-
- }
else {
JOptionPane.showMessageDialog(MainFrame.this,
"Support for this type of datastores is not implemenented!\n",
Deleted: gate/trunk/src/gate/gui/UserGroupEditor.java
===================================================================
--- gate/trunk/src/gate/gui/UserGroupEditor.java 2011-12-22 17:56:56 UTC (rev 14847)
+++ gate/trunk/src/gate/gui/UserGroupEditor.java 2011-12-22 18:22:53 UTC (rev 14848)
@@ -1,1034 +0,0 @@
-/* UserGroupEditor.java
- *
- * Copyright (c) 1995-2010, 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, 03/October/2001
- *
- * $Id$
- *
- */
-
-
-package gate.gui;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import javax.swing.*;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
-import junit.framework.Assert;
-
-import gate.*;
-import gate.security.*;
-import gate.util.GateRuntimeException;
-import gate.util.Out;
-
-
-public class UserGroupEditor extends JComponent {
- protected JPanel jPanel1 = new JPanel();
- protected JPanel jPanel2 = new JPanel();
- protected JList firstList = new JList();
- protected JList secondList = new JList();
- protected CardLayout cardLayout1 = new CardLayout();
- protected JRadioButton displayUsersFirst = new JRadioButton();
- protected JRadioButton displayGroupsFirst = new JRadioButton();
-
- protected Session session;
- protected AccessController controller;
-
- protected boolean usersFirst = true;
- protected JButton exitButton = new JButton();
- protected JPopupMenu userMenu = new JPopupMenu();
- protected JPopupMenu groupMenu = new JPopupMenu();
-
- public UserGroupEditor(AccessController ac, Session theSession) {
- try {
- jbInit();
- }
- catch(Exception e) {
- e.printStackTrace();
- }
-
- this.session = theSession;
- this.controller = ac;
-
- showUsersFirst();
-
- }
-
- public static void main(String[] args) throws Exception {
- Gate.init();
-
- JFrame frame = new JFrame();
-
- java.util.List dbPaths = new ArrayList();
- DataStoreRegister reg = Gate.getDataStoreRegister();
- Iterator keyIter = DataStoreRegister.getConfigData().keySet().iterator();
- while (keyIter.hasNext()) {
- String keyName = (String) keyIter.next();
- if (keyName.startsWith("url"))
- dbPaths.add(DataStoreRegister.getConfigData().get(keyName));
- }
- if (dbPaths.isEmpty())
- throw new
- GateRuntimeException("Oracle URL not configured in gate.xml");
- //by default make it the first
- String storageURL = (String)dbPaths.get(0);
- if (dbPaths.size() > 1) {
- Object[] paths = dbPaths.toArray();
- Object answer = JOptionPane.showInputDialog(
- frame,
- "Select a database",
- "GATE", JOptionPane.QUESTION_MESSAGE,
- null, paths,
- paths[0]);
- if (answer != null)
- storageURL = (String) answer;
- else
- return;
- }
-
-// AccessController ac = new AccessControllerImpl(urlString);
- AccessController ac = Factory.createAccessController(storageURL);
- Assert.assertNotNull(ac);
- ac.open();
-
- Session mySession = null;
-
- try {
- mySession = login(ac, frame.getContentPane());
- } catch (gate.security.SecurityException ex) {
- JOptionPane.showMessageDialog(
- frame,
- "To use this tool you must login as a user "
- + "with administrative rights!",
- "Login error",
- JOptionPane.ERROR_MESSAGE
- );
- ac.close();
- System.exit(-1);
- }
-
- if (! ac.isValidSession(mySession)){
- JOptionPane.showMessageDialog(
- frame,
- "Incorrect session obtained. "
- + "Probably there is a problem with the database!",
- "Login error",
- JOptionPane.ERROR_MESSAGE
- );
- ac.close();
- System.exit(-1);
- }
-
- if (!mySession.isPrivilegedSession()) {
- JOptionPane.showMessageDialog(
- frame,
- "Insufficient priviliges to edit/view groups and users!",
- "Login error",
- JOptionPane.ERROR_MESSAGE
- );
- ac.close();
- System.exit(-1);
- }
-
- //INITIALISE THE FRAME, ETC.
- frame.setEnabled(true);
- frame.setTitle("GATE User/Group Administration Tool");
- frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-
-
- UserGroupEditor userGroupEditor1 = new UserGroupEditor(ac, mySession);
-
- //Put the bean in a scroll pane.
- frame.getContentPane().add(userGroupEditor1, BorderLayout.CENTER);
-
- //DISPLAY FRAME
- frame.pack();
- frame.setSize(800, 600);
- frame.setVisible(true);
-
- }
-
- public static Session login(AccessController ac, Component parent)
- throws gate.persist.PersistenceException,
- gate.security.SecurityException {
- String userName = "";
- String userPass = "";
- String group = "";
-
- JPanel listPanel = new JPanel();
- listPanel.setLayout(new BoxLayout(listPanel,BoxLayout.X_AXIS));
-
- JPanel panel1 = new JPanel();
- panel1.setLayout(new BoxLayout(panel1,BoxLayout.Y_AXIS));
- panel1.add(new JLabel("User name: "));
- panel1.add(new JLabel("Password: "));
- panel1.add(new JLabel("Group: "));
-
- JPanel panel2 = new JPanel();
- panel2.setLayout(new BoxLayout(panel2,BoxLayout.Y_AXIS));
- JTextField usrField = new JTextField(30);
- panel2.add(usrField);
- JPasswordField pwdField = new JPasswordField(30);
- panel2.add(pwdField);
- JTextField grpField = new JTextField(30);
- panel2.add(grpField);
-
- listPanel.add(panel1);
- listPanel.add(Box.createHorizontalStrut(20));
- listPanel.add(panel2);
-
- if(OkCancelDialog.showDialog( parent,
- listPanel,
- "Please enter login details")){
- userName = usrField.getText();
- userPass = new String(pwdField.getPassword());
- group = grpField.getText();
- if (userName.equals("") || userPass.equals("") || group.equals("")) {
- JOptionPane.showMessageDialog(
- parent,
- "You must provide non-empty user name, password and group!",
- "Login error",
- JOptionPane.ERROR_MESSAGE
- );
- System.exit(-1);
- }
- }
-
- return ac.login(userName, userPass, ac.findGroup(group).getID());
- }
-
-
- private void jbInit() throws Exception {
- this.setLayout(new BoxLayout(this,BoxLayout.Y_AXIS));
-// jPanel2.setLayout(new BorderLayout(40, 40));
- jPanel2.setLayout(new BoxLayout(jPanel2,BoxLayout.X_AXIS));
-
-
-// jPanel1.setSize(800, 100);
-// jPanel2.setSize(800, 500);
-
- displayUsersFirst.setText("Show all users");
- displayUsersFirst.setToolTipText("");
- displayUsersFirst.setActionCommand("usersFirst");
- displayUsersFirst.setSelected(true);
- displayUsersFirst.addItemListener(new java.awt.event.ItemListener() {
- public void itemStateChanged(ItemEvent e) {
- displayUsersFirst_itemStateChanged(e);
- }
- });
- displayGroupsFirst.setText("Show all groups");
- displayGroupsFirst.setActionCommand("groupsFirst");
-
- this.add(jPanel1, null);
- ButtonGroup group = new ButtonGroup();
- group.add(displayUsersFirst);
- group.add(displayGroupsFirst);
- this.add(jPanel1);
- jPanel1.add(displayUsersFirst);
- jPanel1.add(Box.createHorizontalStrut(50));
- jPanel1.add(displayGroupsFirst);
-
- this.add(jPanel2, null);
- jPanel2.add(new JScrollPane(firstList), BorderLayout.WEST);
- jPanel2.add(Box.createHorizontalStrut(50));
- jPanel2.add(new JScrollPane(secondList), BorderLayout.EAST);
- firstList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- firstList.setModel(new DefaultListModel());
- firstList.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent e) {
- listRightMouseClick(e);
- }//mouse clicked
- });
- firstList.getSelectionModel().addListSelectionListener(
- new ListSelectionListener() {
- public void valueChanged(ListSelectionEvent e) {
- firstListItemSelected(e);
- }//
- }//the selection listener
- );
- secondList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- secondList.setModel(new DefaultListModel());
- secondList.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent e) {
- listRightMouseClick(e);
- }//mouse clicked
- });
-
- this.add(Box.createVerticalGlue());
-
- this.add(exitButton);
- exitButton.setText("Exit");
- exitButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- try {
- controller.close();
- } catch (gate.persist.PersistenceException ex) {
- Out.prln(ex.getMessage());
- }
- System.exit(0);
- } //actionPerformed
- });
- this.add(Box.createVerticalStrut(50));
-
- }
-
- private void showUsersFirst() {
- DefaultListModel firstListData = (DefaultListModel) firstList.getModel();
- DefaultListModel secondListData = (DefaultListModel) secondList.getModel();
- firstListData.clear();
- secondListData.clear();
-
- readUsers(firstListData, firstList);
- }
-
- private void readUsers(DefaultListModel listModel, JList list) {
- //get the names of all users
- try {
- java.util.List users = controller.listUsers();
- for (int i = 0; i < users.size(); i++)
- listModel.addElement(users.get(i));
- list.setModel(listModel);
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException("Cannot read users!");
- }
-
- }//readUsers
-
- private void showGroupsFirst() {
- DefaultListModel firstListData = (DefaultListModel) firstList.getModel();
- DefaultListModel secondListData = (DefaultListModel) secondList.getModel();
- firstListData.clear();
- secondListData.clear();
-
- readGroups(firstListData, firstList);
- }
-
- private void readGroups(DefaultListModel listModel, JList list) {
- //get the names of all groups
- try {
- java.util.List groups = controller.listGroups();
- for (int i = 0; i < groups.size(); i++)
- listModel.addElement(groups.get(i));
- list.setModel(listModel);
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException("Cannot read groups!");
- }
-
- }//readGroups
-
- void displayUsersFirst_itemStateChanged(ItemEvent e) {
- if (e.getStateChange() == ItemEvent.DESELECTED) {
- if (!usersFirst)
- return;
- displayGroupsFirst.setSelected(true);
- if (usersFirst) //if it used to be users first, we need to change
- showGroupsFirst();
- usersFirst = false;
- } else {
- if (usersFirst)
- return;
- displayGroupsFirst.setSelected(false);
- if (! usersFirst)
- showUsersFirst();
- usersFirst = true;
- }
- } //display users first (de-)selected
-
- void listRightMouseClick(MouseEvent e) {
- //if it's not a right click, then return
- //coz we're not interested
- if (! SwingUtilities.isRightMouseButton(e))
- return;
-
- JList theList = (JList) e.getSource();
- //check if we have a selection and if not, try to force it
- if (theList.getSelectedIndex() == -1) {
- int index = theList.locationToIndex(e.getPoint());
- if (index == -1)
- return;
- else
- theList.setSelectedIndex(index);
- } else
- //if the right click is outside the currently selected item return
- if ( theList.locationToIndex(e.getPoint())
- != theList.getSelectedIndex())
- return;
-
-
- if (theList.equals(firstList)) {
- if (usersFirst)
- showUsersMenu(theList,
- (int) e.getPoint().getX(),
- (int) e.getPoint().getY());
- else
- showGroupsMenu(theList,
- (int) e.getPoint().getX(),
- (int) e.getPoint().getY());
-
- } else {
- if (usersFirst)
- showGroupsMenu(theList,
- (int) e.getPoint().getX(),
- (int) e.getPoint().getY());
- else
- showUsersMenu(theList,
- (int) e.getPoint().getX(),
- (int) e.getPoint().getY());
-
- }
-
- }
-
- private void showUsersMenu(JList source, int x, int y) {
- //create the menu items first
- userMenu.removeAll();
- userMenu.add(new CreateUserAction(source));
- userMenu.add(new DeleteUserAction(source));
- userMenu.addSeparator();
- userMenu.add(new Add2GroupAction(source));
- userMenu.add(new RemoveFromGroupAction(source));
- userMenu.addSeparator();
- userMenu.add(new ChangePasswordAction(source));
- userMenu.add(new RenameUserAction(source));
-
- userMenu.show(source, x, y);
-
- }//create and show the menu for user manipulation
-
- private void showGroupsMenu(JList source, int x, int y) {
- //create the menu items first
- groupMenu.removeAll();
- groupMenu.add(new AddGroupAction(source));
- groupMenu.add(new DeleteGroupAction(source));
- groupMenu.addSeparator();
- groupMenu.add(new AddUserAction(source));
- groupMenu.add(new RemoveUserAction(source));
- groupMenu.addSeparator();
- groupMenu.add(new RenameGroupAction(source));
-
- groupMenu.show(source, x, y);
-
- }
-
- //called when the selection changes in the first list
- void firstListItemSelected(ListSelectionEvent e) {
- int i = firstList.getSelectedIndex();
- String name = (String) firstList.getModel().getElementAt(i);
-
- if (usersFirst)
- showGroupsForUser(name);
- else
- showUsersForGroup(name);
- } //firstListItemSelected
-
- protected void showGroupsForUser(String name) {
- User user = null;
- try {
- user = controller.findUser(name);
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException(
- "Cannot locate the user with name: " + name
- );
- } catch (gate.security.SecurityException ex1) {
- throw new gate.util.GateRuntimeException(
- ex1.getMessage()
- );
- }
- if (user == null)
- return;
- java.util.List myGroups = user.getGroups();
- if (myGroups == null)
- return;
-
- DefaultListModel secondListData = new DefaultListModel();
-
- for (int j = 0; j< myGroups.size(); j++) {
- try {
- Group myGroup = //controller.findGroup((Long) myGroups.get(j));
- (Group)myGroups.get(j);
- secondListData.addElement(myGroup.getName());
- } catch (Exception ex) {
- throw new gate.util.GateRuntimeException(
- ex.getMessage()
- );
- }//catch
- }//for loop
- secondList.setModel(secondListData);
-
- }//showGroupsForUser
-
-
- protected void showUsersForGroup(String name) {
- Group group = null;
- try {
- group = controller.findGroup(name);
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException(
- "Cannot locate the group with name: " + name
- );
- } catch (gate.security.SecurityException ex1) {
- throw new gate.util.GateRuntimeException(
- ex1.getMessage()
- );
- }
- if (group == null)
- return;
- java.util.List myUsers = group.getUsers();
- if (myUsers == null)
- return;
-
- DefaultListModel secondListData = new DefaultListModel();
-
- for (int j = 0; j< myUsers.size(); j++) {
- try {
- User myUser = //controller.findUser((Long) myUsers.get(j));
- (User)myUsers.get(j);
- secondListData.addElement(myUser.getName());
- } catch (Exception ex) {
- throw new gate.util.GateRuntimeException(
- ex.getMessage()
- );
- }//catch
- }//for loop
- secondList.setModel(secondListData);
-
- }//showGroupsForUser
-
-
- protected class CreateUserAction extends AbstractAction{
- private JList source;
-
- public CreateUserAction(JList source){
- super("Create new user");
- this.source = source;
- }
-
- public void actionPerformed(ActionEvent e){
- String userName= "", userPass = "";
-
- UserPasswordDialog pwdDlg = new UserPasswordDialog();
- boolean isOK = pwdDlg.showPasswordDialog(
- "Please enter user name and password",
- UserGroupEditor.this
- );
-
- if (! isOK)
- return;
-
- try {
- controller.createUser(pwdDlg.getUserName(),
- pwdDlg.getPassword(),
- session);
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException(ex.getMessage());
- } catch (gate.security.SecurityException ex1) {
- throw new gate.util.GateRuntimeException(ex1.getMessage());
- }
- DefaultListModel model = (DefaultListModel) source.getModel();
- model.clear();
- readUsers(model, source);
- }//public void actionPerformed(ActionEvent e)
- } //CreateUserAction
-
- protected class DeleteUserAction extends AbstractAction{
- private JList source;
-
- public DeleteUserAction(JList source){
- super("Delete user");
- this.source = source;
- }
-
- public void actionPerformed(ActionEvent e){
- //first get the index of the selection
- int index = source.getSelectedIndex();
- if (index == -1) //return if no selection
- return;
- DefaultListModel model = (DefaultListModel) source.getModel();
- try {
- User user = controller.findUser((String) model.get(index) );
- controller.deleteUser(user, session);
- model.remove(index);
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException(ex.getMessage());
- } catch (gate.security.SecurityException ex1) {
- throw new gate.util.GateRuntimeException(ex1.getMessage());
- }
- }//public void actionPerformed(ActionEvent e)
- } //DeleteUserAction
-
- protected class Add2GroupAction extends AbstractAction{
- private JList source;
-
- public Add2GroupAction(JList source){
- super("Add to group");
- this.source = source;
- }
-
- public void actionPerformed(ActionEvent e){
- int index = source.getSelectedIndex();
- if (index == -1) //return if no selection
- return;
- DefaultListModel model = (DefaultListModel) source.getModel();
-
- JList groupList = new JList();
- groupList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-
- DefaultListModel grListModel = new DefaultListModel();
- readGroups( grListModel, groupList);
- if(OkCancelDialog.showDialog( UserGroupEditor.this,
- new JScrollPane(groupList),
- "Choose a new group")){
- String groupName = (String) groupList.getSelectedValue();
-
- try {
- User user = controller.findUser((String) model.get(index) );
- Group group = controller.findGroup(groupName);
- group.addUser(user, session);
-
- //finally update the original lists
- if (usersFirst)
- showGroupsForUser(user.getName());
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException(ex.getMessage());
- } catch (gate.security.SecurityException ex1) {
- JOptionPane.showMessageDialog(UserGroupEditor.this,
- ex1.getMessage(),
- "Error adding user to group!",
- JOptionPane.ERROR_MESSAGE
- );
-
- }
-
- } //ok selected
-
-
- }//public void actionPerformed(ActionEvent e)
- } //Add2GroupAction
-
- protected class RemoveFromGroupAction extends AbstractAction{
- private JList source;
-
- public RemoveFromGroupAction(JList source){
- super("Remove from group");
- this.source = source;
- }//
-
- public void actionPerformed(ActionEvent e){
- int index = source.getSelectedIndex();
- if (index == -1) //return if no selection
- return;
- DefaultListModel model = (DefaultListModel) source.getModel();
-
- JList groupList = new JList();
- groupList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-
- DefaultListModel grListModel = new DefaultListModel();
- readGroups( grListModel, groupList);
- if(OkCancelDialog.showDialog(
- UserGroupEditor.this,
- new JScrollPane(groupList),
- "Choose the group from which to remove the user")
- ){
-
- String groupName = (String) groupList.getSelectedValue();
-
- try {
- User user = controller.findUser((String) model.get(index) );
- Group group = controller.findGroup(groupName);
- group.removeUser(user, session);
-
- //finally update the original lists
- if (usersFirst)
- showGroupsForUser(user.getName());
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException(ex.getMessage());
- } catch (gate.security.SecurityException ex1) {
- JOptionPane.showMessageDialog(UserGroupEditor.this,
- ex1.getMessage(),
- "Error removing user from group!",
- JOptionPane.ERROR_MESSAGE
- );
-
- }
-
- } //ok selected
-
- }//public void actionPerformed(ActionEvent e)
- } //RemoveFromGroupAction
-
-
- protected class ChangePasswordAction extends AbstractAction{
- private JList source;
-
- public ChangePasswordAction(JList source){
- super("Change password");
- this.source = source;
- }//
-
- public void actionPerformed(ActionEvent e){
- int index = source.getSelectedIndex();
- if (index == -1) //return if no selection
- return;
- DefaultListModel model = (DefaultListModel) source.getModel();
-
- JPanel listPanel = new JPanel();
- listPanel.setLayout(new BoxLayout(listPanel,BoxLayout.X_AXIS));
-
- JPanel panel1 = new JPanel();
- panel1.setLayout(new BoxLayout(panel1,BoxLayout.Y_AXIS));
- panel1.add(new JLabel("Please enter new password: "));
- panel1.add(new JLabel("Please re-enter new password: "));
-
-
- JPanel panel2 = new JPanel();
- panel2.setLayout(new BoxLayout(panel2,BoxLayout.Y_AXIS));
- JPasswordField pwd1 = new JPasswordField(30);
- panel2.add(pwd1);
- JPasswordField pwd2 = new JPasswordField(30);
- panel2.add(pwd2);
-
- listPanel.add(panel1);
- listPanel.add(Box.createHorizontalStrut(20));
- listPanel.add(panel2);
-
- if(OkCancelDialog.showDialog( UserGroupEditor.this,
- listPanel,
- "Choose a new password")){
- String pass1 = new String(pwd1.getPassword());
- String pass2 = new String(pwd2.getPassword());
- if (!pass1.equals(pass2)) {
- JOptionPane.showMessageDialog(
- UserGroupEditor.this,
- "Cannot change password because you entered "
- + "two different values for new password",
- "Error changing user password!",
- JOptionPane.ERROR_MESSAGE
- );
-
- return;
- }
-
-
- try {
- User user = controller.findUser((String) model.get(index) );
- user.setPassword(pass1, session);
-
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException(ex.getMessage());
- } catch (gate.security.SecurityException ex1) {
- JOptionPane.showMessageDialog(UserGroupEditor.this,
- ex1.getMessage(),
- "Error adding user to group!",
- JOptionPane.ERROR_MESSAGE
- );
-
- }
-
- } //ok selected
-
- }//public void actionPerformed(ActionEvent e)
- } //ChangePasswordAction
-
-
- protected class RenameUserAction extends AbstractAction{
- private JList source;
-
- public RenameUserAction(JList source){
- super("Rename user");
- this.source = source;
- }//
-
- public void actionPerformed(ActionEvent e){
- int index = source.getSelectedIndex();
- if (index == -1) //return if no selection
- return;
-
- String newName = JOptionPane.showInputDialog(
- UserGroupEditor.this,
- "Please enter the user's new name");
-
- //don't change if nothing selected
- if (newName == null || newName.equals(""))
- return;
-
- DefaultListModel model = (DefaultListModel) source.getModel();
-
- try {
- User user = controller.findUser((String) model.get(index) );
- user.setName(newName, session);
- model.setElementAt(newName, index);
-
- //finally update the original lists
- source.setSelectedIndex(index);
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException(ex.getMessage());
- } catch (gate.security.SecurityException ex1) {
- JOptionPane.showMessageDialog(UserGroupEditor.this,
- ex1.getMessage(),
- "Error renaming user!",
- JOptionPane.ERROR_MESSAGE
- );
-
- }
-
- }//public void actionPerformed(ActionEvent e)
- } //RenameUserAction
-
-
- protected class AddGroupAction extends AbstractAction{
- private JList source;
-
- public AddGroupAction(JList source){
- super("Create new group");
- this.source = source;
- }//
-
- public void actionPerformed(ActionEvent e){
- int index = source.getSelectedIndex();
- if (index == -1) //return if no selection
- return;
-
- String groupName = JOptionPane.showInputDialog(
- UserGroupEditor.this,
- "Please enter the name of the new group");
-
- //don't change if nothing selected
- if (groupName == null || groupName.equals(""))
- return;
-
- try {
- controller.createGroup(groupName, session);
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException(ex.getMessage());
- } catch (gate.security.SecurityException ex1) {
- throw new gate.util.GateRuntimeException(ex1.getMessage());
- }
- //only update if we're showing the groups first. Otherwise the groups for
- //this user remain the same
- if (!usersFirst) {
- DefaultListModel model = (DefaultListModel) source.getModel();
- model.clear();
- readGroups(model, source);
- }
-
- }//public void actionPerformed(ActionEvent e)
- } //AddGroupAction
-
-
- protected class DeleteGroupAction extends AbstractAction{
- private JList source;
-
- public DeleteGroupAction(JList source){
- super("Delete group");
- this.source = source;
- }//
-
- public void actionPerformed(ActionEvent e){
- //first get the index of the selection
- int index = source.getSelectedIndex();
- if (index == -1) //return if no selection
- return;
- DefaultListModel model = (DefaultListModel) source.getModel();
- try {
- Group group = controller.findGroup((String) model.get(index) );
- controller.deleteGroup(group, session);
- model.remove(index);
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException(ex.getMessage());
- } catch (gate.security.SecurityException ex1) {
- throw new gate.util.GateRuntimeException(ex1.getMessage());
- }
- }//public void actionPerformed(ActionEvent e)
- } //DeleteGroupAction
-
-
- protected class AddUserAction extends AbstractAction{
- private JList source;
-
- public AddUserAction(JList source){
- super("Add user");
- this.source = source;
- }//
-
- public void actionPerformed(ActionEvent e){
- int index = source.getSelectedIndex();
- if (index == -1) //return if no selection
- return;
- DefaultListModel model = (DefaultListModel) source.getModel();
-
- JList userList = new JList();
- userList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-
- DefaultListModel usrListModel = new DefaultListModel();
- readUsers( usrListModel, userList);
- if(OkCancelDialog.showDialog( UserGroupEditor.this,
- new JScrollPane(userList),
- "Choose a user to add")){
- String userName = (String) userList.getSelectedValue();
-
- try {
- Group group = controller.findGroup((String) model.get(index) );
- User user = controller.findUser(userName);
- group.addUser(user, session);
-
- //finally update the original lists
- if (!usersFirst)
- showUsersForGroup(group.getName());
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException(ex.getMessage());
- } catch (gate.security.SecurityException ex1) {
- JOptionPane.showMessageDialog(UserGroupEditor.this,
- ex1.getMessage(),
- "Error adding user to group!",
- JOptionPane.ERROR_MESSAGE
- );
-
- }
-
- } //ok selected
-
- }//public void actionPerformed(ActionEvent e)
- } //AddUserAction
-
-
- protected class RemoveUserAction extends AbstractAction{
- private JList source;
-
- public RemoveUserAction(JList source){
- super("Remove user");
- this.source = source;
- }//
-
- public void actionPerformed(ActionEvent e){
- int index = source.getSelectedIndex();
- if (index == -1) //return if no selection
- return;
- DefaultListModel model = (DefaultListModel) source.getModel();
- String groupName = (String) source.getSelectedValue();
-
- JList userList = new JList();
- userList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-
- DefaultListModel usrListModel = new DefaultListModel();
-
- Group group = null;
- try {
- group = controller.findGroup(groupName);
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException(
- "Cannot locate group: " + groupName
- );
- } catch (gate.security.SecurityException ex1) {
- throw new gate.util.GateRuntimeException(
- ex1.getMessage()
- );
- }
- if (group == null)
- return;
- java.util.List myUsers = group.getUsers();
- if (myUsers == null)
- return;
-
- for (int j = 0; j< myUsers.size(); j++) {
- try {
- User myUser = (User)myUsers.get(j);
- usrListModel.addElement(myUser.getName());
- } catch (Exception ex) {
- throw new gate.util.GateRuntimeException(
- ex.getMessage()
- );
- }//catch
- }//for loop
- userList.setModel(usrListModel);
-
- if(OkCancelDialog.showDialog(
- UserGroupEditor.this,
- new JScrollPane(userList),
- "Choose the user you want removed from this group")
- ){
-
-
- try {
- User user = controller.findUser((String) userList.getSelectedValue());
- group.removeUser(user, session);
-
- //finally update the original lists
- if (!usersFirst)
- showUsersForGroup(group.getName());
- else
- showGroupsForUser(user.getName());
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException(ex.getMessage());
- } catch (gate.security.SecurityException ex1) {
- JOptionPane.showMessageDialog(UserGroupEditor.this,
- ex1.getMessage(),
- "Error removing user from group!",
- JOptionPane.ERROR_MESSAGE
- );
-
- }
-
- } //ok selected
-
- }//public void actionPerformed(ActionEvent e)
- } //RemoveUserAction
-
-
- protected class RenameGroupAction extends AbstractAction{
- private JList source;
-
- public RenameGroupAction(JList source){
- super("Rename group");
- this.source = source;
- }//
-
- public void actionPerformed(ActionEvent e){
- int index = source.getSelectedIndex();
- if (index == -1) //return if no selection
- return;
- DefaultListModel model = (DefaultListModel) source.getModel();
-
- String newName = JOptionPane.showInputDialog(
- UserGroupEditor.this,
- "Please enter the user's new name");
-
- //don't change if nothing selected
- if (newName == null || newName.equals(""))
- return;
-
- try {
- Group group = controller.findGroup((String) model.get(index) );
- group.setName(newName, session);
-
- //finally update the original lists
- if (!usersFirst)
- showGroupsFirst();
- else
- showGroupsForUser((String) firstList.getSelectedValue());
- } catch (gate.persist.PersistenceException ex) {
- throw new gate.util.GateRuntimeException(ex.getMessage());
- } catch (gate.security.SecurityException ex1) {
- JOptionPane.showMessageDialog(UserGroupEditor.this,
- ex1.getMessage(),
- "Error renaming user!",
- JOptionPane.ERROR_MESSAGE
- );
-
- }
- }//public void actionPerformed(ActionEvent e)
- } //RenameGroupAction
-
-} //UserGroupEditor
-
Deleted: gate/trunk/src/gate/gui/UserPasswordDialog.java
===================================================================
--- gate/trunk/src/gate/gui/UserPasswordDialog.java 2011-12-22 17:56:56 UTC (rev 14847)
+++ gate/trunk/src/gate/gui/UserPasswordDialog.java 2011-12-22 18:22:53 UTC (rev 14848)
@@ -1,72 +0,0 @@
-/* UserPasswordDialog.java
- *
- * Copyright (c) 1995-2010, 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, 03/October/2001
- *
- * $Id$
- *
- */
-
-package gate.gui;
-
-import java.awt.Component;
-
-import javax.swing.*;
-
-
-public class UserPasswordDialog {
-
- String userName = "";
- String userPass = "";
-
- public UserPasswordDialog() {
- }
-
- public boolean showPasswordDialog(String message, Component parent) {
-
- JPanel listPanel = new JPanel();
- listPanel.setLayout(new BoxLayout(listPanel,BoxLayout.X_AXIS));
-
- JPanel panel1 = new JPanel();
- panel1.setLayout(new BoxLayout(panel1,BoxLayout.Y_AXIS));
- panel1.add(new JLabel("User name: "));
- panel1.add(new JLabel("Password: "));
-
- JPanel panel2 = new JPanel();
- panel2.setLayout(new BoxLayout(panel2,BoxLayout.Y_AXIS));
- JTextField usrField = new JTextField(30);
- panel2.add(usrField);
- JPasswordField pwdField = new JPasswordField(30);
- panel2.add(pwdField);
-
- listPanel.add(panel1);
- listPanel.add(Box.createHorizontalStrut(30));
- listPanel.add(panel2);
-
- if(OkCancelDialog.showDialog( parent,
- listPanel,
- message)){
- userName = usrField.getText();
- userPass = new String(pwdField.getPassword());
- return true;
- }
-
- return false;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public String getPassword() {
- return userPass;
- }
-
-}
\ No newline at end of file
Deleted: gate/trunk/src/gate/persist/ConnectionPool.java
===================================================================
--- gate/trunk/src/gate/persist/ConnectionPool.java 2011-12-22 17:56:56 UTC (rev 14847)
+++ gate/trunk/src/gate/persist/ConnectionPool.java 2011-12-22 18:22:53 UTC (rev 14848)
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 1995-2010, 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).
- *
- * Atanas Kiryakov, 01/02/2002
- *
- * $Id$
- */
-package gate.persist;
-
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Vector;
-
-/**
- A generic implementation of pool of references to objects of any kind.
- It is thread-safe, so, allows multiple users to get and release objects
- "simultaneously". In fact, the standard Java synchronization is used.
- <BR><BR>
- The base idea is that, a calling routine will try to get
- an object from the pool with method Get. On success, it will use the
- object and return it in the pool with the method Put.
- <BR><BR>
- If there ares no available objects in the pool, Get will return <B>null</B>.
- Then the calling routine should create a new object. Further, scenario goes
- in the same way - when finished using the object, calling routine shoud Put
- it in the pool for future use, instead of leaving it to be garbage-collected.
- <BR><BR>
- The pool initially is empty. The only way to increase the number of objects
- managed by the pool, is some external process to Put an object, that was
- created, instead of previously Get from the pool.
- <BR><BR>
- Pool stores only references to currently "free" or available objects. When
- some external routine Gets an object from the pool, its reference is not
- locked, it is simply removed from the pool.
- */
-public class ConnectionPool {
- private Vector connections;
- private int size;
- private String url;
- private int connCount;
-
-/**
- Constructs and object pool with specified size.
- @param size determines the maximum size of the pool. This is the number
- free objects that it can manage at the same time
- */
- public ConnectionPool(int size, String url) {
- this.size = size;
- connections = new Vector(this.size);
- this.url = url;
- this.connCount = 0;
- } // ConnectionPool
-
-/**
- Pulls out an object from the pool. The reference to the object is removed
- from the pool and their is no longer any kind of relation between this
- object and the pool. It can be returned back (released) by Put method.
- @return an object from the pool, if available.<BR>
- Otherwise, returns <B>null</B>
- */
- public synchronized Connection get()
- throws SQLException,ClassNotFoundException{
- int currAvailable = connections.size();
- if (currAvailable > 0){
- Connection conn = (Connection) connections.elementAt(currAvailable-1);
- connections.removeElementAt(currAvailable-1);
- return conn;
- }
- else {
- if (connCount < size) {
- Connection newCon = DBHelper.connect(url);
- connCount++;
- return newCon;
- }
- else {
- try {
- wait();
- }
- catch (java.lang.InterruptedException ie) {
- throw new SQLException(" Thread interrupted while waiting "
- +"to get Connection from ConnectionPool !");
- }
- return get();
- }
- }
- } // Get
-
-/**
- Puts an object in the pool, those stating that it's "free" or available
- for use by another processes and routines. An object can be put in the pool,
- without need to be get from there before.
- @return <B>true</B> on success<BR>
- <B>false</B> when the object was not put in the pool,
- because the maximal number of references in the pool was riched
- */
- public synchronized boolean put(Connection conn){
- connections.addElement(conn);
- notify();
- return true;
- } // Put
-
- public void finalize() {
- for (int i = 0; i<connections.size(); i++){
- try {
- DBHelper.disconnect((Connection) connections.elementAt(i));
- }
- catch (Exception e){
- e.printStackTrace();
- }
- }
- }
-}
\ No newline at end of file
Deleted: gate/trunk/src/gate/persist/DBHelper.java
===================================================================
--- gate/trunk/src/gate/persist/DBHelper.java 2011-12-22 17:56:56 UTC (rev 14847)
+++ gate/trunk/src/gate/persist/DBHelper.java 2011-12-22 18:22:53 UTC (rev 14848)
@@ -1,401 +0,0 @@
-/*
- * DBHelper.java
- *
- * Copyright (c) 1995-2010, 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).
- *
- * Marin Dimitrov, 18/Sep/2001
- *
- * $Id$
- */
-
-package gate.persist;
-
-import java.sql.*;
-import java.util.HashMap;
-
-import gate.Gate;
-
-public class DBHelper {
-
- /** class name of the Oracle jdbc driver */
- private static final String jdbcOracleDriverName
- = "oracle.jdbc.driver.OracleDriver";
- private static final String jdbcPostgresDriverName
- = "org.postgresql.Driver";
-
- public static final int CHINK_SIZE_SMALL = 30;
- public static final int CHINK_SIZE_MEDIUM = 60;
- public static final int CHINK_SIZE_LARGE = 100;
-
- //WARNING!
- //DO NOT EDIT THESE CONSTANTS WITHOUT
- //SYNCHRONIZING WITH ERROR.SPC PL/SQL PACKAGE
- //note that while Oracle returns negative error numbers
- //the SQLException::getErrorCode() returns positive ones
- //
-
- /** user defined error codes in Oracle start with -21000 */
- public static final int X_ORACLE_START = 20100;
-
- /** this should be thrown if an attempt to create a group with duplicated name is made */
- public static final int X_ORACLE_DUPLICATE_GROUP_NAME = X_ORACLE_START + 1 ;
-
- /** see above */
- public static final int X_ORACLE_DUPLICATE_USER_NAME = X_ORACLE_START + 2 ;
-
- /** no such user failure upon login */
- public static final int X_ORACLE_INVALID_USER_NAME = X_ORACLE_START + 3 ;
-
- /** - */
- public static final int X_ORACLE_INVALID_USER_PASS = X_ORACLE_START + 4 ;
-
- /** invalid group id supplied for operation requiring such specifier */
- public static final int X_ORACLE_INVALID_USER_GROUP = X_ORACLE_START + 5 ;
-
- /** access to LR by id fails - no such resource */
- public static final int X_ORACLE_INVALID_LR = X_ORACLE_START + 6 ;
-
- /** attempt to access resource in mode that does not exist */
- public static final int X_ORACLE_INVALID_ACCESS_MODE = X_ORACLE_START + 7 ;
-
- /** huh? */
- ...
[truncated message content] |