mcconnell 02/02/01 19:04:46
Modified: apps/enterprise/pss/src/etc README.TXT
apps/enterprise/pss/src/java/org/apache/pss/connector/database
DatabaseCatalog.java DatabaseCatalogBase.java
DatabaseConnector.java DatabaseEntry.java
DatabaseIterator.java DatabaseResource.java
DatabaseSession.java DatabaseSessionManager.java
DatabaseSessionPool.java DatabaseUtil.java
FlushManager.java KeyBag.java
PersistentObjectHome.java
apps/enterprise/pss/src/java/org/apache/pss/connector/file
DataManager.java FileCatalogBase.java
FileKeyBag.java FileSession.java
PersistentObjectHome.java
TransactionalDataManager.java
apps/enterprise/pss/src/java/org/apache/pss/connector/memory
MemoryCatalogBase.java MemorySession.java
PersistentObjectHome.java
apps/enterprise/pss/src/java/org/apache/pss/wrapper
DatabaseWrapper.java FileWrapper.java
MemoryWrapper.java
Removed: apps/enterprise/pss/src/java/org/apache/pss/connector/database
NotFoundException.java
apps/enterprise/pss/src/java/org/apache/pss/connector/file
NotFoundException.java
apps/enterprise/pss/src/java/org/apache/pss/connector/memory
NotFoundException.java
Log:
javadoc updates and rationalization of NotFoundException usage
Revision Changes Path
1.5 +3 -3
jakarta-avalon-cornerstone/apps/enterprise/pss/src/etc/README.TXT
Index: README.TXT
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/etc/README.TXT,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README.TXT 2 Feb 2002 00:52:27 -0000 1.4
+++ README.TXT 2 Feb 2002 03:04:45 -0000 1.5
@@ -41,8 +41,8 @@
contains the following files:
LICENSE.HTML, license and due credits
- psdl-1.0.jar, the PSDL compiler
- pss-1.0.jar, the PSS runtime
+ psdl-2.0.1.jar, the PSDL compiler
+ pss-2.0.1.jar, the PSS runtime
Changes introduced in the PSS 2.0 implementation (FEB 2002)
@@ -121,4 +121,4 @@
3. Introduction of a configuration model based on the Avalon
Configurable interface.
3. Creation of a PSS Block usable under the Apache Avalon Phoenix
- component management framework.
\ No newline at end of file
+ component management framework.
1.3 +4 -1
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseCatalog.java
Index: DatabaseCatalog.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseCatalog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseCatalog.java 2 Feb 2002 01:19:58 -0000 1.2
+++ DatabaseCatalog.java 2 Feb 2002 03:04:45 -0000 1.3
@@ -4,6 +4,9 @@
* Copyright: Copyright (C) The Apache Software Foundation. All rights
reserved.
* Copyright: OSM SARL 2001-2002, All Rights Reserved.
* Copyright: 2000 (C) Intalio Inc. All Rights Reserved.
+ *
+ * Date Author Changes
+ * 16-JAN-02 McConnell, OSM Included causal exception in place of
PERSIT_STORE
*/
package org.apache.pss.connector.database;
@@ -22,7 +25,7 @@
import org.apache.pss.connector.AbstractCatalog;
/**
- *
+ * Impementation of a catalog for JDBC based persistence.
*
*/
public abstract class DatabaseCatalog extends AbstractCatalog
1.3 +51 -63
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseCatalogBase.java
Index: DatabaseCatalogBase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseCatalogBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseCatalogBase.java 2 Feb 2002 01:19:58 -0000 1.2
+++ DatabaseCatalogBase.java 2 Feb 2002 03:04:45 -0000 1.3
@@ -12,12 +12,10 @@
import org.omg.CORBA.portable.OutputStream;
import org.omg.CosPersistentState.*;
import org.apache.pss.connector.PID;
-
-// Referenced classes of package org.apache.pss.connector.database:
-// NotFoundException, DatabaseConnector, KeyBag
+import org.apache.pss.connector.NotFoundException;
/**
- *
+ * Base interface for a a JDBC database catalog.
*
*/
public interface DatabaseCatalogBase
@@ -25,48 +23,44 @@
{
/**
- * Sets the baseInfo attribute of the DatabaseCatalogBase object
- *
- * @param databaseconnector The new baseInfo value
- * @param word0 The new baseInfo value
- * @param aparameter The new baseInfo value
+ * Sets all base information required by a file catalog.
+ * @param connector the connector
+ * @param access the access mode
+ * @param params catalog parameters
*/
- public abstract void setBaseInfo( DatabaseConnector databaseconnector,
short word0, Parameter aparameter[] );
+ public abstract void setBaseInfo( DatabaseConnector connector, short
mode, Parameter[] parameters );
/**
- *
- *
- * @return (doc-pending)
+ * Returns the catalog connector.
+ * @return Connector catalog connector
*/
public abstract Connector connector();
/**
- *
- *
- * @return (doc-pending)
+ * Returns the catalog parameter.
+ * @return Parameter[]
*/
public abstract Parameter[] parameters();
/**
- *
- *
- * @param pid
- * @param pid1
- * @return (doc-pending)
+ * Check if a storage type is already stored.
+ * @param home_pid the home PID
+ * @param type_pid the storage type PID
+ * @return boolean
*/
- public abstract boolean stored( PID pid, PID pid1 );
+ public abstract boolean stored( PID home_pid, PID type_pid );
/**
- *
+ * Read a entry into a stream.
*
- * @param pid
- * @param pid1
+ * @param pid catalog identifier
+ * @param pid1 entry identifier
* @param i
- * @return (doc-pending)
+ * @return InputStream[]
* @exception NotFoundException
*/
public abstract InputStream[] read( PID pid, PID pid1, int i )
@@ -74,75 +68,69 @@
/**
- *
+ * Write an entry from a stream to the database.
*
- * @param pid
- * @param pid1
- * @param aoutputstream
+ * @param pid catalog identifier
+ * @param pid1 entry identifier
+ * @param output
*/
- public abstract void write( PID pid, PID pid1, OutputStream
aoutputstream[] );
+ public abstract void write( PID pid, PID pid1, OutputStream[] output );
/**
- *
+ * Remove an entry.
*
- * @param pid
- * @param pid1
+ * @param pid catalog identifier
+ * @param pid1 entry identifier
*/
public abstract void remove( PID pid, PID pid1 );
/**
- *
+ * Find an entry.
*
* @param pid
* @param akeybag
- * @return (doc-pending)
+ * @return PID
* @exception NotFoundException
*/
public abstract PID find( PID pid, KeyBag akeybag[] )
throws NotFoundException;
-
/**
- *
- *
- * @param storagehomebase
- * @param abyte0
- * @param s
- * @return (doc-pending)
+ * Incarnate a storage type
+ * @param base
+ * @param pid storage type pid
+ * @param id the storage type id
+ * @return StorageObject
* @exception NotFoundException
*/
- public abstract StorageObject incarnate( StorageHomeBase
storagehomebase, byte abyte0[], String s )
+ public abstract StorageObject incarnate( StorageHomeBase base, byte[]
pid, String id )
throws NotFoundException;
-
/**
- *
- *
- * @param storagehomebase
- * @param s
- * @return (doc-pending)
+ * Create a storage type.
+ * @param base storage home base
+ * @param id the storage type id
+ * @return StorageObject
*/
- public abstract StorageObject create_object( StorageHomeBase
storagehomebase, String s );
+ public abstract StorageObject create_object( StorageHomeBase base,
String id );
/**
- *
- *
- * @param storagehomebase
- * @param s
- * @return (doc-pending)
+ * Create an empty storage type.
+ * @param base storage home base
+ * @param id the storage type id
+ * @return StorageObject
*/
- public abstract StorageObject create_empty_object( StorageHomeBase
storagehomebase, String s );
+ public abstract StorageObject create_empty_object( StorageHomeBase base,
String id );
/**
- *
- *
- * @param storagehomebase
- * @param s
- * @return (doc-pending)
+ * Create an embedded storage type.
+ * @param base storage home base
+ * @param id the storage type id
+ * @return StorageObject
*/
- public abstract StorageObject create_embedded_object( StorageHomeBase
storagehomebase, String s );
+ public abstract StorageObject create_embedded_object( StorageHomeBase
base, String id );
}
1.3 +3 -2
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseConnector.java
Index: DatabaseConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseConnector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseConnector.java 2 Feb 2002 01:19:58 -0000 1.2
+++ DatabaseConnector.java 2 Feb 2002 03:04:45 -0000 1.3
@@ -8,6 +8,7 @@
* Date Name Change
* 27-JAN-02 McConnell, OSM Removed all org.openorb dependencies
* 27-JAN-02 McConnell, OSM Added default configuration profile.
+ * 02-FEB-02 McConnell, OSM Added javadoc.
*/
package org.apache.pss.connector.database;
@@ -29,8 +30,8 @@
/**
- *
- *
+ * JDBC based persistence connector that provides support for the
+ * creation of session, session pools, and transactional sessions.
*/
public class DatabaseConnector extends ConnectorBase
{
1.3 +9 -9
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseEntry.java
Index: DatabaseEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseEntry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseEntry.java 2 Feb 2002 01:19:58 -0000 1.2
+++ DatabaseEntry.java 2 Feb 2002 03:04:45 -0000 1.3
@@ -4,6 +4,9 @@
* Copyright: Copyright (C) The Apache Software Foundation. All rights
reserved.
* Copyright: OSM SARL 2001-2002, All Rights Reserved.
* Copyright: 2000 (C) Intalio Inc. All Rights Reserved.
+ *
+ * Date Name Change
+ * 02-FEB-02 McConnell, OSM Added javadoc.
*/
package org.apache.pss.connector.database;
@@ -12,28 +15,25 @@
import org.apache.pss.connector.PID;
/**
- *
+ * A persistent database entry used by the cache to store temporary data.
*
*/
public class DatabaseEntry
{
/**
- *
+ * Home PID.
*/
public PID home_pid;
+
/**
- *
+ * Type PID.
*/
public PID type_pid;
+
/**
- *
+ * Output stream.
*/
public OutputStream output[];
-
- /**
- * Constructor for the DatabaseEntry object
- */
- public DatabaseEntry() { }
}
1.3 +22 -32
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseIterator.java
Index: DatabaseIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseIterator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseIterator.java 2 Feb 2002 01:19:58 -0000 1.2
+++ DatabaseIterator.java 2 Feb 2002 03:04:45 -0000 1.3
@@ -4,6 +4,9 @@
* Copyright: Copyright (C) The Apache Software Foundation. All rights
reserved.
* Copyright: OSM SARL 2001-2002, All Rights Reserved.
* Copyright: 2000 (C) Intalio Inc. All Rights Reserved.
+ *
+ * Date Name Change
+ * 02-FEB-02 McConnell, OSM Added javadoc.
*/
package org.apache.pss.connector.database;
@@ -14,8 +17,8 @@
import org.apache.pss.connector.PIDFactory;
/**
- *
- *
+ * Iterator supporting iteration over the storage type instances of a
storage home
+ * for file based persistence.
*/
public class DatabaseIterator
implements Iterator
@@ -29,10 +32,9 @@
/**
- * Constructor for the DatabaseIterator object
- *
- * @param storagehomebase
- * @param databasecatalog
+ * Constructor for the FileIterator object
+ * @param storagehomebase the storage home implementation
+ * @param databasecatalog the database catalog
*/
public DatabaseIterator( StorageHomeBase storagehomebase,
DatabaseCatalog databasecatalog )
{
@@ -45,9 +47,8 @@
/**
- *
- *
- * @param i
+ * Set the current position for the iterator.
+ * @param i position
*/
public void set( int i )
{
@@ -56,9 +57,8 @@
/**
- *
- *
- * @return (doc-pending)
+ * Returns true if there are more elements in the iteration.
+ * @return boolean true if there are more elements in the iteration.
*/
public boolean hasMoreElements()
{
@@ -67,7 +67,7 @@
/**
- *
+ * Sets the iterator to the next element in the iteration.
*/
public void next()
{
@@ -76,9 +76,8 @@
/**
- *
- *
- * @return (doc-pending)
+ * Returns the storage object at the current iterator position.
+ * @return StorageObject the storage object at the current iterator
position.
*/
public StorageObject element()
{
@@ -88,9 +87,8 @@
/**
- *
- *
- * @return (doc-pending)
+ * Returns the current element and detaches it from the iterator.
+ * @return StorageObject the storage object at the current iterator
position.
*/
public StorageObject detach()
{
@@ -101,7 +99,7 @@
/**
- *
+ * Resets the iterator to the first element of the iteration.
*/
public void reset()
{
@@ -110,9 +108,8 @@
/**
- *
- *
- * @param abyte0
+ * Set the current element of the iterator by providing a PID.
+ * @param pid persistent identifier
*/
public void fetch( byte abyte0[] )
{
@@ -126,20 +123,13 @@
}
-
- /**
- *
- */
private void loadObject()
{
- ( ( PersistentObject ) _object ).setPersistentLinks(
PIDFactory.pid_byte_to_pid( _pids[_index] ), _home );
+ ( ( PersistentObject ) _object ).setPersistentLinks(
+ PIDFactory.pid_byte_to_pid( _pids[_index] ), _home );
( ( PersistentObject ) _object ).refreshIncarnation();
}
-
- /**
- *
- */
private void createObject()
{
_object = ( ( PersistentObjectHome ) _home ).create_object();
1.3 +21 -14
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseResource.java
Index: DatabaseResource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseResource.java 2 Feb 2002 01:19:58 -0000 1.2
+++ DatabaseResource.java 2 Feb 2002 03:04:45 -0000 1.3
@@ -4,6 +4,9 @@
* Copyright: Copyright (C) The Apache Software Foundation. All rights
reserved.
* Copyright: OSM SARL 2001-2002, All Rights Reserved.
* Copyright: 2000 (C) Intalio Inc. All Rights Reserved.
+ *
+ * Date Name Change
+ * 02-FEB-02 McConnell, OSM Added javadoc.
*/
package org.apache.pss.connector.database;
@@ -15,25 +18,29 @@
import org.omg.PortableServer.POAPackage.WrongPolicy;
import org.apache.pss.util.debug;
-// Referenced classes of package org.apache.pss.connector.database:
-// TransactionalDatabaseSession
-
/**
- *
- *
+ * Implementation of a simple two-phase-commit resource enabling invocation
+ * of 'end' under a transactional session.
*/
public class DatabaseResource extends ResourcePOA
{
+ /**
+ * Reference to the transactional session
+ */
private TransactionalSession _session;
+
+ /**
+ * Reference to the transaction coordinator
+ */
private Coordinator _coordinator;
/**
* Constructor for the DatabaseResource object
*
- * @param transactionalsession
- * @param coordinator
+ * @param transactionalsession the transactional session
+ * @param coordinator the transaction coordinator
*/
public DatabaseResource( TransactionalSession transactionalsession,
Coordinator coordinator )
{
@@ -43,9 +50,9 @@
/**
- *
+ * Prepare method called in the first phase of the two-phase-commit.
*
- * @return (doc-pending)
+ * @return Vote
* @exception HeuristicMixed
* @exception HeuristicHazard
*/
@@ -58,7 +65,7 @@
/**
- *
+ * Rollback.
*
* @exception HeuristicCommit
* @exception HeuristicMixed
@@ -74,7 +81,7 @@
/**
- *
+ * Commit.
*
* @exception NotPrepared
* @exception HeuristicRollback
@@ -90,7 +97,7 @@
/**
- *
+ * commit_one_phase
*
* @exception HeuristicHazard
*/
@@ -109,7 +116,7 @@
/**
- *
+ * Forget.
*/
public void forget()
{
@@ -119,7 +126,7 @@
/**
- *
+ * Remove this resource. The implementation unregister itself from the
POA.
*/
public void removeItself()
{
1.3 +27 -15
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseSession.java
Index: DatabaseSession.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseSession.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseSession.java 2 Feb 2002 01:19:58 -0000 1.2
+++ DatabaseSession.java 2 Feb 2002 03:04:45 -0000 1.3
@@ -5,10 +5,11 @@
* Copyright: OSM SARL 2001-2002, All Rights Reserved.
* Copyright: 2000 (C) Intalio Inc. All Rights Reserved.
*
- * Date Author Changes
- * 08-JAN-02 McConnell Added null pointer test in setBaseInfo
- * 08-JAN-02 McConnell connectToDatabase updated to throw exceptions
instead of System.out error
- * 27-JAN-02 McConnell removed multiple org.openorb dependecies
(CDROutputStream remaining)
+ * Date Author Changes
+ * 08-JAN-02 McConnell, OSM Added null pointer test in setBaseInfo
+ * 08-JAN-02 McConnell, OSM connectToDatabase updated to throw
exceptions instead of System.out error
+ * 27-JAN-02 McConnell, OSM removed multiple org.openorb dependecies
(CDROutputStream remaining)
+ * 02-FEB-02 McConnell, OSM Added javadoc.
*/
package org.apache.pss.connector.database;
@@ -43,40 +44,49 @@
import org.apache.pss.connector.BasePID;
import org.apache.pss.connector.PIDFactory;
import org.apache.pss.connector.PersistenceException;
+import org.apache.pss.connector.NotFoundException;
import org.apache.pss.util.debug;
/**
- *
+ * Implementation of database persistent session.
*
*/
public class DatabaseSession extends DatabaseCatalog
implements Session, DatabaseCatalogBase
{
+
/**
- *
+ * Tables list
+ */
+ private Hashtable _tables;
+
+ /**
+ * Reference to the ORBInitInfo
+ */
+ private ORBInitInfo _info;
+
+ /**
+ * The extension for multible tables used.
+ * (extension usage is not documented)
*/
protected String _extension;
/**
- *
+ * the binary data type
*/
protected String _binary_type;
/**
- *
+ * Reference to the cache
*/
protected Hashtable _cache;
/**
- *
+ * Datastore connection.
*/
protected Connection _datastore;
- private Hashtable _tables;
- private ORBInitInfo _info;
-
-
/**
* Constructor for the DatabaseSession object
*/
@@ -491,7 +501,8 @@
public void remove( PID home_pid, PID type_pid )
{
- if( getLogger().isDebugEnabled() ) getLogger().debug( "remove [ " +
home_pid + ", " + type_pid + " ]" );
+ if( getLogger().isDebugEnabled() ) getLogger().debug(
+ "remove [ " + home_pid + ", " + type_pid + " ]" );
DatabaseEntry databaseentry = ( DatabaseEntry ) _cache.get(
type_pid.value_str() );
if ( databaseentry != null )
@@ -501,7 +512,8 @@
String s = ( String ) _tables.get( home_pid.catalog_value_str() );
try
{
- PreparedStatement preparedstatement =
_datastore.prepareStatement( "DELETE FROM " + s + " WHERE pid=?" );
+ PreparedStatement preparedstatement =
_datastore.prepareStatement(
+ "DELETE FROM " + s + " WHERE pid=?" );
preparedstatement.setBytes( 1, type_pid.value() );
preparedstatement.executeUpdate();
preparedstatement.close();
1.3 +55 -61
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseSessionManager.java
Index: DatabaseSessionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseSessionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseSessionManager.java 2 Feb 2002 01:19:58 -0000 1.2
+++ DatabaseSessionManager.java 2 Feb 2002 03:04:45 -0000 1.3
@@ -4,6 +4,9 @@
* Copyright: Copyright (C) The Apache Software Foundation. All rights
reserved.
* Copyright: OSM SARL 2001-2002, All Rights Reserved.
* Copyright: 2000 (C) Intalio Inc. All Rights Reserved.
+ *
+ * Date Author Changes
+ * 02-FEB-02 McConnell, OSM Added javadoc.
*/
package org.apache.pss.connector.database;
@@ -22,24 +25,20 @@
import org.omg.PortableInterceptor.ForwardRequest;
import org.openorb.ots.Verbose;
-// Referenced classes of package org.apache.pss.connector.database:
-// DatabaseSessionPool
-
/**
- *
- *
+ * Session manager for JDBC based persistence.
*/
public class DatabaseSessionManager extends LocalObject
implements ServerRequestInterceptor
{
private ORBInitInfo _info;
+
private Vector _registered;
/**
* Constructor for the DatabaseSessionManager object
- *
* @param orbinitinfo
*/
public DatabaseSessionManager( ORBInitInfo orbinitinfo )
@@ -50,8 +49,7 @@
/**
- *
- *
+ * Register a session pool.
* @param databasesessionpool
*/
public void register( DatabaseSessionPool databasesessionpool )
@@ -59,9 +57,50 @@
_registered.addElement( databasesessionpool );
}
+ /**
+ * Prepare a transactional session pool.
+ * @param coordinator
+ */
+ private void prepare_session( Coordinator coordinator )
+ {
+ Verbose.print( "DatabaseSessionManager", "Prepare a session" );
+ Object obj = null;
+ for ( int i = 0; i < _registered.size(); i++ )
+ {
+ DatabaseSessionPool databasesessionpool = ( DatabaseSessionPool
) _registered.elementAt( i );
+ TransactionalSession transactionalsession =
databasesessionpool.connector().current_session();
+ if ( transactionalsession == null )
+ {
+ transactionalsession =
databasesessionpool.prepare_free_session();
+ }
+ transactionalsession.start( coordinator );
+ }
+
+ }
+
+
+ /**
+ * Suspend a transactional session pool.
+ * @param coordinator
+ */
+ private void suspend_session( Coordinator coordinator )
+ {
+ Object obj = null;
+ for ( int i = 0; i < _registered.size(); i++ )
+ {
+ DatabaseSessionPool databasesessionpool = ( DatabaseSessionPool
) _registered.elementAt( i );
+ TransactionalSession transactionalsession =
databasesessionpool.connector().current_session();
+ if ( transactionalsession != null )
+ {
+ transactionalsession.suspend( coordinator );
+ }
+ }
+
+ }
+
/**
- *
+ * Request Interceptor receive request service context handler.
*
* @param serverrequestinfo
* @exception ForwardRequest
@@ -71,7 +110,7 @@
/**
- *
+ * Request Interceptor receive request handler.
*
* @param serverrequestinfo
* @exception ForwardRequest
@@ -110,8 +149,7 @@
/**
- *
- *
+ * Request Interceptor send reply handler.
* @param serverrequestinfo
*/
public void send_reply( ServerRequestInfo serverrequestinfo )
@@ -145,8 +183,7 @@
/**
- *
- *
+ * Request Interceptor send exception handler.
* @param serverrequestinfo
* @exception ForwardRequest
*/
@@ -155,8 +192,7 @@
/**
- *
- *
+ * Request Interceptor send other handler.
* @param serverrequestinfo
* @exception ForwardRequest
*/
@@ -192,9 +228,9 @@
/**
- *
+ * Interceptor name.
*
- * @return (doc-pending)
+ * @return String the interceptor name
*/
public String name()
{
@@ -203,51 +239,9 @@
/**
- *
+ * Destory the interceptor.
*/
public void destroy() { }
- /**
- *
- *
- * @param coordinator
- */
- private void prepare_session( Coordinator coordinator )
- {
- Verbose.print( "DatabaseSessionManager", "Prepare a session" );
- Object obj = null;
- for ( int i = 0; i < _registered.size(); i++ )
- {
- DatabaseSessionPool databasesessionpool = ( DatabaseSessionPool
) _registered.elementAt( i );
- TransactionalSession transactionalsession =
databasesessionpool.connector().current_session();
- if ( transactionalsession == null )
- {
- transactionalsession =
databasesessionpool.prepare_free_session();
- }
- transactionalsession.start( coordinator );
- }
-
- }
-
-
- /**
- *
- *
- * @param coordinator
- */
- private void suspend_session( Coordinator coordinator )
- {
- Object obj = null;
- for ( int i = 0; i < _registered.size(); i++ )
- {
- DatabaseSessionPool databasesessionpool = ( DatabaseSessionPool
) _registered.elementAt( i );
- TransactionalSession transactionalsession =
databasesessionpool.connector().current_session();
- if ( transactionalsession != null )
- {
- transactionalsession.suspend( coordinator );
- }
- }
-
- }
}
1.3 +95 -82
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseSessionPool.java
Index: DatabaseSessionPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseSessionPool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseSessionPool.java 2 Feb 2002 01:19:58 -0000 1.2
+++ DatabaseSessionPool.java 2 Feb 2002 03:04:45 -0000 1.3
@@ -5,16 +5,31 @@
* Copyright: OSM SARL 2001-2002, All Rights Reserved.
* Copyright: 2000 (C) Intalio Inc. All Rights Reserved.
*
- * 27-JAN-02 McConnell removed all org.openorb dependecies
+ * Date Author Changes
+ * 27-JAN-02 McConnell, OSM Removed all org.openorb dependecies
+ * 02-FEB-02 McConnell, OSM Added javadoc.
*/
package org.apache.pss.connector.database;
import java.sql.Connection;
import java.util.Vector;
+
import org.omg.CORBA.TRANSACTION_REQUIRED;
-import org.omg.CosPersistentState.*;
+import org.omg.CosPersistentState.EndOfAssociationCallback;
+import org.omg.CosPersistentState.TransactionalSession;
+import org.omg.CosPersistentState.NotFound;
+import org.omg.CosPersistentState.SessionPool;
+import org.omg.CosPersistentState.Parameter;
+import org.omg.CosPersistentState.StorageHomeBase;
+import org.omg.CosPersistentState.READ_UNCOMMITTED;
+import org.omg.CosPersistentState.READ_COMMITTED;
+import org.omg.CosPersistentState.REPEATABLE_READ;
+import org.omg.CosPersistentState.SERIALIZABLE;
+import org.omg.CosPersistentState.TRANSACTIONAL;
+import org.omg.CosPersistentState.NON_TRANSACTIONAL;
import org.omg.PortableInterceptor.ORBInitInfo;
+
import org.apache.pss.Initializer;
import org.apache.pss.connector.PID;
import org.apache.pss.connector.PIDFactory;
@@ -22,16 +37,28 @@
import org.apache.pss.util.debug;
/**
- *
+ * Implementation of a database connector session pool.
*
*/
public class DatabaseSessionPool extends DatabaseSession
implements SessionPool
{
+ /**
+ * Session pool.
+ */
private Vector _pool;
+
+ /**
+ * Transaction policy.
+ */
private short _tx_policy;
+
+ /**
+ * Isolation level.
+ */
private short _isolation_level;
+
private ORBInitInfo _info;
@@ -63,33 +90,30 @@
int i;
try
{
- i = getParameterAsInt("PSS.File.Transaction.IsolationLevel", 0 );
+ i = getParameterAsInt("PSS.Database.Transaction.IsolationLevel",
READ_UNCOMMITTED.value );
}
catch( Throwable e )
{
- final String error = "Could not resolve the 'session
PSS.File.Transaction.IsolationLevel' property.";
+ final String error =
+ "Could not resolve the
'PSS.Database.Transaction.IsolationLevel' property.";
throw new PersistenceException( error, e );
}
switch ( i )
{
case 0:
- // '\0'
- _isolation_level = 0;
+ _isolation_level = READ_UNCOMMITTED.value;
debug.print( "Isolation is READ UNCOMMITTED" );
break;
case 1:
- // '\001'
- _isolation_level = 1;
+ _isolation_level = READ_COMMITTED.value;
debug.print( "Isolation is READ COMMITTED" );
break;
case 2:
- // '\002'
- _isolation_level = 2;
+ _isolation_level = REPEATABLE_READ.value;
debug.print( "Isolation is REPEATABLE_READ" );
break;
case 3:
- // '\003'
- _isolation_level = 3;
+ _isolation_level = SERIALIZABLE.value;
debug.print( "Isolation is SERIALIZABLE" );
break;
}
@@ -97,18 +121,18 @@
/**
- * Sets the baseInfo attribute of the DatabaseSessionPool object
+ * Set the base information require by a catalog
*
- * @param databaseconnector The new baseInfo value
- * @param word0 The new baseInfo value
- * @param word1 The new baseInfo value
- * @param aparameter The new baseInfo value
+ * @param connector the database connector
+ * @param tx_policy transaction policy
+ * @param access The new baseInfo value
+ * @param parameters The new baseInfo value
*/
- public void setBaseInfo( DatabaseConnector databaseconnector, short
word0, short word1, Parameter aparameter[] )
+ public void setBaseInfo( DatabaseConnector connector, short tx_policy,
short access, Parameter[] parameters )
{
- setCatalogInfo( databaseconnector, word1, aparameter );
- _tx_policy = word0;
- if ( _tx_policy == 1 )
+ setCatalogInfo( connector, access, parameters );
+ _tx_policy = tx_policy;
+ if ( _tx_policy == TRANSACTIONAL.value )
{
Initializer._session_manager_database.register( this );
}
@@ -116,25 +140,21 @@
/**
- *
- *
- * @param abyte0
+ * Flush using a supplied array of pids.
+ * @param pids
*/
- public void flush_by_pids( byte abyte0[][] )
+ public void flush_by_pids( byte[][] pids )
{
- Object obj = null;
- Object obj1 = null;
- Object obj4 = null;
- if ( _tx_policy == 0 )
+ if ( _tx_policy == NON_TRANSACTIONAL.value )
{
- for ( int i = 0; i < abyte0.length; i++ )
+ for ( int i = 0; i < pids.length; i++ )
{
- PID pid = PIDFactory.pid_byte_to_pid( abyte0[i] );
- PersistentObjectHome persistentobjecthome = (
PersistentObjectHome ) find_home_base( pid );
+ PID pid = PIDFactory.pid_byte_to_pid( pids[i] );
+ PersistentObjectHome home = ( PersistentObjectHome )
find_home_base( pid );
try
{
- java.lang.Object obj2 = ( ( StorageHomeBase )
persistentobjecthome ).find_by_short_pid( pid.short_value() );
- persistentobjecthome.flush( ( PersistentObject ) obj2 );
+ java.lang.Object obj2 = ( ( StorageHomeBase ) home
).find_by_short_pid( pid.short_value() );
+ home.flush( ( PersistentObject ) obj2 );
}
catch ( NotFound notfound )
{}
@@ -143,48 +163,43 @@
}
else
{
- TransactionalSession transactionalsession =
connector().current_session();
- if ( transactionalsession.get_association_status() == 0 )
+ TransactionalSession session = connector().current_session();
+ if ( session.get_association_status() == 0 )
{
throw new TRANSACTION_REQUIRED();
}
- for ( int j = 0; j < abyte0.length; j++ )
+ for ( int j = 0; j < pids.length; j++ )
{
- PID pid1 = PIDFactory.pid_byte_to_pid( abyte0[j] );
- PersistentObjectHome persistentobjecthome1 = (
PersistentObjectHome ) find_home_base( pid1 );
+ PID pid1 = PIDFactory.pid_byte_to_pid( pids[j] );
+ PersistentObjectHome home = ( PersistentObjectHome )
find_home_base( pid1 );
try
{
- java.lang.Object obj3 = ( ( StorageHomeBase )
persistentobjecthome1 ).find_by_short_pid( pid1.short_value() );
- persistentobjecthome1.flush( ( PersistentObject ) obj3 );
+ java.lang.Object obj3 = ( ( StorageHomeBase ) home
).find_by_short_pid( pid1.short_value() );
+ home.flush( ( PersistentObject ) obj3 );
}
- catch ( NotFound notfound1 )
+ catch ( NotFound notfound )
{}
}
-
}
}
/**
- *
- *
- * @param abyte0
+ * Refresh using a supplied array of pids.
+ * @param pids
*/
- public void refresh_by_pids( byte abyte0[][] )
+ public void refresh_by_pids( byte[][] pids )
{
- Object obj = null;
- Object obj1 = null;
- Object obj4 = null;
- if ( _tx_policy == 0 )
+ if ( _tx_policy == NON_TRANSACTIONAL.value )
{
- for ( int i = 0; i < abyte0.length; i++ )
+ for ( int i = 0; i < pids.length; i++ )
{
- PID pid = PIDFactory.pid_byte_to_pid( abyte0[i] );
- PersistentObjectHome persistentobjecthome = (
PersistentObjectHome ) find_home_base( pid );
+ PID pid = PIDFactory.pid_byte_to_pid( pids[i] );
+ PersistentObjectHome home = ( PersistentObjectHome )
find_home_base( pid );
try
{
- java.lang.Object obj2 = ( ( StorageHomeBase )
persistentobjecthome ).find_by_short_pid( pid.short_value() );
- persistentobjecthome.refresh( ( PersistentObject ) obj2
);
+ java.lang.Object obj2 = ( ( StorageHomeBase ) home
).find_by_short_pid( pid.short_value() );
+ home.refresh( ( PersistentObject ) obj2 );
}
catch ( NotFound notfound )
{}
@@ -193,32 +208,30 @@
}
else
{
- TransactionalSession transactionalsession =
connector().current_session();
- if ( transactionalsession.get_association_status() == 0 )
+ TransactionalSession session = connector().current_session();
+ if ( session.get_association_status() == 0 )
{
throw new TRANSACTION_REQUIRED();
}
- for ( int j = 0; j < abyte0.length; j++ )
+ for ( int j = 0; j < pids.length; j++ )
{
- PID pid1 = PIDFactory.pid_byte_to_pid( abyte0[j] );
- PersistentObjectHome persistentobjecthome1 = (
PersistentObjectHome ) find_home_base( pid1 );
+ PID pid1 = PIDFactory.pid_byte_to_pid( pids[j] );
+ PersistentObjectHome home = ( PersistentObjectHome )
find_home_base( pid1 );
try
{
- java.lang.Object obj3 = ( ( StorageHomeBase )
persistentobjecthome1 ).find_by_short_pid( pid1.short_value() );
- persistentobjecthome1.refresh( ( PersistentObject ) obj3
);
+ java.lang.Object obj3 = ( ( StorageHomeBase ) home
).find_by_short_pid( pid1.short_value() );
+ home.refresh( ( PersistentObject ) obj3 );
}
catch ( NotFound notfound1 )
{}
}
-
}
}
/**
- *
- *
- * @return (doc-pending)
+ * Returns the transaction policy.
+ * @return short the transaction policy
*/
public short transaction_policy()
{
@@ -227,18 +240,18 @@
/**
- *
- *
- * @return (doc-pending)
+ * Return a free transactional session. The returned session has no
+ * means with no association status.
+ * @return TransactionalSession
*/
public TransactionalSession prepare_free_session()
{
boolean flag = false;
- TransactionalSession transactionalsession = null;
+ TransactionalSession session = null;
for ( int i = 0; i < _pool.size(); i++ )
{
- transactionalsession = ( TransactionalSession ) _pool.elementAt(
i );
- if ( transactionalsession.get_association_status() != 0 )
+ session = ( TransactionalSession ) _pool.elementAt( i );
+ if ( session.get_association_status() != 0 )
{
continue;
}
@@ -248,25 +261,25 @@
if ( flag )
{
- return transactionalsession;
+ return session;
}
else
{
- TransactionalSession transactionalsession1 =
connector().create_transactional_session( access_mode(), _isolation_level, (
EndOfAssociationCallback ) null, parameters() );
- _pool.addElement( transactionalsession1 );
- return transactionalsession1;
+ session = connector().create_transactional_session(
+ access_mode(), _isolation_level, ( EndOfAssociationCallback )
null, parameters() );
+ _pool.addElement( session );
+ return session;
}
}
/**
- *
- *
- * @return (doc-pending)
+ * Open a connection to a database.
+ * @return Connection
*/
protected Connection connectToDatabase()
{
- if ( _tx_policy == 0 )
+ if ( _tx_policy == NON_TRANSACTIONAL.value )
{
return super.connectToDatabase();
}
1.3 +9 -16
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseUtil.java
Index: DatabaseUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/DatabaseUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseUtil.java 2 Feb 2002 01:19:58 -0000 1.2
+++ DatabaseUtil.java 2 Feb 2002 03:04:45 -0000 1.3
@@ -31,8 +31,7 @@
import org.apache.pss.connector.PersistenceException;
/**
- *
- *
+ * Database connection utilities.
*/
public class DatabaseUtil
{
@@ -128,10 +127,10 @@
/**
- *
+ * Keys.
*
* @param i
- * @return (doc-pending)
+ * @return KeyBag[]
*/
public static KeyBag[] keys( int i )
{
@@ -142,14 +141,12 @@
akeybag[j] = new KeyBag();
akeybag[j].value = getCDROutputStream();
}
-
return akeybag;
}
/**
- *
- *
+ * Marshal a reference.
* @param obj
* @param outputstream
*/
@@ -224,10 +221,10 @@
/**
- *
+ * Create an output stream array of the supplied length.
*
- * @param i
- * @return (doc-pending)
+ * @param i array length
+ * @return OutputStream[]
*/
public static OutputStream[] outputArray( int i )
{
@@ -237,13 +234,12 @@
{
aoutputstream[j] = getCDROutputStream();
}
-
return aoutputstream;
}
/**
- *
+ * Flat output.
*
* @param outputstream
* @param aoutputstream
@@ -258,16 +254,14 @@
outputstream.write_long( abyte0.length );
outputstream.write_octet_array( abyte0, 0, abyte0.length );
}
-
}
/**
- *
*
* @param inputstream
* @param i
- * @return (doc-pending)
+ * @return InputStream[]
*/
public static InputStream[] multipleInput( InputStream inputstream, int
i )
{
@@ -287,7 +281,6 @@
abyte0 = getBuffer( cdroutputstream1 );
ainputstream[k] = getCDRInputStream( abyte0 );
}
-
return ainputstream;
}
1.3 +13 -18
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/FlushManager.java
Index: FlushManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/FlushManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FlushManager.java 2 Feb 2002 01:19:58 -0000 1.2
+++ FlushManager.java 2 Feb 2002 03:04:45 -0000 1.3
@@ -7,6 +7,7 @@
*
* Name Date Change
* S. McConnell, OSM 27-JAN-02 Removed dependence on org.openorb
package
+ * S. McConnell, OSM 02-FEB-02 Added javadoc
*/
package org.apache.pss.connector.database;
@@ -15,8 +16,7 @@
import java.util.Hashtable;
/**
- *
- *
+ * Flush manager that runs as a thread periodically flushing catalogs.
*/
public class FlushManager extends Thread
{
@@ -54,39 +54,34 @@
/**
- * Adds a feature to the Manager attribute of the FlushManager object
+ * Adds a manager to the manager pool.
*
- * @param s The feature to be added to the Manager attribute
- * @param databasecatalog The feature to be added to the Manager
attribute
+ * @param manager_name
+ * @param databasecatalog
*/
- public void addManager( String s, DatabaseCatalog databasecatalog )
+ public void addManager( String manager_name, DatabaseCatalog
databasecatalog )
{
- manager_list.put( s, databasecatalog );
+ manager_list.put( manager_name, databasecatalog );
}
/**
- *
- *
- * @param s
+ * Remove a manager from the manager pool.
+ * @param manager_name
*/
- public void removeManager( String s )
+ public void removeManager( String manager_name )
{
- manager_list.remove( s );
+ manager_list.remove( manager_name );
}
-
- /**
- *
- */
private void flushTime()
{
Object obj = null;
DatabaseCatalog databasecatalog;
- for ( Enumeration enumeration = manager_list.elements();
enumeration.hasMoreElements(); databasecatalog.flush() )
+ for ( Enumeration enumeration = manager_list.elements();
+ enumeration.hasMoreElements(); databasecatalog.flush() )
{
databasecatalog = ( DatabaseCatalog ) enumeration.nextElement();
}
-
}
}
1.3 +3 -9
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/KeyBag.java
Index: KeyBag.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/KeyBag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KeyBag.java 2 Feb 2002 01:19:58 -0000 1.2
+++ KeyBag.java 2 Feb 2002 03:04:45 -0000 1.3
@@ -11,24 +11,18 @@
import org.omg.CORBA.portable.OutputStream;
/**
- *
- *
+ * Utility container.
*/
public class KeyBag
{
- /**
- *
- */
public String name;
- /**
- *
- */
- public OutputStream value;
+ public OutputStream value;
/**
* Constructor for the KeyBag object
*/
public KeyBag() { }
+
}
1.3 +1 -3
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/PersistentObjectHome.java
Index: PersistentObjectHome.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/database/PersistentObjectHome.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PersistentObjectHome.java 2 Feb 2002 01:19:58 -0000 1.2
+++ PersistentObjectHome.java 2 Feb 2002 03:04:45 -0000 1.3
@@ -10,9 +10,7 @@
import org.omg.CosPersistentState.*;
import org.apache.pss.connector.PID;
-
-// Referenced classes of package org.apache.pss.connector.database:
-// NotFoundException, PersistentObject
+import org.apache.pss.connector.NotFoundException;
/**
*
1.3 +1 -0
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/file/DataManager.java
Index: DataManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/file/DataManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DataManager.java 2 Feb 2002 01:19:59 -0000 1.2
+++ DataManager.java 2 Feb 2002 03:04:46 -0000 1.3
@@ -21,6 +21,7 @@
import org.omg.CORBA.LongHolder;
import org.omg.PortableInterceptor.ORBInitInfo;
import org.apache.pss.connector.PID;
+import org.apache.pss.connector.NotFoundException;
import org.apache.pss.util.debug;
1.3 +2 -2
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/file/FileCatalogBase.java
Index: FileCatalogBase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/file/FileCatalogBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileCatalogBase.java 2 Feb 2002 01:19:59 -0000 1.2
+++ FileCatalogBase.java 2 Feb 2002 03:04:46 -0000 1.3
@@ -13,6 +13,7 @@
import org.omg.CORBA.portable.OutputStream;
import org.omg.CosPersistentState.*;
import org.apache.pss.connector.PID;
+import org.apache.pss.connector.NotFoundException;
/**
* Base interface for a file catalog.
@@ -23,7 +24,6 @@
/**
* Sets all base information required by a file catalog.
- *
* @param connector the connector
* @param access the access mode
* @param params catalog parameters
@@ -46,7 +46,7 @@
/**
- * check if a storage type is already stored.
+ * Check if a storage type is already stored.
* @param home_pid the home PID
* @param type_pid the storage type PID
* @return boolean
1.3 +1 -1
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/file/FileKeyBag.java
Index: FileKeyBag.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/file/FileKeyBag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileKeyBag.java 2 Feb 2002 01:19:59 -0000 1.2
+++ FileKeyBag.java 2 Feb 2002 03:04:46 -0000 1.3
@@ -11,7 +11,7 @@
import org.omg.CORBA.portable.InputStream;
/**
- * Utilitiy container that associates a input stream and stort byte array
+ * Utility container that associates a input stream and stort byte array
*/
public class FileKeyBag
{
1.3 +1 -0
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/file/FileSession.java
Index: FileSession.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/file/FileSession.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileSession.java 2 Feb 2002 01:19:59 -0000 1.2
+++ FileSession.java 2 Feb 2002 03:04:46 -0000 1.3
@@ -44,6 +44,7 @@
import org.apache.pss.connector.BasePID;
import org.apache.pss.connector.PersistenceException;
import org.apache.pss.connector.PIDFactory;
+import org.apache.pss.connector.NotFoundException;
/**
* File basic session implementation that manages a datastore
1.3 +1 -0
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/file/PersistentObjectHome.java
Index: PersistentObjectHome.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/file/PersistentObjectHome.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PersistentObjectHome.java 2 Feb 2002 01:19:59 -0000 1.2
+++ PersistentObjectHome.java 2 Feb 2002 03:04:46 -0000 1.3
@@ -10,6 +10,7 @@
import org.omg.CosPersistentState.*;
import org.apache.pss.connector.PID;
+import org.apache.pss.connector.NotFoundException;
/**
* Interface implemented by generated storage homes for file persistence.
1.3 +1 -0
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/file/TransactionalDataManager.java
Index: TransactionalDataManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/file/TransactionalDataManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TransactionalDataManager.java 2 Feb 2002 01:19:59 -0000 1.2
+++ TransactionalDataManager.java 2 Feb 2002 03:04:46 -0000 1.3
@@ -11,6 +11,7 @@
import java.util.*;
import org.omg.CORBA.LongHolder;
import org.apache.pss.connector.PID;
+import org.apache.pss.connector.NotFoundException;
/**
* Extended DataManager that provides manager support for transactional
1.3 +1 -2
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/memory/MemoryCatalogBase.java
Index: MemoryCatalogBase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/memory/MemoryCatalogBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryCatalogBase.java 2 Feb 2002 01:19:59 -0000 1.2
+++ MemoryCatalogBase.java 2 Feb 2002 03:04:46 -0000 1.3
@@ -10,9 +10,8 @@
import org.omg.CosPersistentState.*;
import org.apache.pss.connector.PID;
+import org.apache.pss.connector.NotFoundException;
-// Referenced classes of package org.apache.pss.connector.memory:
-// NotFoundException, MemoryConnector
/**
*
1.3 +1 -0
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/memory/MemorySession.java
Index: MemorySession.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/memory/MemorySession.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemorySession.java 2 Feb 2002 01:19:59 -0000 1.2
+++ MemorySession.java 2 Feb 2002 03:04:46 -0000 1.3
@@ -18,6 +18,7 @@
import org.apache.pss.connector.BasePID;
import org.apache.pss.connector.PIDFactory;
import org.apache.pss.connector.PersistenceException;
+import org.apache.pss.connector.NotFoundException;
/**
*
1.3 +1 -3
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/memory/PersistentObjectHome.java
Index: PersistentObjectHome.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/connector/memory/PersistentObjectHome.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PersistentObjectHome.java 2 Feb 2002 01:19:59 -0000 1.2
+++ PersistentObjectHome.java 2 Feb 2002 03:04:46 -0000 1.3
@@ -10,9 +10,7 @@
import org.omg.CosPersistentState.*;
import org.apache.pss.connector.PID;
-
-// Referenced classes of package org.apache.pss.connector.memory:
-// NotFoundException
+import org.apache.pss.connector.NotFoundException;
/**
*
1.3 +6 -6
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/wrapper/DatabaseWrapper.java
Index: DatabaseWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/wrapper/DatabaseWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseWrapper.java 2 Feb 2002 01:20:00 -0000 1.2
+++ DatabaseWrapper.java 2 Feb 2002 03:04:46 -0000 1.3
@@ -95,7 +95,7 @@
printwriter.println( tab2 + "{" );
printwriter.println( tab3 +
"((org.apache.pss.connector.database.PersistentObjectHome)_home_base).remove_storage_type(
_pid );" );
printwriter.println( tab2 + "}" );
- printwriter.println( tab2 + "catch (
org.apache.pss.connector.database.NotFoundException ex )" );
+ printwriter.println( tab2 + "catch (
org.apache.pss.connector.NotFoundException ex )" );
printwriter.println( tab2 + "{ }" );
printwriter.println( tab + "}" );
printwriter.println( "" );
@@ -469,7 +469,7 @@
printwriter.println( tab + "}" );
printwriter.println( "" );
printwriter.println( tab + "public void remove_storage_type(
org.apache.pss.connector.PID pid )" );
- printwriter.println( tab2 + "throws
org.apache.pss.connector.database.NotFoundException" );
+ printwriter.println( tab2 + "throws
org.apache.pss.connector.NotFoundException" );
printwriter.println( tab + "{" );
printwriter.println( tab2 + "unregister_type_incarnation( pid );" );
printwriter.println( tab2 +
"((org.apache.pss.connector.database.DatabaseCatalogBase)_catalog).remove(
_pid, pid );" );
@@ -487,7 +487,7 @@
printwriter.println( tab3 + "org.omg.CORBA.portable.InputStream []
input = ((org.apache.pss.connector.database.DatabaseCatalogBase)_catalog).read(
_pid, storage_type.getPID(), _home_members.length );" );
printwriter.println( tab3 + "storage_type.read( input );" );
printwriter.println( tab2 + "}" );
- printwriter.println( tab2 + "catch (
org.apache.pss.connector.database.NotFoundException ex )" );
+ printwriter.println( tab2 + "catch (
org.apache.pss.connector.NotFoundException ex )" );
printwriter.println( tab2 + "{" );
printwriter.println( tab2 + "throw new org.omg.CORBA.PERSIST_STORE(
1, org.omg.CORBA.CompletionStatus.COMPLETED_NO );" );
printwriter.println( tab2 + "}" );
@@ -1257,7 +1257,7 @@
printwriter.println( tab2 + "{" );
printwriter.println( tab3 +
"((org.apache.pss.connector.database.PersistentObjectHome)_home_base).remove_storage_type(
_pid );" );
printwriter.println( tab2 + "}" );
- printwriter.println( tab2 + "catch (
org.apache.pss.connector.database.NotFoundException ex )" );
+ printwriter.println( tab2 + "catch (
org.apache.pss.connector.NotFoundException ex )" );
printwriter.println( tab2 + "{ }" );
printwriter.println( tab + "}" );
printwriter.println( "" );
@@ -1503,7 +1503,7 @@
tools.javaType( ( ( psdlAbstractStorageHome )
apsdlkey[i].idlDefinedIn() ).managed(), printwriter );
printwriter.println( " ) find_by_short_pid( pid.short_value()
);" );
printwriter.println( tab2 + "}" );
- printwriter.println( tab2 + "catch (
org.apache.pss.connector.database.NotFoundException ex )" );
+ printwriter.println( tab2 + "catch (
org.apache.pss.connector.NotFoundException ex )" );
printwriter.println( tab2 + "{" );
printwriter.println( tab3 + "throw new
org.omg.CosPersistentState.NotFound();" );
printwriter.println( tab2 + "}" );
@@ -1545,7 +1545,7 @@
tools.javaType( psdlstoragehome.managed(), printwriter );
printwriter.println( "Ref( pid.short_value(), this );" );
printwriter.println( tab2 + "}" );
- printwriter.println( tab2 + "catch (
org.apache.pss.connector.database.NotFoundException ex )" );
+ printwriter.println( tab2 + "catch (
org.apache.pss.connector.NotFoundException ex )" );
printwriter.println( tab2 + "{" );
printwriter.println( tab3 + "return null;" );
printwriter.println( tab2 + "}" );
1.3 +5 -5
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/wrapper/FileWrapper.java
Index: FileWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/wrapper/FileWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileWrapper.java 2 Feb 2002 01:20:00 -0000 1.2
+++ FileWrapper.java 2 Feb 2002 03:04:46 -0000 1.3
@@ -102,7 +102,7 @@
printwriter.println( tab2 + "{" );
printwriter.println( tab3 +
"((org.apache.pss.connector.file.PersistentObjectHome)_home_base).remove_storage_type(
_pid );" );
printwriter.println( tab2 + "}" );
- printwriter.println( tab2 + "catch (
org.apache.pss.connector.file.NotFoundException ex )" );
+ printwriter.println( tab2 + "catch (
org.apache.pss.connector.NotFoundException ex )" );
printwriter.println( tab2 + "{ }" );
printwriter.println( tab + "}" );
printwriter.println( "" );
@@ -300,7 +300,7 @@
printwriter.println( tab2 + "{" );
printwriter.println( tab3 + "obj =
((org.apache.pss.connector.file.FileCatalogBase)_catalog).incarnate( this,
short_pid, \"" + psdlstoragetype.idlID() + "\" );" );
printwriter.println( tab2 + "}" );
- printwriter.println( tab2 + "catch(
org.apache.pss.connector.file.NotFoundException ex )" );
+ printwriter.println( tab2 + "catch(
org.apache.pss.connector.NotFoundException ex )" );
printwriter.println( tab2 + "{" );
printwriter.println( tab3 + "throw new
org.omg.CosPersistentState.NotFound();" );
printwriter.println( tab2 + "}" );
@@ -485,7 +485,7 @@
printwriter.println( tab + "}" );
printwriter.println( "" );
printwriter.println( tab + "public void remove_storage_type(
org.apache.pss.connector.PID pid )" );
- printwriter.println( tab2 + "throws
org.apache.pss.connector.file.NotFoundException" );
+ printwriter.println( tab2 + "throws
org.apache.pss.connector.NotFoundException" );
printwriter.println( tab + "{" );
printwriter.println( tab2 + "unregister_type_incarnation( pid );" );
printwriter.println( tab2 +
"((org.apache.pss.connector.file.FileCatalogBase)_catalog).delete( _pid, pid
);" );
@@ -503,7 +503,7 @@
printwriter.println( tab3 + "org.omg.CORBA.portable.InputStream
input = ((org.apache.pss.connector.file.FileCatalogBase)_catalog).entry( _pid,
storage_type.getPID() );" );
printwriter.println( tab3 + "storage_type.read( input );" );
printwriter.println( tab2 + "}" );
- printwriter.println( tab2 + "catch (
org.apache.pss.connector.file.NotFoundException ex )" );
+ printwriter.println( tab2 + "catch (
org.apache.pss.connector.NotFoundException ex )" );
printwriter.println( tab2 + "{" );
printwriter.println( tab2 + "throw new org.omg.CORBA.PERSIST_STORE(
1, org.omg.CORBA.CompletionStatus.COMPLETED_NO );" );
printwriter.println( tab2 + "}" );
@@ -1296,7 +1296,7 @@
printwriter.println( tab2 + "{" );
printwriter.println( tab3 +
"((org.apache.pss.connector.file.PersistentObjectHome)_home_base).remove_storage_type(
_pid );" );
printwriter.println( tab2 + "}" );
- printwriter.println( tab2 + "catch (
org.apache.pss.connector.file.NotFoundException ex )" );
+ printwriter.println( tab2 + "catch (
org.apache.pss.connector.NotFoundException ex )" );
printwriter.println( tab2 + "{ }" );
printwriter.println( tab + "}" );
printwriter.println( "" );
1.3 +2 -2
jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/wrapper/MemoryWrapper.java
Index: MemoryWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/src/java/org/apache/pss/wrapper/MemoryWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryWrapper.java 2 Feb 2002 01:20:00 -0000 1.2
+++ MemoryWrapper.java 2 Feb 2002 03:04:46 -0000 1.3
@@ -353,7 +353,7 @@
printwriter.println( "\t}" );
printwriter.println( "" );
printwriter.println( "\tpublic void remove_storage_type(
org.apache.pss.connector.PID pid )" );
- printwriter.println( "\t\tthrows
org.apache.pss.connector.memory.NotFoundException" );
+ printwriter.println( "\t\tthrows
org.apache.pss.connector.NotFoundException" );
printwriter.println( "\t{" );
printwriter.println( "\t\tunregister_type_incarnation( pid );" );
printwriter.println(
"\t\t((org.apache.pss.connector.memory.MemoryCatalogBase)_catalog).delete(
_pid, pid );" );
@@ -1072,7 +1072,7 @@
printwriter.println( "\t\t{" );
printwriter.println(
"\t\t\t((org.apache.pss.connector.memory.PersistentObjectHome)_home_base).remove_storage_type(
_pid );" );
printwriter.println( "\t\t}" );
- printwriter.println( "\t\tcatch (
org.apache.pss.connector.memory.NotFoundException ex )" );
+ printwriter.println( "\t\tcatch (
org.apache.pss.connector.NotFoundException ex )" );
printwriter.println( "\t\t{ }" );
printwriter.println( "\t}" );
printwriter.println( "" );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
